feat: call id-generation script when creating user/group #1145

JanssenProject · May 12, 2022 · 3a9a03a · 3a9a03a
1 parent 338166d
commit 3a9a03a
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 31 deletions.
diff --git a/jans-scim/server/src/main/java/io/jans/scim/service/init/AppInitializer.java b/jans-scim/server/src/main/java/io/jans/scim/service/init/AppInitializer.java
@@ -85,7 +85,8 @@ public void applicationInitialized(@Observes @Initialized(ApplicationScoped.clas
         configurationFactory.initTimer();
         loggerService.initTimer();
         //externalScimService.init();
-        customScriptManager.initTimer(Arrays.asList(CustomScriptType.SCIM, CustomScriptType.PERSISTENCE_EXTENSION));
+        customScriptManager.initTimer(Arrays.asList(
+            CustomScriptType.SCIM, CustomScriptType.PERSISTENCE_EXTENSION, CustomScriptType.ID_GENERATOR));
         logger.info("Initialized!");
 
     }

diff --git a/jans-scim/service/pom.xml b/jans-scim/service/pom.xml
@@ -95,6 +95,10 @@
 			<groupId>io.jans</groupId>
 			<artifactId>jans-auth-client</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.jans</groupId>
+			<artifactId>jans-auth-common</artifactId>
+		</dependency>
 
 		<!-- Weld -->
 		<dependency>

diff --git a/jans-scim/service/src/main/java/io/jans/scim/service/GroupService.java b/jans-scim/service/src/main/java/io/jans/scim/service/GroupService.java
@@ -6,16 +6,8 @@
 
 package io.jans.scim.service;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
-import org.slf4j.Logger;
-
+import io.jans.as.common.service.common.ExternalIdGeneratorService;
+import io.jans.as.model.common.IdType;
 import io.jans.orm.PersistenceEntryManager;
 import io.jans.orm.exception.EntryPersistenceException;
 import io.jans.orm.exception.operation.DuplicateEntryException;
@@ -29,6 +21,15 @@
 import io.jans.util.ArrayHelper;
 import io.jans.util.StringHelper;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import org.slf4j.Logger;
+
 /**
  * Provides operations with groups
  * 
@@ -51,6 +52,9 @@ public class GroupService implements Serializable {
 	@Inject
 	private PersonService personService;
 
+	@Inject
+	private ExternalIdGeneratorService idGeneratorService;
+
 	public void addGroup(GluuGroup group) throws Exception {
 		GluuGroup displayNameGroup = new GluuGroup();
 		displayNameGroup.setDisplayName(group.getDisplayName());
@@ -179,7 +183,19 @@ public GluuGroupVisibility[] getVisibilityTypes() {
 	 * @return New inum for group
 	 */
 	private String generateInumForNewGroupImpl() throws Exception {
-		return UUID.randomUUID().toString();
+
+	    String id = null;
+	    if (idGeneratorService.isEnabled()) {
+	        id = idGeneratorService.executeExternalGenerateIdMethod(
+	            //Use the first enabled script only
+	            idGeneratorService.getCustomScriptConfigurations().stream().findFirst().orElse(null)
+	            , ""    //appId 
+	            , IdType.GROUP.getType()    //idType
+	            , ""    //idPrefix
+            );
+	    }
+        return id == null ? UUID.randomUUID().toString() : id;
+
 	}
 
 	public GluuGroup getGroupByDn(String Dn) {

diff --git a/jans-scim/service/src/main/java/io/jans/scim/service/PersonService.java b/jans-scim/service/src/main/java/io/jans/scim/service/PersonService.java
@@ -6,19 +6,8 @@
 
 package io.jans.scim.service;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.time.Instant;
-import java.util.UUID;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
+import io.jans.as.common.service.common.ExternalIdGeneratorService;
+import io.jans.as.model.common.IdType;
 import io.jans.model.GluuAttribute;
 import io.jans.orm.PersistenceEntryManager;
 import io.jans.orm.exception.operation.DuplicateEntryException;
@@ -27,16 +16,28 @@
 import io.jans.orm.model.base.SimpleBranch;
 import io.jans.orm.model.base.SimpleUser;
 import io.jans.orm.search.filter.Filter;
-import io.jans.util.ArrayHelper;
-import io.jans.util.OxConstants;
-import io.jans.util.StringHelper;
-import org.slf4j.Logger;
-
 import io.jans.scim.exception.DuplicateEmailException;
 import io.jans.scim.model.GluuCustomAttribute;
 import io.jans.scim.model.GluuCustomPerson;
 import io.jans.scim.model.User;
 import io.jans.scim.util.OxTrustConstants;
+import io.jans.util.ArrayHelper;
+import io.jans.util.OxConstants;
+import io.jans.util.StringHelper;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.time.Instant;
+import java.util.UUID;
+
+import org.slf4j.Logger;
 
 /**
  * Provides operations with persons
@@ -60,6 +61,9 @@ public class PersonService implements Serializable {
 	@Inject
 	private OrganizationService organizationService;
 
+	@Inject
+	private ExternalIdGeneratorService idGeneratorService;
+
 	private List<GluuCustomAttribute> mandatoryAttributes;
 
 	public void addCustomObjectClass(GluuCustomPerson person) {
@@ -274,7 +278,19 @@ public String generateInumForNewPerson() {
 	 * @throws Exception
 	 */
 	private String generateInumForNewPersonImpl() {
-		return UUID.randomUUID().toString();
+
+	    String id = null;
+	    if (idGeneratorService.isEnabled()) {
+	        id = idGeneratorService.executeExternalGenerateIdMethod(
+	            //Use the first enabled script only
+	            idGeneratorService.getCustomScriptConfigurations().stream().findFirst().orElse(null)
+	            , ""    //appId 
+	            , IdType.PEOPLE.getType()    //idType
+	            , ""    //idPrefix
+            );
+	    }
+        return id == null ? UUID.randomUUID().toString() : id;
+
 	}
 
 	public String getDnForPerson(String inum) {