From 977ec0c562d9ab2436d0d433f3b14f668348b552 Mon Sep 17 00:00:00 2001 From: anjanasamindraperera Date: Wed, 13 Mar 2024 15:23:41 +0530 Subject: [PATCH 01/19] Rename scenarios and event name --- .../identity/scim2/common/impl/SCIMUserManager.java | 8 ++++---- .../carbon/identity/scim2/common/utils/Scenarios.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java index 6f5a23db..26ed07c4 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java @@ -1117,7 +1117,7 @@ public User updateUser(User user, Map requiredAttributes) throw // If password is updated, set it separately. if (user.getPassword() != null) { carbonUM.updateCredentialByAdminWithID(user.getId(), user.getPassword()); - publishEvent(user, IdentityEventConstants.Event.POST_UPDATE_CREDENTIAL_BY_SCIM, false); + publishEvent(user, IdentityEventConstants.Event.POST_UPDATE_CREDENTIAL, false); } updateUserClaims(user, oldClaimList, claimValuesInLocalDialect); @@ -1303,7 +1303,7 @@ public User updateUser(User user, Map requiredAttributes, // If password is updated, set it separately. if (user.getPassword() != null) { carbonUM.updateCredentialByAdminWithID(user.getId(), user.getPassword()); - publishEvent(user, IdentityEventConstants.Event.POST_UPDATE_CREDENTIAL_BY_SCIM, true); + publishEvent(user, IdentityEventConstants.Event.POST_UPDATE_CREDENTIAL, true); } updateUserClaims(user, oldClaimList, claimValuesInLocalDialect, allSimpleMultiValuedClaimsList); @@ -6301,10 +6301,10 @@ private void publishEvent(User user, String eventName, boolean isAdminUpdate) properties.put(IdentityEventConstants.EventProperty.CREDENTIAL, user.getPassword()); if (isAdminUpdate) { properties.put(IdentityEventConstants.EventProperty.SCENARIO, - Scenarios.CREDENTIAL_UPDATE_BY_ADMIN_VIA_CONSOLE.name()); + Scenarios.ADMIN_UPDATED.name()); } else { properties.put(IdentityEventConstants.EventProperty.SCENARIO, - Scenarios.CREDENTIAL_UPDATE_BY_USER_VIA_MY_ACCOUNT.name()); + Scenarios.SELF_UPDATED.name()); } Event identityMgtEvent = new Event(eventName, properties); diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/Scenarios.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/Scenarios.java index 8ba5d2d5..6376963d 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/Scenarios.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/Scenarios.java @@ -26,8 +26,8 @@ */ public enum Scenarios { - CREDENTIAL_UPDATE_BY_ADMIN_VIA_CONSOLE, - CREDENTIAL_UPDATE_BY_USER_VIA_MY_ACCOUNT; + ADMIN_UPDATED, + SELF_UPDATED; /** * Get scenario which matches the given scenario name. @@ -39,7 +39,7 @@ public enum Scenarios { public static Scenarios getScenario(String scenarioName) throws IdentitySCIMException { Scenarios[] scenarios = { - CREDENTIAL_UPDATE_BY_ADMIN_VIA_CONSOLE, CREDENTIAL_UPDATE_BY_USER_VIA_MY_ACCOUNT + ADMIN_UPDATED, SELF_UPDATED }; if (StringUtils.isNotEmpty(scenarioName)) { for (Scenarios scenario : scenarios) { From a619cb959c97a68b59a4364a417fa15c10d78ab4 Mon Sep 17 00:00:00 2001 From: anjanasamindraperera Date: Wed, 13 Mar 2024 20:43:43 +0530 Subject: [PATCH 02/19] Use new event --- .../carbon/identity/scim2/common/impl/SCIMUserManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java index 26ed07c4..ee98eafa 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java @@ -1117,7 +1117,7 @@ public User updateUser(User user, Map requiredAttributes) throw // If password is updated, set it separately. if (user.getPassword() != null) { carbonUM.updateCredentialByAdminWithID(user.getId(), user.getPassword()); - publishEvent(user, IdentityEventConstants.Event.POST_UPDATE_CREDENTIAL, false); + publishEvent(user, IdentityEventConstants.Event.POST_UPDATE_CREDENTIAL_BY_SCIM, false); } updateUserClaims(user, oldClaimList, claimValuesInLocalDialect); @@ -1303,7 +1303,7 @@ public User updateUser(User user, Map requiredAttributes, // If password is updated, set it separately. if (user.getPassword() != null) { carbonUM.updateCredentialByAdminWithID(user.getId(), user.getPassword()); - publishEvent(user, IdentityEventConstants.Event.POST_UPDATE_CREDENTIAL, true); + publishEvent(user, IdentityEventConstants.Event.POST_UPDATE_CREDENTIAL_BY_SCIM, true); } updateUserClaims(user, oldClaimList, claimValuesInLocalDialect, allSimpleMultiValuedClaimsList); From 9184f854cf43604b1242de48b20849916f4e6073 Mon Sep 17 00:00:00 2001 From: anjanasamindraperera Date: Fri, 15 Mar 2024 11:09:19 +0530 Subject: [PATCH 03/19] Add EventScenarioTypes --- .../scim2/common/impl/SCIMUserManager.java | 5 +- .../common/utils/SCIMCommonConstants.java | 9 ++++ .../scim2/common/utils/Scenarios.java | 54 ------------------- 3 files changed, 11 insertions(+), 57 deletions(-) delete mode 100644 components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/Scenarios.java diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java index ee98eafa..dd064b68 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java @@ -58,7 +58,6 @@ import org.wso2.carbon.identity.scim2.common.utils.AttributeMapper; import org.wso2.carbon.identity.scim2.common.utils.SCIMCommonConstants; import org.wso2.carbon.identity.scim2.common.utils.SCIMCommonUtils; -import org.wso2.carbon.identity.scim2.common.utils.Scenarios; import org.wso2.carbon.user.api.ClaimMapping; import org.wso2.carbon.user.api.UserStoreException; import org.wso2.carbon.user.core.PaginatedUserStoreManager; @@ -6301,10 +6300,10 @@ private void publishEvent(User user, String eventName, boolean isAdminUpdate) properties.put(IdentityEventConstants.EventProperty.CREDENTIAL, user.getPassword()); if (isAdminUpdate) { properties.put(IdentityEventConstants.EventProperty.SCENARIO, - Scenarios.ADMIN_UPDATED.name()); + SCIMCommonConstants.EventScenarioTypes.POST_CREDENTIAL_UPDATE_BY_ADMIN.name()); } else { properties.put(IdentityEventConstants.EventProperty.SCENARIO, - Scenarios.SELF_UPDATED.name()); + SCIMCommonConstants.EventScenarioTypes.POST_CREDENTIAL_UPDATE_BY_USER.name()); } Event identityMgtEvent = new Event(eventName, properties); diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonConstants.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonConstants.java index b372bd78..03d18ef5 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonConstants.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonConstants.java @@ -213,5 +213,14 @@ public String toString() { return code + " : " + message; } } + + /** + * Enum which contains the event scenario types. + */ + public enum EventScenarioTypes { + + POST_CREDENTIAL_UPDATE_BY_ADMIN, + POST_CREDENTIAL_UPDATE_BY_USER, + } } diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/Scenarios.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/Scenarios.java deleted file mode 100644 index 6376963d..00000000 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/Scenarios.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). - * - * WSO2 LLC. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.wso2.carbon.identity.scim2.common.utils; - -import org.apache.commons.lang.StringUtils; -import org.wso2.carbon.identity.scim2.common.exceptions.IdentitySCIMException; - -/** - * Enum which contains the scenarios. - */ -public enum Scenarios { - - ADMIN_UPDATED, - SELF_UPDATED; - - /** - * Get scenario which matches the given scenario name. - * - * @param scenarioName Name of the scenario - * @return Scenarios - * @throws IdentitySCIMException Invalid scenario - */ - public static Scenarios getScenario(String scenarioName) throws IdentitySCIMException { - - Scenarios[] scenarios = { - ADMIN_UPDATED, SELF_UPDATED - }; - if (StringUtils.isNotEmpty(scenarioName)) { - for (Scenarios scenario : scenarios) { - if (scenarioName.equals(scenario.name())) { - return scenario; - } - } - } - throw new IdentitySCIMException("Invalid scenario: " + scenarioName); - } - -} From 3e01f5263e42e388f88f5d06e47377652a44a244 Mon Sep 17 00:00:00 2001 From: anjanasamindraperera Date: Fri, 15 Mar 2024 16:45:06 +0530 Subject: [PATCH 04/19] Add event property values from identityEvent --- .../identity/scim2/common/impl/SCIMUserManager.java | 4 ++-- .../identity/scim2/common/utils/SCIMCommonConstants.java | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java index dd064b68..68a032ba 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java @@ -6300,10 +6300,10 @@ private void publishEvent(User user, String eventName, boolean isAdminUpdate) properties.put(IdentityEventConstants.EventProperty.CREDENTIAL, user.getPassword()); if (isAdminUpdate) { properties.put(IdentityEventConstants.EventProperty.SCENARIO, - SCIMCommonConstants.EventScenarioTypes.POST_CREDENTIAL_UPDATE_BY_ADMIN.name()); + IdentityEventConstants.EventProperty.Scenario.ScenarioTypes.POST_CREDENTIAL_UPDATE_BY_ADMIN); } else { properties.put(IdentityEventConstants.EventProperty.SCENARIO, - SCIMCommonConstants.EventScenarioTypes.POST_CREDENTIAL_UPDATE_BY_USER.name()); + IdentityEventConstants.EventProperty.Scenario.ScenarioTypes.POST_CREDENTIAL_UPDATE_BY_USER); } Event identityMgtEvent = new Event(eventName, properties); diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonConstants.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonConstants.java index 03d18ef5..b372bd78 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonConstants.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonConstants.java @@ -213,14 +213,5 @@ public String toString() { return code + " : " + message; } } - - /** - * Enum which contains the event scenario types. - */ - public enum EventScenarioTypes { - - POST_CREDENTIAL_UPDATE_BY_ADMIN, - POST_CREDENTIAL_UPDATE_BY_USER, - } } From 6a9e2cab92c689395f76da506036ae7fb21cba92 Mon Sep 17 00:00:00 2001 From: anjanasamindraperera Date: Mon, 18 Mar 2024 10:36:27 +0530 Subject: [PATCH 05/19] Bump framework --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 98b4b8e3..5630907e 100644 --- a/pom.xml +++ b/pom.xml @@ -285,7 +285,7 @@ 6.5.3 3.2.0.wso2v1 4.10.2 - 7.0.89 + 7.0.105 4.13.1 20030203.000129 1.8.12 From bcff081b6aece674530484733a5148a9093f199b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 18 Mar 2024 08:07:50 +0000 Subject: [PATCH 06/19] [WSO2 Release] [Jenkins #1057] [Release 3.4.72] prepare release v3.4.72 --- components/org.wso2.carbon.identity.scim2.common/pom.xml | 2 +- components/org.wso2.carbon.identity.scim2.provider/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.common.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.provider.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.server.feature/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/org.wso2.carbon.identity.scim2.common/pom.xml b/components/org.wso2.carbon.identity.scim2.common/pom.xml index 01d73f37..7fe5db7e 100644 --- a/components/org.wso2.carbon.identity.scim2.common/pom.xml +++ b/components/org.wso2.carbon.identity.scim2.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.72-SNAPSHOT + 3.4.72 4.0.0 diff --git a/components/org.wso2.carbon.identity.scim2.provider/pom.xml b/components/org.wso2.carbon.identity.scim2.provider/pom.xml index 82391773..2be2652a 100644 --- a/components/org.wso2.carbon.identity.scim2.provider/pom.xml +++ b/components/org.wso2.carbon.identity.scim2.provider/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.72-SNAPSHOT + 3.4.72 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml index 4796040e..bec2a8eb 100644 --- a/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.72-SNAPSHOT + 3.4.72 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml index 5ddedc69..d32f9bde 100644 --- a/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.72-SNAPSHOT + 3.4.72 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml index 34b8e347..22b1fb9e 100644 --- a/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.72-SNAPSHOT + 3.4.72 4.0.0 diff --git a/pom.xml b/pom.xml index 5630907e..c0a94f39 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ identity-inbound-provisioning-scim2 pom 4.0.0 - 3.4.72-SNAPSHOT + 3.4.72 WSO2 Carbon - SCIM Provisioning Module SCIM 2.0 Implementation for C4 @@ -39,7 +39,7 @@ https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git scm:git:https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git scm:git:https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git - HEAD + v3.4.72 From 188e1918b432e6e01e2d8c0397816b9ac21ffbdc Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 18 Mar 2024 08:07:52 +0000 Subject: [PATCH 07/19] [WSO2 Release] [Jenkins #1057] [Release 3.4.72] prepare for next development iteration --- components/org.wso2.carbon.identity.scim2.common/pom.xml | 2 +- components/org.wso2.carbon.identity.scim2.provider/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.common.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.provider.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.server.feature/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/org.wso2.carbon.identity.scim2.common/pom.xml b/components/org.wso2.carbon.identity.scim2.common/pom.xml index 7fe5db7e..89ea8443 100644 --- a/components/org.wso2.carbon.identity.scim2.common/pom.xml +++ b/components/org.wso2.carbon.identity.scim2.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.72 + 3.4.73-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.scim2.provider/pom.xml b/components/org.wso2.carbon.identity.scim2.provider/pom.xml index 2be2652a..40694565 100644 --- a/components/org.wso2.carbon.identity.scim2.provider/pom.xml +++ b/components/org.wso2.carbon.identity.scim2.provider/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.72 + 3.4.73-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml index bec2a8eb..2d9345d1 100644 --- a/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.72 + 3.4.73-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml index d32f9bde..1caacdc9 100644 --- a/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.72 + 3.4.73-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml index 22b1fb9e..20729b5a 100644 --- a/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.72 + 3.4.73-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index c0a94f39..56c0be8c 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ identity-inbound-provisioning-scim2 pom 4.0.0 - 3.4.72 + 3.4.73-SNAPSHOT WSO2 Carbon - SCIM Provisioning Module SCIM 2.0 Implementation for C4 @@ -39,7 +39,7 @@ https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git scm:git:https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git scm:git:https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git - v3.4.72 + HEAD From 2ea92b70fca9098e666ef1947358a3df8019ad25 Mon Sep 17 00:00:00 2001 From: Shan Chathusanda Jayathilaka Date: Mon, 18 Mar 2024 17:11:30 +0530 Subject: [PATCH 08/19] Fix user deletion issue in the sub organizations --- .../carbon/identity/scim2/common/utils/SCIMCommonUtils.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonUtils.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonUtils.java index 4dd1f403..0db6f902 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonUtils.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonUtils.java @@ -925,6 +925,9 @@ public static void updateSystemRoleV2MetaData(int tenantId) { */ public static String getLoggedInUserID() throws CharonException { + if (PrivilegedCarbonContext.getThreadLocalCarbonContext().getUserId() != null) { + return PrivilegedCarbonContext.getThreadLocalCarbonContext().getUserId(); + } try { String loggedInUserName = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername(); String loggedInUserTenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain(); From b7e5aa0576810299f9d318009569256c088b25dd Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 19 Mar 2024 05:27:06 +0000 Subject: [PATCH 09/19] [WSO2 Release] [Jenkins #1059] [Release 3.4.73] prepare release v3.4.73 --- components/org.wso2.carbon.identity.scim2.common/pom.xml | 2 +- components/org.wso2.carbon.identity.scim2.provider/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.common.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.provider.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.server.feature/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/org.wso2.carbon.identity.scim2.common/pom.xml b/components/org.wso2.carbon.identity.scim2.common/pom.xml index 89ea8443..38aa194f 100644 --- a/components/org.wso2.carbon.identity.scim2.common/pom.xml +++ b/components/org.wso2.carbon.identity.scim2.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.73-SNAPSHOT + 3.4.73 4.0.0 diff --git a/components/org.wso2.carbon.identity.scim2.provider/pom.xml b/components/org.wso2.carbon.identity.scim2.provider/pom.xml index 40694565..04aa695d 100644 --- a/components/org.wso2.carbon.identity.scim2.provider/pom.xml +++ b/components/org.wso2.carbon.identity.scim2.provider/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.73-SNAPSHOT + 3.4.73 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml index 2d9345d1..0c1b76ee 100644 --- a/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.73-SNAPSHOT + 3.4.73 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml index 1caacdc9..78f746f4 100644 --- a/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.73-SNAPSHOT + 3.4.73 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml index 20729b5a..7d4e87e3 100644 --- a/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.73-SNAPSHOT + 3.4.73 4.0.0 diff --git a/pom.xml b/pom.xml index 56c0be8c..a6cef9f2 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ identity-inbound-provisioning-scim2 pom 4.0.0 - 3.4.73-SNAPSHOT + 3.4.73 WSO2 Carbon - SCIM Provisioning Module SCIM 2.0 Implementation for C4 @@ -39,7 +39,7 @@ https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git scm:git:https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git scm:git:https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git - HEAD + v3.4.73 From ab5407e7532bcdb44f9e3be3b7e53592f6728642 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 19 Mar 2024 05:27:08 +0000 Subject: [PATCH 10/19] [WSO2 Release] [Jenkins #1059] [Release 3.4.73] prepare for next development iteration --- components/org.wso2.carbon.identity.scim2.common/pom.xml | 2 +- components/org.wso2.carbon.identity.scim2.provider/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.common.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.provider.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.server.feature/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/org.wso2.carbon.identity.scim2.common/pom.xml b/components/org.wso2.carbon.identity.scim2.common/pom.xml index 38aa194f..0cff93f7 100644 --- a/components/org.wso2.carbon.identity.scim2.common/pom.xml +++ b/components/org.wso2.carbon.identity.scim2.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.73 + 3.4.74-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.scim2.provider/pom.xml b/components/org.wso2.carbon.identity.scim2.provider/pom.xml index 04aa695d..d0169160 100644 --- a/components/org.wso2.carbon.identity.scim2.provider/pom.xml +++ b/components/org.wso2.carbon.identity.scim2.provider/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.73 + 3.4.74-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml index 0c1b76ee..d5da00dd 100644 --- a/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.73 + 3.4.74-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml index 78f746f4..b5bb806d 100644 --- a/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.73 + 3.4.74-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml index 7d4e87e3..8a4ad54e 100644 --- a/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.73 + 3.4.74-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index a6cef9f2..fc713ab6 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ identity-inbound-provisioning-scim2 pom 4.0.0 - 3.4.73 + 3.4.74-SNAPSHOT WSO2 Carbon - SCIM Provisioning Module SCIM 2.0 Implementation for C4 @@ -39,7 +39,7 @@ https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git scm:git:https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git scm:git:https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git - v3.4.73 + HEAD From 770ddcdfeef7116c410a259a1a003660e4a310e8 Mon Sep 17 00:00:00 2001 From: Pasindu Yeshan <61885844+PasinduYeshan@users.noreply.github.com> Date: Thu, 21 Mar 2024 13:27:17 +0530 Subject: [PATCH 11/19] Update pom.xml Update charon version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc713ab6..56151343 100644 --- a/pom.xml +++ b/pom.xml @@ -289,7 +289,7 @@ 4.13.1 20030203.000129 1.8.12 - 4.0.17 + 4.0.18 1.0.76 1.8.13 From 853632d1683df9961430ac7c4ec34ad999706703 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 21 Mar 2024 11:57:09 +0000 Subject: [PATCH 12/19] [WSO2 Release] [Jenkins #1061] [Release 3.4.74] prepare release v3.4.74 --- components/org.wso2.carbon.identity.scim2.common/pom.xml | 2 +- components/org.wso2.carbon.identity.scim2.provider/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.common.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.provider.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.server.feature/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/org.wso2.carbon.identity.scim2.common/pom.xml b/components/org.wso2.carbon.identity.scim2.common/pom.xml index 0cff93f7..8c3fbf1e 100644 --- a/components/org.wso2.carbon.identity.scim2.common/pom.xml +++ b/components/org.wso2.carbon.identity.scim2.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.74-SNAPSHOT + 3.4.74 4.0.0 diff --git a/components/org.wso2.carbon.identity.scim2.provider/pom.xml b/components/org.wso2.carbon.identity.scim2.provider/pom.xml index d0169160..8c198872 100644 --- a/components/org.wso2.carbon.identity.scim2.provider/pom.xml +++ b/components/org.wso2.carbon.identity.scim2.provider/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.74-SNAPSHOT + 3.4.74 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml index d5da00dd..70760cb3 100644 --- a/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.74-SNAPSHOT + 3.4.74 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml index b5bb806d..0f1b9461 100644 --- a/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.74-SNAPSHOT + 3.4.74 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml index 8a4ad54e..1e3e5d6a 100644 --- a/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.74-SNAPSHOT + 3.4.74 4.0.0 diff --git a/pom.xml b/pom.xml index 56151343..970e23f4 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ identity-inbound-provisioning-scim2 pom 4.0.0 - 3.4.74-SNAPSHOT + 3.4.74 WSO2 Carbon - SCIM Provisioning Module SCIM 2.0 Implementation for C4 @@ -39,7 +39,7 @@ https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git scm:git:https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git scm:git:https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git - HEAD + v3.4.74 From 6c5b409fe8b4a016394046adbb79279c15c2c1a1 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 21 Mar 2024 11:57:11 +0000 Subject: [PATCH 13/19] [WSO2 Release] [Jenkins #1061] [Release 3.4.74] prepare for next development iteration --- components/org.wso2.carbon.identity.scim2.common/pom.xml | 2 +- components/org.wso2.carbon.identity.scim2.provider/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.common.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.provider.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.server.feature/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/org.wso2.carbon.identity.scim2.common/pom.xml b/components/org.wso2.carbon.identity.scim2.common/pom.xml index 8c3fbf1e..42315af5 100644 --- a/components/org.wso2.carbon.identity.scim2.common/pom.xml +++ b/components/org.wso2.carbon.identity.scim2.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.74 + 3.4.75-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.scim2.provider/pom.xml b/components/org.wso2.carbon.identity.scim2.provider/pom.xml index 8c198872..938a1631 100644 --- a/components/org.wso2.carbon.identity.scim2.provider/pom.xml +++ b/components/org.wso2.carbon.identity.scim2.provider/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.74 + 3.4.75-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml index 70760cb3..c39b701a 100644 --- a/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.74 + 3.4.75-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml index 0f1b9461..de86d0d7 100644 --- a/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.74 + 3.4.75-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml index 1e3e5d6a..3ce2ca5b 100644 --- a/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.74 + 3.4.75-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 970e23f4..791dc36f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ identity-inbound-provisioning-scim2 pom 4.0.0 - 3.4.74 + 3.4.75-SNAPSHOT WSO2 Carbon - SCIM Provisioning Module SCIM 2.0 Implementation for C4 @@ -39,7 +39,7 @@ https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git scm:git:https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git scm:git:https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git - v3.4.74 + HEAD From ffa49c65560307403187d9ca389459fa8265c59c Mon Sep 17 00:00:00 2001 From: Madhavi Gayathri Date: Mon, 25 Mar 2024 16:59:02 +0530 Subject: [PATCH 14/19] Validate the count query param with the max items configured. --- .../provider/resources/UserResource.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/components/org.wso2.carbon.identity.scim2.provider/src/main/java/org/wso2/carbon/identity/scim2/provider/resources/UserResource.java b/components/org.wso2.carbon.identity.scim2.provider/src/main/java/org/wso2/carbon/identity/scim2/provider/resources/UserResource.java index fd1dcba0..9bc4adc3 100644 --- a/components/org.wso2.carbon.identity.scim2.provider/src/main/java/org/wso2/carbon/identity/scim2/provider/resources/UserResource.java +++ b/components/org.wso2.carbon.identity.scim2.provider/src/main/java/org/wso2/carbon/identity/scim2/provider/resources/UserResource.java @@ -197,6 +197,11 @@ public Response getUser(@HeaderParam(SCIMProviderConstants.ACCEPT_HEADER) String throw new FormatNotSupportedException(error); } + // Validates the count parameter if exists. + if (count != null && IdentityUtil.isSCIM2UserEndpointPaginationEnabled()) { + count = validateCountParameter(count); + } + // obtain the user store manager UserManager userManager = IdentitySCIMManager.getInstance().getUserManager(); @@ -392,4 +397,25 @@ private void removeAskPasswordConfirmationCodeThreadLocal() { IdentityUtil.threadLocalProperties.get() .remove(IdentityRecoveryConstants.AP_CONFIRMATION_CODE_THREAD_LOCAL_PROPERTY); } + + /** + * Validate the count query parameter. + * + * @param count Requested item count. + * @return Validated count parameter. + * @throws CharonException If the count is negative. + */ + private int validateCountParameter(Integer count) throws CharonException { + + int maximumItemsPerPage = IdentityUtil.getMaximumItemPerPage(); + if (count > maximumItemsPerPage) { + if (LOG.isDebugEnabled()) { + LOG.debug(String.format("Given limit exceeds the maximum limit. Therefore the limit is set to %s.", + maximumItemsPerPage)); + } + return maximumItemsPerPage; + } + + return count; + } } From 9f2b30b8db4002a89cb6cffa8df1719a07f790a3 Mon Sep 17 00:00:00 2001 From: Madhavi Gayathri Date: Mon, 25 Mar 2024 18:42:28 +0530 Subject: [PATCH 15/19] Change method name. --- .../carbon/identity/scim2/provider/resources/UserResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/org.wso2.carbon.identity.scim2.provider/src/main/java/org/wso2/carbon/identity/scim2/provider/resources/UserResource.java b/components/org.wso2.carbon.identity.scim2.provider/src/main/java/org/wso2/carbon/identity/scim2/provider/resources/UserResource.java index 9bc4adc3..084aa6cf 100644 --- a/components/org.wso2.carbon.identity.scim2.provider/src/main/java/org/wso2/carbon/identity/scim2/provider/resources/UserResource.java +++ b/components/org.wso2.carbon.identity.scim2.provider/src/main/java/org/wso2/carbon/identity/scim2/provider/resources/UserResource.java @@ -198,7 +198,7 @@ public Response getUser(@HeaderParam(SCIMProviderConstants.ACCEPT_HEADER) String } // Validates the count parameter if exists. - if (count != null && IdentityUtil.isSCIM2UserEndpointPaginationEnabled()) { + if (count != null && IdentityUtil.isSCIM2UserMaxItemsPerPageEnabled()) { count = validateCountParameter(count); } From 5d023984fd876642bcbae61c01f10137b2f873bc Mon Sep 17 00:00:00 2001 From: Madhavi Gayathri Date: Mon, 25 Mar 2024 19:30:19 +0530 Subject: [PATCH 16/19] Remove unnecessary exception catch. --- .../carbon/identity/scim2/provider/resources/UserResource.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/org.wso2.carbon.identity.scim2.provider/src/main/java/org/wso2/carbon/identity/scim2/provider/resources/UserResource.java b/components/org.wso2.carbon.identity.scim2.provider/src/main/java/org/wso2/carbon/identity/scim2/provider/resources/UserResource.java index 084aa6cf..817fc727 100644 --- a/components/org.wso2.carbon.identity.scim2.provider/src/main/java/org/wso2/carbon/identity/scim2/provider/resources/UserResource.java +++ b/components/org.wso2.carbon.identity.scim2.provider/src/main/java/org/wso2/carbon/identity/scim2/provider/resources/UserResource.java @@ -403,9 +403,8 @@ private void removeAskPasswordConfirmationCodeThreadLocal() { * * @param count Requested item count. * @return Validated count parameter. - * @throws CharonException If the count is negative. */ - private int validateCountParameter(Integer count) throws CharonException { + private int validateCountParameter(Integer count) { int maximumItemsPerPage = IdentityUtil.getMaximumItemPerPage(); if (count > maximumItemsPerPage) { From 586af8d75cb57d181cb48c0132aadde7031314da Mon Sep 17 00:00:00 2001 From: Madhavi Gayathri Date: Mon, 25 Mar 2024 20:10:35 +0530 Subject: [PATCH 17/19] Bump framework version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 791dc36f..035d9b4f 100644 --- a/pom.xml +++ b/pom.xml @@ -285,7 +285,7 @@ 6.5.3 3.2.0.wso2v1 4.10.2 - 7.0.105 + 7.0.112 4.13.1 20030203.000129 1.8.12 From 920273d4acd6158b5c7659b068357fd9d9f5b034 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 26 Mar 2024 01:20:17 +0000 Subject: [PATCH 18/19] [WSO2 Release] [Jenkins #1063] [Release 3.4.75] prepare release v3.4.75 --- components/org.wso2.carbon.identity.scim2.common/pom.xml | 2 +- components/org.wso2.carbon.identity.scim2.provider/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.common.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.provider.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.server.feature/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/org.wso2.carbon.identity.scim2.common/pom.xml b/components/org.wso2.carbon.identity.scim2.common/pom.xml index 42315af5..563938fe 100644 --- a/components/org.wso2.carbon.identity.scim2.common/pom.xml +++ b/components/org.wso2.carbon.identity.scim2.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.75-SNAPSHOT + 3.4.75 4.0.0 diff --git a/components/org.wso2.carbon.identity.scim2.provider/pom.xml b/components/org.wso2.carbon.identity.scim2.provider/pom.xml index 938a1631..6328362a 100644 --- a/components/org.wso2.carbon.identity.scim2.provider/pom.xml +++ b/components/org.wso2.carbon.identity.scim2.provider/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.75-SNAPSHOT + 3.4.75 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml index c39b701a..395a2e52 100644 --- a/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.75-SNAPSHOT + 3.4.75 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml index de86d0d7..98ab8aa1 100644 --- a/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.75-SNAPSHOT + 3.4.75 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml index 3ce2ca5b..1472cfb3 100644 --- a/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.75-SNAPSHOT + 3.4.75 4.0.0 diff --git a/pom.xml b/pom.xml index 035d9b4f..569fa4af 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ identity-inbound-provisioning-scim2 pom 4.0.0 - 3.4.75-SNAPSHOT + 3.4.75 WSO2 Carbon - SCIM Provisioning Module SCIM 2.0 Implementation for C4 @@ -39,7 +39,7 @@ https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git scm:git:https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git scm:git:https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git - HEAD + v3.4.75 From 525a7fd69d9f02b062d6305db0441c01fe2b0b8e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 26 Mar 2024 01:20:19 +0000 Subject: [PATCH 19/19] [WSO2 Release] [Jenkins #1063] [Release 3.4.75] prepare for next development iteration --- components/org.wso2.carbon.identity.scim2.common/pom.xml | 2 +- components/org.wso2.carbon.identity.scim2.provider/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.common.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.provider.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.scim2.server.feature/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/org.wso2.carbon.identity.scim2.common/pom.xml b/components/org.wso2.carbon.identity.scim2.common/pom.xml index 563938fe..f2ab6b98 100644 --- a/components/org.wso2.carbon.identity.scim2.common/pom.xml +++ b/components/org.wso2.carbon.identity.scim2.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.75 + 3.4.76-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.scim2.provider/pom.xml b/components/org.wso2.carbon.identity.scim2.provider/pom.xml index 6328362a..52a5382d 100644 --- a/components/org.wso2.carbon.identity.scim2.provider/pom.xml +++ b/components/org.wso2.carbon.identity.scim2.provider/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.75 + 3.4.76-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml index 395a2e52..cb35cf5d 100644 --- a/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.common.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.75 + 3.4.76-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml index 98ab8aa1..1615c7c0 100644 --- a/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.provider.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.75 + 3.4.76-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml b/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml index 1472cfb3..ee162c1d 100644 --- a/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.scim2.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.provisioning.scim2 identity-inbound-provisioning-scim2 ../../pom.xml - 3.4.75 + 3.4.76-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 569fa4af..af2cabf9 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ identity-inbound-provisioning-scim2 pom 4.0.0 - 3.4.75 + 3.4.76-SNAPSHOT WSO2 Carbon - SCIM Provisioning Module SCIM 2.0 Implementation for C4 @@ -39,7 +39,7 @@ https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git scm:git:https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git scm:git:https://github.com/wso2-extensions/identity-inbound-provisioning-scim2.git - v3.4.75 + HEAD