Merge pull request #31 from shanggeeth/master

wso2-extensions · Jan 9, 2025 · e4fbef0 · e4fbef0
2 parents acef313 + 7b82e8d
commit e4fbef0
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 4 deletions.
diff --git a/components/org.wso2.carbon.identity.provisioning.connector.scim2/pom.xml b/components/org.wso2.carbon.identity.provisioning.connector.scim2/pom.xml
@@ -87,6 +87,10 @@
 			<groupId>org.wso2.carbon.identity.framework</groupId>
 			<artifactId>org.wso2.carbon.identity.application.common</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.wso2.carbon.identity.inbound.provisioning.scim2</groupId>
+			<artifactId>org.wso2.carbon.identity.scim2.common</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.jacoco</groupId>
 			<artifactId>org.jacoco.agent</artifactId>
@@ -115,6 +119,11 @@
 			<version>${powermock.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.wso2.carbon.identity.framework</groupId>
+			<artifactId>org.wso2.carbon.identity.role.v2.mgt.core</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.squareup.okio</groupId>
 			<artifactId>okio</artifactId>
@@ -204,6 +213,10 @@
 							org.osgi.service.component; version="${osgi.service.component.imp.pkg.version.range}",
 							org.wso2.carbon.identity.application.common.model;
 							version="${carbon.identity.framework.import.version.range}",
+							org.wso2.carbon.identity.scim2.common.impl;
+							version="${identity.inbound.provisioning.scim2.import.version.range}",
+							org.wso2.carbon.identity.scim2.common.utils;
+							version="${identity.inbound.provisioning.scim2.import.version.range}",
 							org.wso2.carbon.identity.provisioning;
 							version="${carbon.identity.framework.import.version.range}",
 							org.wso2.charon3.core.*; version="${charon.wso2.import.version.range}",

diff --git a/...ava/org/wso2/carbon/identity/provisioning/connector/scim2/SCIM2ProvisioningConnector.java b/...ava/org/wso2/carbon/identity/provisioning/connector/scim2/SCIM2ProvisioningConnector.java
@@ -31,6 +31,7 @@
 import org.wso2.carbon.identity.provisioning.ProvisioningOperation;
 import org.wso2.carbon.identity.provisioning.ProvisioningUtil;
 import org.wso2.carbon.identity.provisioning.connector.scim2.util.SCIMClaimResolver;
+import org.wso2.carbon.identity.scim2.common.utils.SCIMCommonUtils;
 import org.wso2.carbon.user.core.UserCoreConstants;
 import org.wso2.carbon.user.core.UserStoreException;
 import org.wso2.charon3.core.attributes.ComplexAttribute;
@@ -361,7 +362,8 @@ public String[] getClaimDialectUris() {
 
         return new String[]{SCIM2ProvisioningConnectorConstants.DEFAULT_SCIM2_CORE_DIALECT,
                 SCIM2ProvisioningConnectorConstants.DEFAULT_SCIM2_USER_DIALECT,
-                SCIM2ProvisioningConnectorConstants.DEFAULT_SCIM2_ENTERPRISE_DIALECT};
+                SCIM2ProvisioningConnectorConstants.DEFAULT_SCIM2_ENTERPRISE_DIALECT,
+                SCIMCommonUtils.getCustomSchemaURI()};
     }
 
     /**

diff --git a/...in/java/org/wso2/carbon/identity/provisioning/connector/scim2/util/SCIMClaimResolver.java b/...in/java/org/wso2/carbon/identity/provisioning/connector/scim2/util/SCIMClaimResolver.java
@@ -21,6 +21,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.identity.provisioning.connector.scim2.SCIM2ProvisioningConnectorConstants;
+import org.wso2.carbon.identity.scim2.common.impl.IdentitySCIMManager;
 import org.wso2.charon3.core.attributes.Attribute;
 import org.wso2.charon3.core.attributes.ComplexAttribute;
 import org.wso2.charon3.core.attributes.MultiValuedAttribute;
@@ -29,6 +30,8 @@
 import org.wso2.charon3.core.exceptions.BadRequestException;
 import org.wso2.charon3.core.exceptions.CharonException;
 import org.wso2.charon3.core.exceptions.NotFoundException;
+import org.wso2.charon3.core.exceptions.NotImplementedException;
+import org.wso2.charon3.core.extensions.UserManager;
 import org.wso2.charon3.core.objects.AbstractSCIMObject;
 import org.wso2.charon3.core.objects.Group;
 import org.wso2.charon3.core.objects.SCIMObject;
@@ -638,7 +641,13 @@ private static ResourceTypeSchema getResourceSchema(int scimObjectType) {
         ResourceTypeSchema resourceSchema = null;
         switch (scimObjectType) {
             case 1:
-                resourceSchema = SCIMResourceSchemaManager.getInstance().getUserResourceSchema();
+                try {
+                    UserManager userManager = IdentitySCIMManager.getInstance().getUserManager();
+                    resourceSchema = SCIMResourceSchemaManager.getInstance().getUserResourceSchema(userManager);
+                } catch (CharonException | BadRequestException | NotImplementedException e) {
+                    log.debug("Error in getting user resource schema with user manager.", e);
+                    resourceSchema = SCIMResourceSchemaManager.getInstance().getUserResourceSchema();
+                }
                 break;
             case 2:
                 resourceSchema = SCIMSchemaDefinitions.SCIM_GROUP_SCHEMA;

diff --git a/...ava/org.wso2.carbon.identity.provisioning.connector.scim2.test/SCIMClaimResolverTest.java b/...ava/org.wso2.carbon.identity.provisioning.connector.scim2.test/SCIMClaimResolverTest.java
@@ -17,26 +17,36 @@
 */
 package org.wso2.carbon.identity.provisioning.connector.scim2.test;
 
+import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.reflect.Whitebox;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 import org.wso2.carbon.identity.provisioning.connector.scim2.util.SCIMClaimResolver;
+import org.wso2.carbon.identity.scim2.common.impl.IdentitySCIMManager;
+import org.wso2.charon3.core.extensions.UserManager;
 import org.wso2.charon3.core.schema.SCIMResourceSchemaManager;
 import org.wso2.charon3.core.schema.SCIMSchemaDefinitions;
 
+import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
+@PrepareForTest(IdentitySCIMManager.class)
 public class SCIMClaimResolverTest {
 
     private SCIMClaimResolver scimClaimResolver;
+    private IdentitySCIMManager identitySCIMManager;
+    private UserManager userManager;
 
     @BeforeMethod
     public void setUp() throws Exception {
 
         scimClaimResolver = new SCIMClaimResolver();
+        identitySCIMManager = Mockito.mock(IdentitySCIMManager.class);
+        userManager = Mockito.mock(UserManager.class);
         initMocks(this);
     }
 
@@ -57,6 +67,9 @@ public void testGetResourceSchemaforGroup() throws Exception {
     public void testGetResourceSchemaforUser() throws Exception {
 
         SCIMClaimResolver s = PowerMockito.spy(scimClaimResolver);
+        PowerMockito.mockStatic(IdentitySCIMManager.class);
+        when(IdentitySCIMManager.getInstance()).thenReturn(identitySCIMManager);
+        when(identitySCIMManager.getUserManager()).thenReturn(userManager);
         Assert.assertEquals(Whitebox.invokeMethod(s, "getResourceSchema", 1),
                 SCIMResourceSchemaManager.getInstance().getUserResourceSchema());
     }

diff --git a/pom.xml b/pom.xml
@@ -83,6 +83,11 @@
                 <artifactId>org.wso2.carbon.identity.application.common</artifactId>
                 <version>${identity.framework.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
+                <artifactId>org.wso2.carbon.identity.role.v2.mgt.core</artifactId>
+                <version>${identity.framework.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.user.core</artifactId>
@@ -128,6 +133,11 @@
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>${jacoco.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.inbound.provisioning.scim2</groupId>
+                <artifactId>org.wso2.carbon.identity.scim2.common</artifactId>
+                <version>${identity.inbound.provisioning.scim2.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -309,18 +319,21 @@
     <properties>
         <!--Carbon framework version-->
         <carbon.identity.framework.import.version.range>[5.0.0, 8.0.0)</carbon.identity.framework.import.version.range>
-        <identity.framework.version>5.21.37</identity.framework.version>
+        <identity.framework.version>7.0.78</identity.framework.version>
         <identity.inbound.provisioning.scim.version>5.1.3</identity.inbound.provisioning.scim.version>
         <identity.inbound.provisioning.scim.import.version.range>[5.0.0, 6.0.0)
         </identity.inbound.provisioning.scim.import.version.range>
+        <identity.inbound.provisioning.scim2.version>3.4.67</identity.inbound.provisioning.scim2.version>
+        <identity.inbound.provisioning.scim2.import.version.range>[3.0.0, 4.0.0)
+        </identity.inbound.provisioning.scim2.import.version.range>
         <identity.outbound.provisioning.scim2.export.version>${project.version}
         </identity.outbound.provisioning.scim2.export.version>
         <!-- Carbon kernel version -->
         <carbon.kernel.version>4.4.7</carbon.kernel.version>
         <osgi.framework.imp.pkg.version.range>[1.7.0, 2.0.0)</osgi.framework.imp.pkg.version.range>
         <osgi.service.component.imp.pkg.version.range>[1.2.0, 2.0.0)</osgi.service.component.imp.pkg.version.range>
         <!-- Charon version -->
-        <charon.wso2.version.identity>4.0.1</charon.wso2.version.identity>
+        <charon.wso2.version.identity>4.0.17</charon.wso2.version.identity>
         <charon.wso2.import.version.range>[3.0.0, 4.1.0)</charon.wso2.import.version.range>
         <!-- Commons -->
         <commons-lang.wso2.osgi.version.range>[2.6.0,3.0.0)</commons-lang.wso2.osgi.version.range>