Skip to content

Commit

Permalink
feat(jans-config-api): user management endpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@pujavs
pujavs committed Apr 11, 2022
1 parent 1180068 commit f28f3b8
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 24 deletions.
24 changes: 19 additions & 5 deletions jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/UserResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,30 +80,37 @@ public Response getUserByInum(@PathParam(ApiConstants.INUM) @NotNull String inum
logger.debug("user:{}", user);

// excludedAttributes
user = userSrv.excludedAttributes(user, ApiConstants.USER_EXCLUDED_ATTRIBUTES);
user = excludeUserAttributes(user);

return Response.ok(user).build();
}

@POST
@ProtectedApi(scopes = { ApiAccessConstants.USER_WRITE_ACCESS })
public Response createUser(@Valid User user) {
public Response createUser(@Valid User user) throws IllegalAccessException, InvocationTargetException {
if (logger.isDebugEnabled()) {
logger.debug("User details to be added - user:{}", escapeLog(user));
}
user = userSrv.addUser(user, true);
logger.debug("User created {}", user);

// excludedAttributes
user = excludeUserAttributes(user);

return Response.status(Response.Status.CREATED).entity(user).build();
}

@PUT
@ProtectedApi(scopes = { ApiAccessConstants.USER_WRITE_ACCESS })
public Response updateUser(@Valid User user) {
public Response updateUser(@Valid User user) throws IllegalAccessException, InvocationTargetException {
if (logger.isDebugEnabled()) {
logger.debug("User details to be updated - user:{}", escapeLog(user));
}
user = userSrv.updateUser((user));
logger.debug("Updated user:{}", user);

// excludedAttributes
user = excludeUserAttributes(user);

return Response.ok(user).build();
}
Expand All @@ -112,7 +119,7 @@ public Response updateUser(@Valid User user) {
@ProtectedApi(scopes = { ApiAccessConstants.USER_WRITE_ACCESS })
@Path(ApiConstants.INUM_PATH)
public Response patchUser(@PathParam(ApiConstants.INUM) @NotNull String inum,
@NotNull UserPatchRequest userPatchRequest) throws JsonPatchException, IOException {
@NotNull UserPatchRequest userPatchRequest) throws IllegalAccessException, InvocationTargetException, JsonPatchException, IOException {
if (logger.isDebugEnabled()) {
logger.debug("User:{} to be patched with :{} ", escapeLog(inum), escapeLog(userPatchRequest));
}
Expand All @@ -123,6 +130,9 @@ public Response patchUser(@PathParam(ApiConstants.INUM) @NotNull String inum,
// patch user
existingUser = userSrv.patchUser(inum, userPatchRequest);
logger.debug("Patched user:{}", existingUser);

// excludedAttributes
existingUser = excludeUserAttributes(existingUser);

return Response.ok(existingUser).build();
}
Expand Down Expand Up @@ -160,9 +170,13 @@ private List<User> doSearch(SearchRequest searchReq) throws IllegalAccessExcepti
}

// excludedAttributes
users = userSrv.excludedAttributes(users, searchReq.getExcludedAttributesStr());
users = userSrv.excludeAttributes(users, searchReq.getExcludedAttributesStr());

return users;
}

private User excludeUserAttributes(User user) throws IllegalAccessException, InvocationTargetException {
return userSrv.excludeAttributes(user, ApiConstants.USER_EXCLUDED_ATTRIBUTES);
}

}
37 changes: 27 additions & 10 deletions jans-config-api/server/src/main/java/io/jans/configapi/service/auth/UserService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,18 @@

import static io.jans.as.model.util.Util.escapeLog;

import java.lang.reflect.Field;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.inject.Named;

import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.BeanUtilsBean;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;

Expand Down Expand Up @@ -127,7 +130,7 @@ public User getUserBasedOnInum(String inum) {
try {
result = getUserByInum(inum);
} catch (Exception ex) {
logger.error("Failed to load user entry", ex);
logger.debug("Failed to load user entry", ex);
}
return result;
}
Expand Down Expand Up @@ -165,18 +168,18 @@ else if (attribute.getValue() == null || attribute.getValues() == null) {
return user;
}

public List<User> excludedAttributes(List<User> users, String commaSeparatedString)
public List<User> excludeAttributes(List<User> users, String commaSeparatedString)
throws IllegalAccessException, InvocationTargetException {
logger.debug("Attributes:{} to be excluded from users:{} ", commaSeparatedString, users);
for (User user : users) {
excludedAttributes(user, commaSeparatedString);
excludeAttributes(user, commaSeparatedString);
}
logger.debug("Users:{} after excluding attribute:{} ", users, commaSeparatedString);

return users;
}

public User excludedAttributes(User user, String commaSeparatedString)
public User excludeAttributes(User user, String commaSeparatedString)
throws IllegalAccessException, InvocationTargetException {
logger.debug("Attributes:{} to be excluded from user:{} ", commaSeparatedString, user);
if (user == null || StringUtils.isEmpty(commaSeparatedString)) {
Expand All @@ -185,19 +188,33 @@ public User excludedAttributes(User user, String commaSeparatedString)
List<String> excludedAttributes = Arrays.asList(commaSeparatedString.split(","));
logger.debug("Attributes List:{} to be excluded ", excludedAttributes);

List<Field> allFields = authUtil.getAllFields(user.getClass());
logger.debug("All user fields :{} ",allFields);


HashMap<String, String> map = new HashMap<>();
for (String attribute : excludedAttributes) {
logger.debug("User class conatins attribute:{} ? :{} ", attribute,
authUtil.doesObjectContainField(user, attribute));
if (authUtil.doesObjectContainField(user, attribute)) {
BeanUtils.setProperty(user, attribute, null);

} else {
logger.debug("User class allFields:{} conatins attribute:{} ? :{} ", allFields, attribute,
authUtil.containsField(allFields, attribute));
if (authUtil.containsField(allFields, attribute)) {
logger.debug("User class contains attribute:{} ! ",attribute);
map.put(attribute, null);
}
else {
logger.debug("Removing custom attribute:{} from user:{} ", attribute, user);
user.removeAttribute(attribute);
}
}

logger.debug("Attributes map:{} to be excluded ", map);
if(!map.isEmpty()) {
logger.debug("Removing simple attributes:{} from user object ", map);
BeanUtilsBean.getInstance().getConvertUtils().register(false, false, 0);
BeanUtils.populate(user, map);
}

return user;
}


}
34 changes: 25 additions & 9 deletions jans-config-api/server/src/main/java/io/jans/configapi/util/AuthUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import io.jans.util.security.StringEncrypter.EncryptionException;

import java.lang.reflect.Method;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Arrays;
Expand All @@ -32,7 +33,6 @@
import javax.ws.rs.core.Response;

import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;

@ApplicationScoped
Expand Down Expand Up @@ -354,13 +354,29 @@ public boolean isEqualCollection(List<String> list1, List<String> list2) {
return CollectionUtils.isEqualCollection(list1, list2);
}

public boolean doesObjectContainField(Object object, String fieldName) {
log.debug("Check if object:{} contain fieldName:{} ", object, fieldName);
if(object == null || StringUtils.isEmpty(fieldName)) {
return false;
}
return Arrays.stream(object.getClass().getFields())
.anyMatch(f -> f.getName().equals(fieldName));
}
public boolean containsField(List<Field> allFields, String attribute) {
log.debug("allFields:{}, attribute:{}, allFields.contains(attribute):{} ", allFields , attribute, allFields.stream().anyMatch(f -> f.getName().equals(attribute)));

return allFields.stream().anyMatch(f -> f.getName().equals(attribute));
}

public List<Field> getAllFields(Class<?> type) {
List<Field> allFields = new ArrayList<>();
allFields = getAllFields(allFields, type);
log.debug("All Fields of User class:{} ", allFields);

return allFields;
}

public List<Field> getAllFields(List<Field> fields, Class<?> type) {
log.debug("fields:{} of type:{} ", fields, type);
fields.addAll(Arrays.asList(type.getDeclaredFields()));

if (type.getSuperclass() != null) {
getAllFields(fields, type.getSuperclass());
}
log.debug("Final fields:{} of type:{} ", fields, type);
return fields;
}

}

0 comments on commit f28f3b8

Please sign in to comment.