From 2976f2978c49e7803d2daf533bb68dd049ec0024 Mon Sep 17 00:00:00 2001 From: lashinie Date: Mon, 29 Apr 2024 14:42:54 +0530 Subject: [PATCH 1/6] add claims to support multiple mobile numbers per user --- .../resources/conf/claim-config.xml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/resources/conf/claim-config.xml b/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/resources/conf/claim-config.xml index f4cd933c743f..191f58ab1d07 100644 --- a/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/resources/conf/claim-config.xml +++ b/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/resources/conf/claim-config.xml @@ -804,6 +804,20 @@ true Set the user preferred MFA option + + http://wso2.org/claims/mobileNumbers + Mobile Numbers + mobileNumbers + Claim to store mobile numbers of the user + false + + + http://wso2.org/claims/verifiedMobileNumbers + Verified Mobile Numbers + verifiedMobileNumbers + Claim to store verified mobile numbers of the user + false + @@ -1733,6 +1747,20 @@ http://wso2.org/claims/identity/preferredMFAOption + + mobileNumbers + Mobile Numbers + mobileNumbers + Mobile Numbers + http://wso2.org/claims/mobileNumbers + + + verifiedMobileNumbers + Verified Mobile Numbers + verifiedMobileNumbers + Verified Mobile Numbers + http://wso2.org/claims/verifiedMobileNumbers + @@ -2650,5 +2678,25 @@ http://wso2.org/claims/identity/preferredMFAOption + + + urn:scim:wso2:schema:mobileNumbers + Mobile Numbers + mobileNumbers + Mobile Numbers + + + http://wso2.org/claims/mobileNumbers + + + urn:scim:wso2:schema:verifiedMobileNumbers + Verified Mobile Numbers + verifiedMobileNumbers + Verified Mobile Numbers + + + http://wso2.org/claims/verifiedMobileNumbers + + From f6bbefc3319177a0e7b51910e86f00c9fe4b77e1 Mon Sep 17 00:00:00 2001 From: lashinie Date: Wed, 29 May 2024 09:52:56 +0530 Subject: [PATCH 2/6] claims related to multiple email addresses --- .../resources/conf/claim-config.xml | 58 +++++++++++++++++-- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/resources/conf/claim-config.xml b/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/resources/conf/claim-config.xml index 191f58ab1d07..238ff8207b97 100644 --- a/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/resources/conf/claim-config.xml +++ b/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/resources/conf/claim-config.xml @@ -810,6 +810,7 @@ mobileNumbers Claim to store mobile numbers of the user false + http://wso2.org/claims/verifiedMobileNumbers @@ -817,6 +818,23 @@ verifiedMobileNumbers Claim to store verified mobile numbers of the user false + + + + http://wso2.org/claims/emailAddresses + Email Addresses + emailAddresses + Claim to store email addresses of the user + false + + + + http://wso2.org/claims/verifiedEmailAddresses + Verified Email Addresses + verifiedEmailAddresses + Claim to store verified email addresses of the user + false + @@ -1752,6 +1770,7 @@ Mobile Numbers mobileNumbers Mobile Numbers + http://wso2.org/claims/mobileNumbers @@ -1759,8 +1778,25 @@ Verified Mobile Numbers verifiedMobileNumbers Verified Mobile Numbers + http://wso2.org/claims/verifiedMobileNumbers + + emailAddresses + Email Addresses + emailAddresses + Email Addresses + + http://wso2.org/claims/emailAddresses + + + verifiedEmailAddresses + Verified Email Addresses + verifiedEmailAddresses + Verified Email Addresses + + http://wso2.org/claims/verifiedEmailAddresses + @@ -2684,8 +2720,7 @@ Mobile Numbers mobileNumbers Mobile Numbers - - + http://wso2.org/claims/mobileNumbers @@ -2693,10 +2728,25 @@ Verified Mobile Numbers verifiedMobileNumbers Verified Mobile Numbers - - + http://wso2.org/claims/verifiedMobileNumbers + + urn:scim:wso2:schema:emailAddresses + Email Addresses + emailAddresses + Email Addresses + + http://wso2.org/claims/emailAddresses + + + urn:scim:wso2:schema:verifiedEmailAddresses + Verified Email Addresses + verifiedEmailAddresses + Verified Email Addresses + + http://wso2.org/claims/verifiedEmailAddresses + From bcbe038431dd792798d74a48495712cb1d23d71d Mon Sep 17 00:00:00 2001 From: lashinie Date: Wed, 29 May 2024 09:57:01 +0530 Subject: [PATCH 3/6] update config name --- .../resources/conf/claim-config.xml | 108 ++++++++++-------- ....identity.core.server.feature.default.json | 1 + 2 files changed, 61 insertions(+), 48 deletions(-) diff --git a/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/resources/conf/claim-config.xml b/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/resources/conf/claim-config.xml index 238ff8207b97..5bb0bb165ec2 100644 --- a/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/resources/conf/claim-config.xml +++ b/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/resources/conf/claim-config.xml @@ -804,28 +804,13 @@ true Set the user preferred MFA option - - http://wso2.org/claims/mobileNumbers - Mobile Numbers - mobileNumbers - Claim to store mobile numbers of the user - false - - - - http://wso2.org/claims/verifiedMobileNumbers - Verified Mobile Numbers - verifiedMobileNumbers - Claim to store verified mobile numbers of the user - false - - http://wso2.org/claims/emailAddresses Email Addresses emailAddresses Claim to store email addresses of the user false + 11 @@ -834,6 +819,25 @@ verifiedEmailAddresses Claim to store verified email addresses of the user false + 12 + + + + http://wso2.org/claims/mobileNumbers + Mobile Numbers + mobileNumbers + Claim to store mobile numbers of the user + false + 13 + + + + http://wso2.org/claims/verifiedMobileNumbers + Verified Mobile Numbers + verifiedMobileNumbers + Claim to store verified mobile numbers of the user + false + 14 @@ -1765,28 +1769,13 @@ http://wso2.org/claims/identity/preferredMFAOption - - mobileNumbers - Mobile Numbers - mobileNumbers - Mobile Numbers - - http://wso2.org/claims/mobileNumbers - - - verifiedMobileNumbers - Verified Mobile Numbers - verifiedMobileNumbers - Verified Mobile Numbers - - http://wso2.org/claims/verifiedMobileNumbers - emailAddresses Email Addresses emailAddresses Email Addresses + 11 http://wso2.org/claims/emailAddresses @@ -1795,8 +1784,27 @@ verifiedEmailAddresses Verified Email Addresses + 12 http://wso2.org/claims/verifiedEmailAddresses + + mobileNumbers + Mobile Numbers + mobileNumbers + Mobile Numbers + + 13 + http://wso2.org/claims/mobileNumbers + + + verifiedMobileNumbers + Verified Mobile Numbers + verifiedMobileNumbers + Verified Mobile Numbers + + 14 + http://wso2.org/claims/verifiedMobileNumbers + @@ -2715,28 +2723,13 @@ - - urn:scim:wso2:schema:mobileNumbers - Mobile Numbers - mobileNumbers - Mobile Numbers - - http://wso2.org/claims/mobileNumbers - - - urn:scim:wso2:schema:verifiedMobileNumbers - Verified Mobile Numbers - verifiedMobileNumbers - Verified Mobile Numbers - - http://wso2.org/claims/verifiedMobileNumbers - urn:scim:wso2:schema:emailAddresses Email Addresses emailAddresses Email Addresses + 11 http://wso2.org/claims/emailAddresses @@ -2745,8 +2738,27 @@ verifiedEmailAddresses Verified Email Addresses + 12 http://wso2.org/claims/verifiedEmailAddresses + + urn:scim:wso2:schema:mobileNumbers + Mobile Numbers + mobileNumbers + Mobile Numbers + + 13 + http://wso2.org/claims/mobileNumbers + + + urn:scim:wso2:schema:verifiedMobileNumbers + Verified Mobile Numbers + verifiedMobileNumbers + Verified Mobile Numbers + + 14 + http://wso2.org/claims/verifiedMobileNumbers + diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json index 30c6a1c1e480..e2e1d3252e28 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json @@ -476,6 +476,7 @@ "identity_mgt.user_claim_update.uniqueness.enable": false, "identity_mgt.user_claim_update.uniqueness.listener_priority": "2", "identity_mgt.user_claim_update.uniqueness.scope_within_userstore": false, + "identity_mgt.user_claim_update.enable_multiple_emails_and_mobile_numbers": true, "event.default_listener.system_api_resource_management_listener.priority": "211", "event.default_listener.system_api_resource_management_listener.enable": true, From dee2261878d2ce5354cf567ffc8b1bc571b3142c Mon Sep 17 00:00:00 2001 From: lashinie Date: Thu, 6 Jun 2024 16:41:33 +0530 Subject: [PATCH 4/6] resolve conflicts --- .../resources/identity.xml.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2 b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2 index 27ce8e9c7620..fc242f116abf 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2 +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2 @@ -1732,6 +1732,9 @@ {{identity_mgt.enable_user_claim_input_regex_validation}} + + + {{identity_mgt.user_claim_update.enable_multiple_emails_and_mobile_numbers}} From ef589a8b5a3f38fbeba02a99edaa7d20928d77a2 Mon Sep 17 00:00:00 2001 From: lashinie Date: Fri, 7 Jun 2024 14:27:15 +0530 Subject: [PATCH 5/6] remove oidc claim mapping --- .../resources/conf/claim-config.xml | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/resources/conf/claim-config.xml b/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/resources/conf/claim-config.xml index 5bb0bb165ec2..dfcb20dcb862 100644 --- a/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/resources/conf/claim-config.xml +++ b/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/resources/conf/claim-config.xml @@ -1769,42 +1769,6 @@ http://wso2.org/claims/identity/preferredMFAOption - - emailAddresses - Email Addresses - emailAddresses - Email Addresses - - 11 - http://wso2.org/claims/emailAddresses - - - verifiedEmailAddresses - Verified Email Addresses - verifiedEmailAddresses - Verified Email Addresses - - 12 - http://wso2.org/claims/verifiedEmailAddresses - - - mobileNumbers - Mobile Numbers - mobileNumbers - Mobile Numbers - - 13 - http://wso2.org/claims/mobileNumbers - - - verifiedMobileNumbers - Verified Mobile Numbers - verifiedMobileNumbers - Verified Mobile Numbers - - 14 - http://wso2.org/claims/verifiedMobileNumbers - From ec30fe1087dce7d37bb58ca6ad8100915cb5a889 Mon Sep 17 00:00:00 2001 From: lashinie Date: Tue, 11 Jun 2024 14:50:25 +0530 Subject: [PATCH 6/6] change default value to false --- .../org.wso2.carbon.identity.core.server.feature.default.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json index e2e1d3252e28..cdb2fe2cea55 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json @@ -476,7 +476,7 @@ "identity_mgt.user_claim_update.uniqueness.enable": false, "identity_mgt.user_claim_update.uniqueness.listener_priority": "2", "identity_mgt.user_claim_update.uniqueness.scope_within_userstore": false, - "identity_mgt.user_claim_update.enable_multiple_emails_and_mobile_numbers": true, + "identity_mgt.user_claim_update.enable_multiple_emails_and_mobile_numbers": false, "event.default_listener.system_api_resource_management_listener.priority": "211", "event.default_listener.system_api_resource_management_listener.enable": true,