From c551e63a59f5a266085f6150277c1405d25d2bb0 Mon Sep 17 00:00:00 2001 From: pujavs <43700552+pujavs@users.noreply.github.com> Date: Thu, 4 Apr 2024 12:51:45 +0530 Subject: [PATCH] fix(config-api): asset mgt save method changed and user mgt pwd validation change (#8215) * fix(config-api): asset scope rename and get endpoint modification Signed-off-by: pujavs * fix(config-api): asset scope rename and get endpoint modification Signed-off-by: pujavs * fix(config-api): changes to call save binary method to save document Signed-off-by: pujavs * fix(config-api): check for user pwd in case of update Signed-off-by: pujavs --------- Signed-off-by: pujavs --- jans-config-api/docs/jans-config-api-swagger.yaml | 12 ++++++------ .../jans/configapi/plugin/mgt/rest/UserResource.java | 12 ++++++++++-- .../io/jans/configapi/service/auth/AssetService.java | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/jans-config-api/docs/jans-config-api-swagger.yaml b/jans-config-api/docs/jans-config-api-swagger.yaml index c07eb87f03e..b197ca6856d 100644 --- a/jans-config-api/docs/jans-config-api-swagger.yaml +++ b/jans-config-api/docs/jans-config-api-swagger.yaml @@ -8219,19 +8219,19 @@ components: type: string selected: type: boolean - adminCanEdit: + whitePagesCanView: type: boolean adminCanView: type: boolean + adminCanEdit: + type: boolean userCanEdit: type: boolean userCanView: type: boolean - userCanAccess: - type: boolean adminCanAccess: type: boolean - whitePagesCanView: + userCanAccess: type: boolean baseDn: type: string @@ -9053,8 +9053,6 @@ components: type: boolean lockMessageConfig: $ref: '#/components/schemas/LockMessageConfig' - fapi: - type: boolean allResponseTypesSupported: uniqueItems: true type: array @@ -9064,6 +9062,8 @@ components: - code - token - id_token + fapi: + type: boolean AuthenticationFilter: required: - baseDn 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 01c50e06c6d..5458c41d92b 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 @@ -42,6 +42,8 @@ import static io.jans.as.model.util.Util.escapeLog; +import org.apache.commons.lang.StringUtils; + @Path(Constants.CONFIG_USER) @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) @@ -435,11 +437,17 @@ private User setUserAttributes(CustomUser customUser) { } private User setUserCustomAttributes(CustomUser customUser, User user) { - user.setAttribute(MAIL, customUser.getMail(), false); + if(StringUtils.isNotBlank(customUser.getMail())) { + user.setAttribute(MAIL, customUser.getMail(), false); + } + user.setAttribute(DISPLAY_NAME, customUser.getDisplayName(), false); user.setAttribute(JANS_STATUS, customUser.getJansStatus(), false); user.setAttribute(GIVEN_NAME, customUser.getGivenName(), false); - user.setAttribute(USER_PWD, customUser.getUserPassword(), false); + + if(StringUtils.isNotBlank(customUser.getUserPassword())) { + user.setAttribute(USER_PWD, customUser.getUserPassword(), false); + } user.setAttribute(INUM, customUser.getInum(), false); logger.debug("Custom User - user:{}", user); diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/AssetService.java b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/AssetService.java index 548aefa876f..047671916e1 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/AssetService.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/AssetService.java @@ -311,7 +311,7 @@ private Document updateRevision(Document asset) { private Document saveNewAsset(Document asset, InputStream stream) { log.info("Saving new asset in DB DocumentStore - asset:{}, stream:{}", asset, stream); - String path = dBDocumentStoreProvider.saveDocumentStream(asset.getDisplayName(), asset.getDescription(), stream, + String path = dBDocumentStoreProvider.saveBinaryDocumentStream(asset.getDisplayName(), asset.getDescription(), stream, asset.getJansModuleProperty()); log.info("Successfully stored asset - Path of saved new asset is :{}", path); return asset;