diff options
| author | Florian Unglaub <florian.unglaub@nix-wie-weg.de> | 2012-08-24 17:25:52 +0400 |
|---|---|---|
| committer | Florian Unglaub <florian.unglaub@nix-wie-weg.de> | 2012-08-24 17:25:52 +0400 |
| commit | 48443d20ca9aa10323c1b81835e519680b10debc (patch) | |
| tree | 7488eeab446a1a01f90450e50028bfcbdc0ad1d0 /app/controllers/omniauth_callbacks_controller.rb | |
| parent | c5ae1549a1d09599734ccaab27e90a8752f1ede6 (diff) | |
| parent | 6d4ae75f544d9819954865c105414a722344336a (diff) | |
Merge branch 'master' of git://github.com/gitlabhq/gitlabhq
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 84e578a3865..9b40e5640d0 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -12,8 +12,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController 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) + @user = User.find_for_ldap_auth(request.env["omniauth.auth"], current_user) if @user.persisted? @user.remember_me = true end @@ -39,7 +38,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController current_user.save redirect_to profile_path else - @user = User.find_by_provider_and_uid(provider, uid) + @user = User.find_by_provider_and_extern_uid(provider, uid) if @user sign_in_and_redirect @user |