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

Be more resilient in the case of missing omniauth settings

Browse source 
Should no longer freak out when omniauth settings aren't present in
gitlab.yml. People who aren't using it shouldn't even have to put a
'false' entry in their config for it (and probably wouldn't, after an
upgrade).
This commit is contained in:
Robert Speicher 2012-09-12 18:11:59 -04:00
parent 3643df1f7c
commit 0d77209ea0
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/gitlab/auth.rb
View file

@ -17,7 +17,7 @@ module Gitlab
end
end
def create_from_omniauth auth, ldap = false
def create_from_omniauth(auth, ldap = false)
provider = auth.provider
uid = auth.info.uid || auth.uid
name = auth.info.name.force_encoding("utf-8")
@ -39,7 +39,7 @@ module Gitlab
password_confirmation: password,
projects_limit: Gitlab.config.default_projects_limit,
)
if Gitlab.config.omniauth.block_auto_created_users && !ldap
if Gitlab.config.omniauth['block_auto_created_users'] && !ldap
@user.blocked = true
end
@user.save!
@ -52,7 +52,7 @@ module Gitlab
if @user = User.find_by_provider_and_extern_uid(provider, uid)
@user
else
if Gitlab.config.omniauth.allow_single_sign_on
if Gitlab.config.omniauth['allow_single_sign_on']
@user = create_from_omniauth(auth)
@user
end