From 1e4b6bc9955a0cd91d6dff000a860ca96b6bd822 Mon Sep 17 00:00:00 2001 From: pujavs <43700552+pujavs@users.noreply.github.com> Date: Tue, 31 May 2022 16:25:40 +0530 Subject: [PATCH] feat(jans-config-api): enhancement to expose user inum at root level of response (#1477) --- .../plugin/mgt/model/user/CustomUser.java | 27 +++++++++++++++++-- .../plugin/mgt/rest/UserResource.java | 4 +++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/jans-config-api/plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/model/user/CustomUser.java b/jans-config-api/plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/model/user/CustomUser.java index 12fc969787b..88c6339950a 100644 --- a/jans-config-api/plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/model/user/CustomUser.java +++ b/jans-config-api/plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/model/user/CustomUser.java @@ -9,46 +9,69 @@ public class CustomUser extends User { private static final long serialVersionUID = 1L; + private String inum; private String mail; private String displayName; private String jansStatus; private String givenName; private String userPassword; + + public String getInum() { + return inum; + } + + public void setInum(String inum) { + this.inum = inum; + } + public String getMail() { return mail; } + public void setMail(String mail) { this.mail = mail; } + public String getDisplayName() { return displayName; } + public void setDisplayName(String displayName) { this.displayName = displayName; } + public String getJansStatus() { return jansStatus; } + public void setJansStatus(String jansStatus) { this.jansStatus = jansStatus; } + public String getGivenName() { return givenName; } + public void setGivenName(String givenName) { this.givenName = givenName; } + public String getUserPassword() { return userPassword; } + public void setUserPassword(String userPassword) { this.userPassword = userPassword; } + @Override public String toString() { - return "CustomUser [mail=" + mail + ", displayName=" + displayName + ", jansStatus=" + jansStatus + ", givenName=" - + givenName + ", userPassword= XXXXX ]"; + return "CustomUser [inum=" + inum + ", mail=" + mail + ", displayName=" + displayName + ", jansStatus=" + + jansStatus + ", givenName=" + givenName + ", userPassword=" + userPassword + "]"; } + + + } diff --git a/jans-config-api/plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/rest/UserResource.java b/jans-config-api/plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/rest/UserResource.java index 3d9fbc36552..28346c24c09 100644 --- a/jans-config-api/plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/rest/UserResource.java +++ b/jans-config-api/plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/rest/UserResource.java @@ -44,6 +44,7 @@ public class UserResource extends BaseResource { private static final String JANS_STATUS = "jansStatus"; private static final String GIVEN_NAME = "givenName"; private static final String USER_PWD = "userPassword"; + private static final String INUM = "inum"; @Inject Logger logger; @@ -287,12 +288,14 @@ public CustomUser setCustomUserAttributes(CustomUser customUser, User user) { customUser.setJansStatus(user.getAttribute(JANS_STATUS)); customUser.setGivenName(user.getAttribute(GIVEN_NAME)); customUser.setUserPassword(user.getAttribute(USER_PWD)); + customUser.setInum(user.getAttribute(INUM)); customUser.removeAttribute(MAIL); customUser.removeAttribute(DISPLAY_NAME); customUser.removeAttribute(JANS_STATUS); customUser.removeAttribute(GIVEN_NAME); customUser.removeAttribute(USER_PWD); + customUser.removeAttribute(INUM); return customUser; } @@ -316,6 +319,7 @@ private User setUserCustomAttributes(CustomUser customUser, User user) { user.setAttribute(JANS_STATUS, customUser.getJansStatus(), false); user.setAttribute(GIVEN_NAME, customUser.getGivenName(), false); user.setAttribute(USER_PWD, customUser.getUserPassword(), false); + user.setAttribute(INUM, customUser.getInum(), false); logger.debug("Custom User - user:{}", user); return user;