Merge branch 'dblessing_saml_user_identity_fix' into 'master'

Remove unncessary group SAML identity assignment

See merge request gitlab-org/gitlab!61921

ee/changelogs/unreleased/dblessing_saml_user_identity_fix.yml

+---
+title: Remove unncessary group SAML identity assignment
+merge_request: 61921
+author:
+type: fixed

ee/lib/gitlab/auth/group_saml/user.rb

@@ -84,10 +84,10 @@ module Gitlab
         override :add_or_update_user_identities
         def add_or_update_user_identities
           return unless gl_user
+          return if self.identity # extern_uid hasn't changed
 
-          identity = self.identity
           # find_or_initialize_by doesn't update `gl_user.identities`, and isn't autosaved.
-          identity ||= gl_user.identities.find { |identity| identity.provider == auth_hash.provider && identity.saml_provider_id == @saml_provider.id }
+          identity = gl_user.identities.find { |identity| identity.provider == auth_hash.provider && identity.saml_provider_id == @saml_provider.id }
           identity ||= gl_user.identities.build(provider: auth_hash.provider, saml_provider: @saml_provider)
 
           identity.extern_uid = auth_hash.uid