f322975c50
Gitlab requires an email address for all user accounts as this is the default account id and is used for sending notifications. LDAP accounts may be missing email fields so handle this by showing a sensible error message before redirecting to the login screen again. Resolves github issue #899 Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
27 lines
824 B
Ruby
27 lines
824 B
Ruby
class OmniauthCallbacksController < Devise::OmniauthCallbacksController
|
|
|
|
# Extend the standard message generation to accept our custom exception
|
|
def failure_message
|
|
exception = env["omniauth.error"]
|
|
if exception.class == OmniAuth::Error
|
|
error = exception.message
|
|
else
|
|
error = exception.error_reason if exception.respond_to?(:error_reason)
|
|
error ||= exception.error if exception.respond_to?(:error)
|
|
error ||= env["omniauth.error.type"].to_s
|
|
end
|
|
error.to_s.humanize if error
|
|
end
|
|
|
|
def ldap
|
|
# We only find ourselves here if the authentication to LDAP was successful.
|
|
info = request.env["omniauth.auth"]["info"]
|
|
@user = User.find_for_ldap_auth(info)
|
|
if @user.persisted?
|
|
@user.remember_me = true
|
|
end
|
|
sign_in_and_redirect @user
|
|
end
|
|
|
|
end
|