gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed openid username

Browse source 
closes #1747

minor changes for styling issue
This commit is contained in:
ViditChitkara 2017-10-13 22:30:08 +05:30 • committed by Stella Rouzi
parent e96a5338e2
commit f44e6e5ca5
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/users/omniauth_callbacks_controller.rb
View file

@ -11,13 +11,13 @@ module Users
def handle(provider) def handle(provider)
auth_hash = request.env['omniauth.auth'] auth_hash = request.env['omniauth.auth']
uid = auth_hash[:uid] username = auth_hash.info.email.split('@')[0]
openid = Openid.find_for_oauth(auth_hash) # Get or create openid openid = Openid.find_for_oauth(auth_hash) # Get or create openid
# If openid exists and is associated with a user, sign in with associated user, # If openid exists and is associated with a user, sign in with associated user,
# even if the email of the associated user and the email of the provided openid are different # even if the email of the associated user and the email of the provided openid are different
unless (user = openid.user) unless (user = openid.user)
user = User.find_for_auth(auth_hash, current_user) # Get or create users user = User.find_for_auth(auth_hash, current_user) # Get or create users
user.username = "#{uid}@#{provider}" if user.username.blank? user.username = "#{username}@#{provider}" if user.username.blank?
end end
begin begin