Merge pull request #1740 from godric7/master

Enable Oauth login for existing regular users

Merge pull request #1740 from godric7/master
Enable Oauth login for existing regular users
Dmitriy Zaporozhets
2 parents 4e363c61 054c15e7
Showing 1 changed file with 4 additions and 0 deletions Show diff stats
lib/gitlab/auth.rb
@@ -48,9 +48,13 @@ module Gitlab
  
     def find_or_new_for_omniauth(auth)
       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)
         @user
+      elsif @user = User.find_by_email(email)
+        @user.update_attributes(:extern_uid => uid, :provider => provider)
+        @user
       else
         if Gitlab.config.omniauth['allow_single_sign_on']
           @user = create_from_omniauth(auth)
...	...	@@ -48,9 +48,13 @@ module Gitlab
48	48
49	49	def find_or_new_for_omniauth(auth)
50	50	provider, uid = auth.provider, auth.uid
	51	+ email = auth.info.email.downcase unless auth.info.email.nil?
51	52
52	53	if @user = User.find_by_provider_and_extern_uid(provider, uid)
53	54	@user
	55	+ elsif @user = User.find_by_email(email)
	56	+ @user.update_attributes(:extern_uid => uid, :provider => provider)
	57	+ @user
54	58	else
55	59	if Gitlab.config.omniauth['allow_single_sign_on']
56	60	@user = create_from_omniauth(auth)
...	...