Skip to content
Snippets Groups Projects
Commit 867d810d authored by Stan Hu's avatar Stan Hu
Browse files

Backport CE changes for multiple GroupSAML support

This commit makes it possible for
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14420 to handle
multiple SAML providers.
parent 732ee606
No related branches found
No related tags found
No related merge requests found
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment