feat(jans-core): add new Person attribute and models for jansAuthenti…

…cator #8158 Signed-off-by: Yuriy Movchan <Yuriy.Movchan@gmail.com>
JanssenProject · Mar 29, 2024 · 5aa9b7f · 5aa9b7f
1 parent 2ad58a8
commit 5aa9b7f
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 15 deletions.
diff --git a/jans-auth-server/common/src/main/java/io/jans/as/common/model/common/User.java b/jans-auth-server/common/src/main/java/io/jans/as/common/model/common/User.java
@@ -11,9 +11,9 @@
 import org.json.JSONArray;
 
 import io.jans.as.model.exception.InvalidClaimException;
+import io.jans.model.user.SimpleUser;
 import io.jans.orm.annotation.DataEntry;
 import io.jans.orm.annotation.ObjectClass;
-import io.jans.orm.model.base.SimpleUser;
 
 /**
  * @author Yuriy Movchan Date: 06/11/2013

diff --git a/jans-auth-server/common/src/main/java/io/jans/as/common/service/common/UserService.java b/jans-auth-server/common/src/main/java/io/jans/as/common/service/common/UserService.java
@@ -151,7 +151,7 @@ public User addUser(User user, boolean active) {
         user.setAttribute("inum", inum, false);
 
         GluuStatus status = active ? GluuStatus.ACTIVE : GluuStatus.REGISTER;
-        user.setAttribute("jansStatus", status.getValue(), false);
+        user.setStatus(status);
 
         if (dataSourceTypeService.isLDAP(user.getDn())) {
 	        List<String> personCustomObjectClassList = getPersonCustomObjectClassList();

diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/AuthenticationService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/AuthenticationService.java
@@ -588,9 +588,7 @@ private User getUserByAttribute(PersistenceEntryManager ldapAuthEntryManager, St
     }
 
     private boolean checkUserStatus(User user) {
-        CustomObjectAttribute userStatus = userService.getCustomAttribute(user, "jansStatus");
-
-        if ((userStatus != null) && GluuStatus.ACTIVE.getValue().equalsIgnoreCase(StringHelper.toString(userStatus.getValue()))) {
+        if (GluuStatus.ACTIVE == user.getStatus()) {
             return true;
         }
 
@@ -894,5 +892,4 @@ public void copyAuthenticatorExternalAttributes(SessionId oldSession, SessionId
             setExternalScriptExtraParameters(newSessionIdAttributes, authExternalAttributes);
         }
     }
-
 }
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenCreatorService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenCreatorService.java
@@ -15,6 +15,7 @@
 import io.jans.as.server.model.common.RefreshToken;
 import io.jans.as.server.service.external.ExternalUpdateTokenService;
 import io.jans.as.server.service.external.context.ExternalUpdateTokenContext;
+import io.jans.model.GluuStatus;
 import jakarta.ejb.Stateless;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
@@ -84,7 +85,7 @@ private void checkUser(AuthorizationGrant authorizationGrant) {
         }
 
         final User user = authorizationGrant.getUser();
-        if (user == null || "inactive".equalsIgnoreCase(user.getStatus())) {
+        if (user == null || (GluuStatus.INACTIVE == user.getStatus())) {
             log.trace("The user associated with this grant is not found or otherwise with status=inactive.");
             throw new WebApplicationException(error(400, TokenErrorResponseType.INVALID_GRANT, "The user associated with this grant is not found or otherwise with status=inactive.").build());
         }

diff --git a/...va/io/jans/orm/model/base/SimpleUser.java → ...n/java/io/jans/model/user/SimpleUser.java b/...va/io/jans/orm/model/base/SimpleUser.java → ...n/java/io/jans/model/user/SimpleUser.java
@@ -4,7 +4,7 @@
  * Copyright (c) 2020, Janssen Project
  */
 
-package io.jans.orm.model.base;
+package io.jans.model.user;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -13,11 +13,14 @@
 import java.util.Iterator;
 import java.util.List;
 
+import io.jans.model.GluuStatus;
 import io.jans.orm.annotation.AttributeName;
 import io.jans.orm.annotation.AttributesList;
 import io.jans.orm.annotation.CustomObjectClass;
 import io.jans.orm.annotation.DataEntry;
 import io.jans.orm.annotation.ObjectClass;
+import io.jans.orm.model.base.BaseEntry;
+import io.jans.orm.model.base.CustomObjectAttribute;
 import io.jans.orm.util.StringHelper;
 
 /**
@@ -48,7 +51,7 @@ public class SimpleUser extends BaseEntry implements Serializable {
     private String[] jansAuthenticator;
 
     @AttributeName(name = "jansStatus")
-    private String status;
+    private GluuStatus status;
 
     @AttributesList(name = "name", value = "values", multiValued = "multiValued", sortByName = true)
     protected List<CustomObjectAttribute> customAttributes = new ArrayList<CustomObjectAttribute>();
@@ -88,11 +91,11 @@ public void setCreatedAt(Date createdAt) {
         this.createdAt = createdAt;
     }
 
-    public String getStatus() {
+    public GluuStatus getStatus() {
 		return status;
 	}
 
-	public void setStatus(String status) {
+	public void setStatus(GluuStatus status) {
 		this.status = status;
 	}
 

diff --git a/...m/couchbase-sample/src/main/java/io/jans/orm/couchbase/CouchbaseAuthenticationSample.java b/...m/couchbase-sample/src/main/java/io/jans/orm/couchbase/CouchbaseAuthenticationSample.java
@@ -12,8 +12,8 @@
 import org.slf4j.LoggerFactory;
 
 import io.jans.orm.couchbase.impl.CouchbaseEntryManager;
+import io.jans.orm.couchbase.model.SimpleUser;
 import io.jans.orm.couchbase.operation.impl.CouchbaseConnectionProvider;
-import io.jans.orm.model.base.SimpleUser;
 import io.jans.orm.search.filter.Filter;
 
 /**

diff --git a/...chbase-sample/src/main/java/io/jans/orm/couchbase/CouchbaseScimSubstringSearchSample.java b/...chbase-sample/src/main/java/io/jans/orm/couchbase/CouchbaseScimSubstringSearchSample.java
@@ -12,9 +12,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.jans.orm.couchbase.model.SimpleUser;
 import io.jans.orm.couchbase.impl.CouchbaseEntryManager;
 import io.jans.orm.couchbase.operation.impl.CouchbaseConnectionProvider;
-import io.jans.orm.model.base.SimpleUser;
 import io.jans.orm.search.filter.Filter;
 
 /**

diff --git a/jans-orm/sql-sample/src/main/java/io/jans/orm/sql/SqlScimSubstringSearchSample.java b/jans-orm/sql-sample/src/main/java/io/jans/orm/sql/SqlScimSubstringSearchSample.java
@@ -11,7 +11,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.jans.orm.model.base.SimpleUser;
+import io.jans.orm.sql.model.SimpleUser;
 import io.jans.orm.search.filter.Filter;
 import io.jans.orm.sql.impl.SqlEntryManager;
 import io.jans.orm.sql.persistence.SqlEntryManagerSample;

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
@@ -20,12 +20,12 @@
 
 import io.jans.as.model.common.IdType;
 import io.jans.model.JansAttribute;
+import io.jans.model.user.SimpleUser;
 import io.jans.orm.PersistenceEntryManager;
 import io.jans.orm.exception.operation.DuplicateEntryException;
 import io.jans.orm.model.AttributeData;
 import io.jans.orm.model.SearchScope;
 import io.jans.orm.model.base.SimpleBranch;
-import io.jans.orm.model.base.SimpleUser;
 import io.jans.orm.search.filter.Filter;
 import io.jans.scim.exception.DuplicateEmailException;
 import io.jans.scim.model.GluuCustomAttribute;