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

Merge pull request #1740 from godric7/master

Browse source 
Enable Oauth login for existing regular users
This commit is contained in:
Dmitriy Zaporozhets 2012-10-21 09:13:35 -07:00
commit fb903de508
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/gitlab/auth.rb
View file

@ -48,9 +48,13 @@ module Gitlab
def find_or_new_for_omniauth(auth) def find_or_new_for_omniauth(auth)
provider, uid = auth.provider, auth.uid provider, uid = auth.provider, auth.uid
email = auth.info.email.downcase unless auth.info.email.nil?
if @user = User.find_by_provider_and_extern_uid(provider, uid) if @user = User.find_by_provider_and_extern_uid(provider, uid)
@user @user
elsif @user = User.find_by_email(email)
@user.update_attributes(:extern_uid => uid, :provider => provider)
@user
else else
if Gitlab.config.omniauth['allow_single_sign_on'] if Gitlab.config.omniauth['allow_single_sign_on']
@user = create_from_omniauth(auth) @user = create_from_omniauth(auth)