diff options
author | Stan Hu <stanhu@gmail.com> | 2019-06-26 23:11:30 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-06-28 07:20:33 +0300 |
commit | 867d810d8a9a0790e6051a96dc0b1fdb883ddbf6 (patch) | |
tree | d326140aba1b323818ada0b939e251209d24910a /app | |
parent | 732ee60693c5986f9041b05665588306eefd69d9 (diff) |
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.
Diffstat (limited to 'app')
-rw-r--r-- | app/services/users/update_service.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb index 15c13a452ad..8f52e9cb23f 100644 --- a/app/services/users/update_service.rb +++ b/app/services/users/update_service.rb @@ -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 |