From 2a43df53179412ce76096034d6ca7be0f25f0e12 Mon Sep 17 00:00:00 2001 From: Amanda Ariyaratne Date: Thu, 23 Jan 2025 09:36:09 +0530 Subject: [PATCH 1/3] move attributes to system schema --- .../resources/conf/claim-config.xml | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 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 bf55e6c02067..f4b465f343a0 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 @@ -2432,8 +2432,10 @@ http://wso2.org/claims/extendedDisplayName + + - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:askPassword + urn:scim:wso2:schema:askPassword Ask Password askPassword Temporary claim to invoke email ask Password feature @@ -2443,7 +2445,7 @@ http://wso2.org/claims/identity/askPassword - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:verifyEmail + urn:scim:wso2:schema:verifyEmail Verify Email verifyEmail Temporary claim to invoke email verified feature @@ -2453,7 +2455,7 @@ http://wso2.org/claims/identity/verifyEmail - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:pendingEmails.value + urn:scim:wso2:schema:pendingEmails.value Verification Pending Email pendingEmailAddress Claim to store newly updated email address until the new email address is verified @@ -2463,7 +2465,7 @@ http://wso2.org/claims/identity/emailaddress.pendingValue - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:accountLocked + urn:scim:wso2:schema:accountLocked Account Locked accountLocked Account locked @@ -2473,7 +2475,7 @@ http://wso2.org/claims/identity/accountLocked - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:accountState + urn:scim:wso2:schema:accountState Account State accountState Account state @@ -2483,7 +2485,7 @@ http://wso2.org/claims/identity/accountState - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:emailOTPDisabled + urn:scim:wso2:schema:emailOTPDisabled Disable email OTP emailOTPDisabled Store whether email OTP is enabled or disabled @@ -2493,7 +2495,7 @@ http://wso2.org/claims/identity/emailotp_disabled - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:emailVerified + urn:scim:wso2:schema:emailVerified Email Verified emailVerified True if the End-User's e-mail address has been verified; otherwise false @@ -2503,7 +2505,7 @@ http://wso2.org/claims/identity/emailVerified - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:failedEmailOTPAttempts + urn:scim:wso2:schema:failedEmailOTPAttempts Account State failedEmailOTPAttempts Number of failed email OTP attempts @@ -2513,7 +2515,7 @@ http://wso2.org/claims/identity/failedEmailOtpAttempts - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:failedLoginAttempts + urn:scim:wso2:schema:failedLoginAttempts Faliled Login Attempts failedLoginAttempts Number of failed login attempts @@ -2523,7 +2525,7 @@ http://wso2.org/claims/identity/failedLoginAttempts - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:failedLoginAttemptsBeforeSuccess + urn:scim:wso2:schema:failedLoginAttemptsBeforeSuccess Faliled Login Attempts Before Success failedLoginAttemptsBeforeSuccess Number of failed attempts before a success login @@ -2533,7 +2535,7 @@ http://wso2.org/claims/identity/failedLoginAttemptsBeforeSuccess - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:failedLoginLockoutCount + urn:scim:wso2:schema:failedLoginLockoutCount Failed Lockout Count failedLoginLockoutCount Failed lockout count @@ -2543,7 +2545,7 @@ http://wso2.org/claims/identity/failedLoginLockoutCount - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:failedPasswordRecoveryAttempts + urn:scim:wso2:schema:failedPasswordRecoveryAttempts Failed Password Recovery Attempts failedPasswordRecoveryAttempts Number of consecutive failed attempts done for password recovery @@ -2553,7 +2555,7 @@ http://wso2.org/claims/identity/failedPasswordRecoveryAttempts - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:failedSMSOTPAttempts + urn:scim:wso2:schema:failedSMSOTPAttempts Failed SMS OTP attempts failedSMSOTPAttempts Number of failed SMS OTP attempts @@ -2563,7 +2565,7 @@ http://wso2.org/claims/identity/failedSmsOtpAttempts - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:failedTOTPAttempts + urn:scim:wso2:schema:failedTOTPAttempts Failed TOTP Attempts failedTOTPAttempts Number of failed TOTP attempts @@ -2573,7 +2575,7 @@ http://wso2.org/claims/identity/failedTotpAttempts - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:isLiteUser + urn:scim:wso2:schema:isLiteUser Lite User isLiteUser Store whether the account is a lite user account @@ -2583,7 +2585,7 @@ http://wso2.org/claims/identity/isLiteUser - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:lastLoginTime + urn:scim:wso2:schema:lastLoginTime Last Login Time lastLoginTime Last login time @@ -2593,7 +2595,7 @@ http://wso2.org/claims/identity/lastLoginTime - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:lastLogonTime + urn:scim:wso2:schema:lastLogonTime Last Logon Time lastLogonTime Last logon time @@ -2603,7 +2605,7 @@ http://wso2.org/claims/identity/lastLogonTime - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:lastPasswordUpdateTime + urn:scim:wso2:schema:lastPasswordUpdateTime Last Password Update Time lastPasswordUpdateTime Last password update time @@ -2613,7 +2615,7 @@ http://wso2.org/claims/identity/lastPasswordUpdateTime - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:lockedReason + urn:scim:wso2:schema:lockedReason Locked Reason lockedReason The reason why the user account is locked @@ -2623,7 +2625,7 @@ http://wso2.org/claims/identity/lockedReason - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:phoneVerified + urn:scim:wso2:schema:phoneVerified Phone Verified phoneVerified True if the End-User's phone number has been verified; otherwise false @@ -2633,7 +2635,7 @@ http://wso2.org/claims/identity/phoneVerified - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:preferredChannel + urn:scim:wso2:schema:preferredChannel Preferred Channel preferredChannel Preferred Notification Channel @@ -2643,7 +2645,7 @@ http://wso2.org/claims/identity/preferredChannel - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:smsOTPDisabled + urn:scim:wso2:schema:smsOTPDisabled Disable SMS OTP smsOTPDisabled Store whether SMS OTP is enabled or disabled @@ -2653,7 +2655,7 @@ http://wso2.org/claims/identity/smsotp_disabled - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:tenantAdminAskPassword + urn:scim:wso2:schema:tenantAdminAskPassword Tenant Admin Ask Password tenantAdminAskPassword Temporary claim to invoke email tenant admin ask Password feature @@ -2663,7 +2665,7 @@ http://wso2.org/claims/identity/tenantAdminAskPassword - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:unlockTime + urn:scim:wso2:schema:unlockTime Unlock Time unlockTime Unlock time @@ -2673,7 +2675,7 @@ http://wso2.org/claims/identity/unlockTime - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:accountDisabled + urn:scim:wso2:schema:accountDisabled Account Disabled accountDisabled Store whether the user account is disabled or not @@ -2683,7 +2685,7 @@ http://wso2.org/claims/identity/accountDisabled - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:dateOfBirth + urn:scim:wso2:schema:dateOfBirth Date Of Birth dateOfBirth Date of birth @@ -2693,7 +2695,7 @@ http://wso2.org/claims/dob - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:isReadOnlyUser + urn:scim:wso2:schema:isReadOnlyUser Read Only User isReadOnlyUser Claim to store if the user is read only @@ -2703,7 +2705,7 @@ http://wso2.org/claims/identity/isReadOnlyUser - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:pendingMobileNumber + urn:scim:wso2:schema:pendingMobileNumber Verification Pending Mobile pendingMobileNumber To store newly updated mobile number until it is verified @@ -2713,7 +2715,7 @@ http://wso2.org/claims/identity/mobileNumber.pendingValue - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:forcePasswordReset + urn:scim:wso2:schema:forcePasswordReset Force Password Reset forcePasswordReset Temporary claim to invoke forced password reset feature @@ -2723,7 +2725,7 @@ http://wso2.org/claims/identity/adminForcedPasswordReset - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:oneTimePassword + urn:scim:wso2:schema:oneTimePassword One Time Password oneTimePassword One Time Password @@ -2733,7 +2735,7 @@ http://wso2.org/claims/oneTimePassword - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:verifyMobile + urn:scim:wso2:schema:verifyMobile Verify Mobile verifyMobile Temporary claim to invoke mobile verification feature @@ -2743,7 +2745,7 @@ http://wso2.org/claims/identity/verifyMobile - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:country + urn:scim:wso2:schema:country Country country Country @@ -2753,7 +2755,7 @@ http://wso2.org/claims/country - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:userSourceId + urn:scim:wso2:schema:userSourceId User Source ID userSourceId User Provisioned IDP ID @@ -2763,7 +2765,7 @@ http://wso2.org/claims/identity/userSourceId - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:totpEnabled + urn:scim:wso2:schema:totpEnabled TOTP Enabled totpEnabled TOTP Authenticator Enabled @@ -2773,7 +2775,7 @@ http://wso2.org/claims/identity/totpEnabled - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:backupCodeEnabled + urn:scim:wso2:schema:backupCodeEnabled Backup Code Enabled backupCodeEnable Whether user has configured backup code authenticator or not. @@ -2783,7 +2785,7 @@ http://wso2.org/claims/identity/backupCodeEnabled - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:failedBackupCodeAttempts + urn:scim:wso2:schema:failedBackupCodeAttempts Failed Backup Code Attempts failedBackupCodeAttempts Number of failed backup code attempts @@ -2793,7 +2795,7 @@ http://wso2.org/claims/identity/failedBackupCodeAttempts - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:managedOrg + urn:scim:wso2:schema:managedOrg Managed Organization managedOrg Organization where the user is managed @@ -2802,7 +2804,7 @@ http://wso2.org/claims/identity/managedOrg - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:preferredMFAOption + urn:scim:wso2:schema:preferredMFAOption PreferredMFAOption preferredMFAOption Preferred MFA option @@ -2811,8 +2813,6 @@ http://wso2.org/claims/identity/preferredMFAOption - - urn:scim:wso2:schema:emailAddresses Email Addresses From 244f9cbc9baac3155f9b95020db45fd1d49b8903 Mon Sep 17 00:00:00 2001 From: Amanda Ariyaratne Date: Thu, 23 Jan 2025 09:40:01 +0530 Subject: [PATCH 2/3] remove unrelated attributes from scim2 core schema --- .../resources/conf/claim-config.xml | 20 ------------------- 1 file changed, 20 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 f4b465f343a0..38942a686ce3 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 @@ -1968,26 +1968,6 @@ http://wso2.org/claims/metadata.version - - urn:ietf:params:scim:schemas:core:2.0:User:phoneNumbers.fax - Phone Numbers - Fax Phone Number - faxPhoneNumber - Fax Phone Number - 5 - - ^\s*(?:\+?(\d{1,3}))?[-. (]*(\d{2,3})[-. )]*(\d{3})[-. ]*(\d{4,6})(?: *x(\d+))?\s*$ - http://wso2.org/claims/phoneNumbers.fax - - - urn:ietf:params:scim:schemas:core:2.0:User:phoneNumbers.pager - Phone Numbers - Pager Phone Number - pagerPhoneNumber - Pager Phone Number - 5 - - ^\s*(?:\+?(\d{1,3}))?[-. (]*(\d{2,3})[-. )]*(\d{3})[-. ]*(\d{4,6})(?: *x(\d+))?\s*$ - http://wso2.org/claims/phoneNumbers.pager - From e1b669c2814889c111c76bb442ab735e7912b45b Mon Sep 17 00:00:00 2001 From: Amanda Ariyaratne Date: Thu, 23 Jan 2025 12:25:17 +0530 Subject: [PATCH 3/3] revert removing phone numbers claims --- .../resources/conf/claim-config.xml | 20 +++++++++++++++++++ 1 file changed, 20 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 38942a686ce3..f4b465f343a0 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 @@ -1968,6 +1968,26 @@ http://wso2.org/claims/metadata.version + + urn:ietf:params:scim:schemas:core:2.0:User:phoneNumbers.fax + Phone Numbers - Fax Phone Number + faxPhoneNumber + Fax Phone Number + 5 + + ^\s*(?:\+?(\d{1,3}))?[-. (]*(\d{2,3})[-. )]*(\d{3})[-. ]*(\d{4,6})(?: *x(\d+))?\s*$ + http://wso2.org/claims/phoneNumbers.fax + + + urn:ietf:params:scim:schemas:core:2.0:User:phoneNumbers.pager + Phone Numbers - Pager Phone Number + pagerPhoneNumber + Pager Phone Number + 5 + + ^\s*(?:\+?(\d{1,3}))?[-. (]*(\d{2,3})[-. )]*(\d{3})[-. ]*(\d{4,6})(?: *x(\d+))?\s*$ + http://wso2.org/claims/phoneNumbers.pager +