Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(config-api): asset mgt save method changed and user mgt pwd validation change #8215

Merged
merged 7 commits into from
Apr 4, 2024
Merged

fix(config-api): asset mgt save method changed and user mgt pwd validation change #8215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c6babfc
fix(config-api): asset scope rename and get endpoint modification
pujavs Apr 2, 2024
b3b828f
fix(config-api): asset scope rename and get endpoint modification
pujavs Apr 2, 2024
ff7c840
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Apr 3, 2024
c42693b
fix(config-api): changes to call save binary method to save document
pujavs Apr 3, 2024
ae16713
fix(config-api): check for user pwd in case of update
pujavs Apr 3, 2024
5a3fccf
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Apr 3, 2024
d61dbc9
Merge branch 'main' into jans-config-fixes
yurem Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions jans-config-api/docs/jans-config-api-swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -9053,8 +9053,6 @@ components:
type: boolean
lockMessageConfig:
$ref: '#/components/schemas/LockMessageConfig'
fapi:
type: boolean
allResponseTypesSupported:
uniqueItems: true
type: array
Expand All @@ -9064,6 +9062,8 @@ components:
- code
- token
- id_token
fapi:
type: boolean
AuthenticationFilter:
required:
- baseDn
Expand Down
12 changes: 10 additions & 2 deletions ...plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/rest/UserResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion jans-config-api/server/src/main/java/io/jans/configapi/service/auth/AssetService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down