deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Allow single-sign-on with Omniauth

Browse source
This commit is contained in:
Florian Unglaub 2012-08-31 15:45:50 +02:00
parent 36ffdf36b9
commit 6d6c7a17ea
3 changed files with 37 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/omniauth_callbacks_controller.rb
View file

@ -38,7 +38,8 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
current_user.save
redirect_to profile_path
else
@user = User.find_by_provider_and_extern_uid(provider, uid)
@user = User.find_or_new_for_omniauth(oauth)
@user.save! if @user.try('new_record?')
if @user
sign_in_and_redirect @user
@ -48,5 +49,4 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
end
end
end
end