SCIM: Backport 104613 to 12.0.1 (#105332)

Backport 104613 to 12.0.1

pkg/services/ssosettings/strategies/saml_strategy.go

@@ -36,6 +36,7 @@ func (s *SAMLStrategy) loadSAMLSettings() map[string]any {
 		"allow_sign_up":                    section.KeyValue("allow_sign_up").MustBool(false),
 		"allowed_organizations":            section.KeyValue("allowed_organizations").MustString(""),
 		"assertion_attribute_email":        section.KeyValue("assertion_attribute_email").MustString(""),
+		"assertion_attribute_external_uid": section.KeyValue("assertion_attribute_external_uid").MustString(""),
 		"assertion_attribute_groups":       section.KeyValue("assertion_attribute_groups").MustString(""),
 		"assertion_attribute_login":        section.KeyValue("assertion_attribute_login").MustString(""),
 		"assertion_attribute_name":         section.KeyValue("assertion_attribute_name").MustString(""),
@@ -48,7 +49,6 @@ func (s *SAMLStrategy) loadSAMLSettings() map[string]any {
 		"client_secret":                    section.KeyValue("client_secret").MustString(""),
 		"enabled":                          section.KeyValue("enabled").MustBool(false),
 		"entity_id":                        section.KeyValue("entity_id").MustString(""),
-		"external_uid_assertion_name": section.KeyValue("external_uid_assertion_name").MustString(""),
 		"force_use_graph_api":              section.KeyValue("force_use_graph_api").MustBool(false),
 		"idp_metadata":                     section.KeyValue("idp_metadata").MustString(""),
 		"idp_metadata_path":                section.KeyValue("idp_metadata_path").MustString(""),

pkg/services/ssosettings/strategies/saml_strategy_test.go

@@ -56,7 +56,6 @@ var (
 	expectedSAMLInfo = map[string]any{
 		"enabled":                          true,
 		"entity_id":                        "custom-entity-id",
-		"external_uid_assertion_name": "",
 		"single_logout":                    true,
 		"allow_sign_up":                    true,
 		"auto_login":                       true,
@@ -76,6 +75,7 @@ var (
 		"assertion_attribute_name":         "name",
 		"assertion_attribute_login":        "login",
 		"assertion_attribute_email":        "email",
+		"assertion_attribute_external_uid": "",
 		"assertion_attribute_groups":       "groups",
 		"assertion_attribute_role":         "roles",
 		"assertion_attribute_org":          "orgs",