diff --git a/internal/api/scim/integration_test/users_create_test.go b/internal/api/scim/integration_test/users_create_test.go index 7763fdc175..7856b8efe4 100644 --- a/internal/api/scim/integration_test/users_create_test.go +++ b/internal/api/scim/integration_test/users_create_test.go @@ -354,7 +354,7 @@ func TestCreateUser_metadata(t *testing.T) { test.AssertMapContains(tt, mdMap, "urn:zitadel:scim:externalId", "701984") test.AssertMapContains(tt, mdMap, "urn:zitadel:scim:name.middleName", "Jane") test.AssertMapContains(tt, mdMap, "urn:zitadel:scim:name.honorificSuffix", "III") - test.AssertMapContains(tt, mdMap, "urn:zitadel:scim:profileURL", "http://login.example.com/bjensen") + test.AssertMapContains(tt, mdMap, "urn:zitadel:scim:profileUrl", "http://login.example.com/bjensen") test.AssertMapContains(tt, mdMap, "urn:zitadel:scim:title", "Tour Guide") test.AssertMapContains(tt, mdMap, "urn:zitadel:scim:locale", "en-US") test.AssertMapContains(tt, mdMap, "urn:zitadel:scim:ims", `[{"value":"someaimhandle","type":"aim"},{"value":"twitterhandle","type":"X"}]`) @@ -365,7 +365,7 @@ func TestCreateUser_metadata(t *testing.T) { func TestCreateUser_scopedExternalID(t *testing.T) { _, err := Instance.Client.Mgmt.SetUserMetadata(CTX, &management.SetUserMetadataRequest{ Id: Instance.Users.Get(integration.UserTypeOrgOwner).ID, - Key: "urn:zitadel:scim:provisioning_domain", + Key: "urn:zitadel:scim:provisioningDomain", Value: []byte("fooBar"), }) require.NoError(t, err) @@ -379,7 +379,7 @@ func TestCreateUser_scopedExternalID(t *testing.T) { _, err = Instance.Client.Mgmt.RemoveUserMetadata(CTX, &management.RemoveUserMetadataRequest{ Id: Instance.Users.Get(integration.UserTypeOrgOwner).ID, - Key: "urn:zitadel:scim:provisioning_domain", + Key: "urn:zitadel:scim:provisioningDomain", }) require.NoError(t, err) }() diff --git a/internal/api/scim/integration_test/users_get_test.go b/internal/api/scim/integration_test/users_get_test.go index f359061962..7984b5d63b 100644 --- a/internal/api/scim/integration_test/users_get_test.go +++ b/internal/api/scim/integration_test/users_get_test.go @@ -193,7 +193,7 @@ func TestGetUser(t *testing.T) { // set provisioning domain of service user _, err = Instance.Client.Mgmt.SetUserMetadata(CTX, &management.SetUserMetadataRequest{ Id: Instance.Users.Get(integration.UserTypeOrgOwner).ID, - Key: "urn:zitadel:scim:provisioning_domain", + Key: "urn:zitadel:scim:provisioningDomain", Value: []byte("fooBar"), }) require.NoError(t, err) @@ -213,7 +213,7 @@ func TestGetUser(t *testing.T) { _, err = Instance.Client.Mgmt.RemoveUserMetadata(CTX, &management.RemoveUserMetadataRequest{ Id: Instance.Users.Get(integration.UserTypeOrgOwner).ID, - Key: "urn:zitadel:scim:provisioning_domain", + Key: "urn:zitadel:scim:provisioningDomain", }) require.NoError(t, err) }, diff --git a/internal/api/scim/integration_test/users_list_test.go b/internal/api/scim/integration_test/users_list_test.go index ffb00da9d7..19268880f1 100644 --- a/internal/api/scim/integration_test/users_list_test.go +++ b/internal/api/scim/integration_test/users_list_test.go @@ -365,7 +365,7 @@ func TestListUser(t *testing.T) { // set provisioning domain of service user _, err := Instance.Client.Mgmt.SetUserMetadata(CTX, &management.SetUserMetadataRequest{ Id: Instance.Users.Get(integration.UserTypeOrgOwner).ID, - Key: "urn:zitadel:scim:provisioning_domain", + Key: "urn:zitadel:scim:provisioningDomain", Value: []byte("fooBar"), }) require.NoError(t, err) @@ -389,7 +389,7 @@ func TestListUser(t *testing.T) { // delete provisioning domain of service user _, err := Instance.Client.Mgmt.RemoveUserMetadata(CTX, &management.RemoveUserMetadataRequest{ Id: Instance.Users.Get(integration.UserTypeOrgOwner).ID, - Key: "urn:zitadel:scim:provisioning_domain", + Key: "urn:zitadel:scim:provisioningDomain", }) require.NoError(t, err) }, diff --git a/internal/api/scim/integration_test/users_replace_test.go b/internal/api/scim/integration_test/users_replace_test.go index e5b0e14439..0eeaf76e22 100644 --- a/internal/api/scim/integration_test/users_replace_test.go +++ b/internal/api/scim/integration_test/users_replace_test.go @@ -296,7 +296,7 @@ func TestReplaceUser_scopedExternalID(t *testing.T) { // set provisioning domain of service user _, err = Instance.Client.Mgmt.SetUserMetadata(CTX, &management.SetUserMetadataRequest{ Id: Instance.Users.Get(integration.UserTypeOrgOwner).ID, - Key: "urn:zitadel:scim:provisioning_domain", + Key: "urn:zitadel:scim:provisioningDomain", Value: []byte("fooBazz"), }) require.NoError(t, err) @@ -327,7 +327,7 @@ func TestReplaceUser_scopedExternalID(t *testing.T) { _, err = Instance.Client.Mgmt.RemoveUserMetadata(CTX, &management.RemoveUserMetadataRequest{ Id: Instance.Users.Get(integration.UserTypeOrgOwner).ID, - Key: "urn:zitadel:scim:provisioning_domain", + Key: "urn:zitadel:scim:provisioningDomain", }) require.NoError(t, err) } diff --git a/internal/api/scim/metadata/metadata.go b/internal/api/scim/metadata/metadata.go index 09391cab39..66a0a2483c 100644 --- a/internal/api/scim/metadata/metadata.go +++ b/internal/api/scim/metadata/metadata.go @@ -14,14 +14,14 @@ const ( externalIdProvisioningDomainPlaceholder = "{provisioningDomain}" KeyPrefix = "urn:zitadel:scim:" - KeyProvisioningDomain Key = KeyPrefix + "provisioning_domain" + KeyProvisioningDomain Key = KeyPrefix + "provisioningDomain" KeyExternalId Key = KeyPrefix + "externalId" keyScopedExternalIdTemplate = KeyPrefix + externalIdProvisioningDomainPlaceholder + ":externalId" KeyMiddleName Key = KeyPrefix + "name.middleName" KeyHonorificPrefix Key = KeyPrefix + "name.honorificPrefix" KeyHonorificSuffix Key = KeyPrefix + "name.honorificSuffix" - KeyProfileUrl Key = KeyPrefix + "profileURL" + KeyProfileUrl Key = KeyPrefix + "profileUrl" KeyTitle Key = KeyPrefix + "title" KeyLocale Key = KeyPrefix + "locale" KeyTimezone Key = KeyPrefix + "timezone"