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

Jans config api 418 #1548

Merged
merged 3 commits into from
Jun 13, 2022
Merged

Jans config api 418 #1548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fece5ac
feat(jans-config-api): user management endpoint for user password
pujavs Jun 9, 2022
b0889a1
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jun 10, 2022
20699d1
feat:(jans-config-api): userPassword made mandatory only for create u…
pujavs Jun 10, 2022
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
21 changes: 18 additions & 3 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 @@ -2531,7 +2531,7 @@ paths:
schema:
title: User Details.
description: User Details.
$ref: '#/components/schemas/CustomUser'
$ref: '#/components/schemas/ExtendedCustomUser'
responses:
'201':
description: Created
Expand Down Expand Up @@ -6813,7 +6813,6 @@ components:
- displayName
- givenName
- jansStatus
- userPassword
properties:
dn:
type: string
Expand All @@ -6824,6 +6823,11 @@ components:
jansStatus:
type: string
description: User status
enum:
- ACTIVE
- INACTIVE
- EXPIRED
- REGISTER
userId:
description: A domain issued and managed identifier for the user.
type: string
Expand Down Expand Up @@ -6860,7 +6864,18 @@ components:
inum:
description: XRI i-number. Identifier to uniquely identify the user.
type: string


ExtendedCustomUser:
allOf: # Combines the CustomUser and the inline model
- $ref: '#/components/schemas/CustomUser'
- type: object
required:
- userPassword
properties:
userPassword:
type: string
description: User password

UserPatchRequest:
title: User Patch Request object
description: UserPatchRequest.
Expand Down
9 changes: 5 additions & 4 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 @@ -117,7 +117,7 @@ public Response createUser(@Valid CustomUser customUser)
logger.debug("Create user:{}", user);

// checking mandatory attributes
checkMissingAttributes(user);
checkMissingAttributes(user,null);

user = userSrv.addUser(user, true);
logger.debug("User created {}", user);
Expand Down Expand Up @@ -145,7 +145,8 @@ public Response updateUser(@Valid CustomUser customUser)
logger.debug("Create user:{}", user);

// checking mandatory attributes
checkMissingAttributes(user);
List<String> excludeAttributes = List.of(USER_PWD);
checkMissingAttributes(user, excludeAttributes);

user = userSrv.updateUser(user);
logger.debug("Updated user:{}", user);
Expand Down Expand Up @@ -232,9 +233,9 @@ private User excludeUserAttributes(User user) throws IllegalAccessException, Inv
return userSrv.excludeAttributes(user, userSrv.getUserExclusionAttributesAsString());
}

private void checkMissingAttributes(User user)
private void checkMissingAttributes(User user, List<String> excludeAttributes)
throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
String missingAttributes = userSrv.checkMandatoryFields(user);
String missingAttributes = userSrv.checkMandatoryFields(user,excludeAttributes);
logger.debug("missingAttributes:{}", missingAttributes);

if (StringHelper.isEmpty(missingAttributes)) {
Expand Down
23 changes: 20 additions & 3 deletions ...ugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/service/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,10 @@ public String getUserExclusionAttributesAsString() {
return authUtil.getUserExclusionAttributesAsString();
}

public String checkMandatoryFields(User user)
public String checkMandatoryFields(User user, List<String> excludeAttributes)
throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
List<String> mandatoryAttributes = authUtil.getUserMandatoryAttributes();
logger.debug("mandatoryAttributess :{} ", mandatoryAttributes);
logger.debug("mandatoryAttributess :{}, excludeAttributes:{} ", mandatoryAttributes, excludeAttributes);

StringBuilder missingAttributes = new StringBuilder();

Expand All @@ -239,6 +239,13 @@ public String checkMandatoryFields(User user)
for (String attribute : mandatoryAttributes) {
logger.debug("User class allFields:{} conatins attribute:{} ? :{} ", allFields, attribute,
authUtil.containsField(allFields, attribute));

//check if to be excluded
if(isExcludedAttribute(excludeAttributes,attribute)) {
logger.debug("Not checking if the attribute:{} is missing as it's in excludeAttributes:{}" , attribute, excludeAttributes);
continue;
}

if (authUtil.containsField(allFields, attribute)) {
logger.debug("Checking if attribute:{} is simple attribute", attribute);
attributeValue = BeanUtils.getProperty(user, attribute);
Expand All @@ -261,5 +268,15 @@ public String checkMandatoryFields(User user)
logger.debug("Returning missingAttributes:{} ", missingAttributes);
return missingAttributes.toString();
}


private boolean isExcludedAttribute(List<String> excludeAttributes,String attribute) {
logger.debug(" Is attribute:{} in excludeAttributeList:{} ", attribute, excludeAttributes);

if(excludeAttributes==null || excludeAttributes.isEmpty()) {
return false;
}

return excludeAttributes.stream().anyMatch( e -> e.equals(attribute));
}

}