kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'sh-fix-issue-12303' into 'master' 

Backport CE changes for multiple GroupSAML support

See merge request gitlab-org/gitlab-ce!30102
This commit is contained in:
Grzegorz Bizon 2019-06-28 09:25:55 +00:00
parent a80f871a3d 867d810d8a
commit dbd86f0059
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/services/users/update_service.rb
View File

@ -63,12 +63,20 @@ module Users
def assign_identity
return unless identity_params.present?
identity = user.identities.find_or_create_by(provider: identity_params[:provider]) # rubocop: disable CodeReuse/ActiveRecord
identity = user.identities.find_or_create_by(provider_params) # rubocop: disable CodeReuse/ActiveRecord
identity.update(identity_params)
end
def identity_attributes
[:provider, :extern_uid]
end
def provider_attributes
[:provider]
end
def provider_params
identity_params.slice(*provider_attributes)
end
end
end