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

chore: update person orm bean #10822

Merged
merged 3 commits into from
Feb 12, 2025
Merged

chore: update person orm bean #10822

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
2c05d81
chore: update person orm bean #10821
jgomer2001 Feb 10, 2025
190f8aa
Merge branch 'main' into jans-scim-issue_10821
moabu Feb 12, 2025
0bca40d
Merge branch 'main' into jans-scim-issue_10821
moabu Feb 12, 2025
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
2 changes: 1 addition & 1 deletion jans-scim/model/src/main/java/io/jans/scim/model/scim/ScimCustomPerson.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public void setUpdatedAt(Date updatedAt) {
}

public void setUserPassword(String value) {
setCustomAttribute("userPassword", value);
if (value != null) setCustomAttribute("userPassword", value);
}

public CustomObjectAttribute setAttribute(String attributeName, String[] attributeValue) {
Expand Down
1 change: 0 additions & 1 deletion jans-scim/server/src/main/java/io/jans/scim/service/scim2/Scim2UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ private <T> List<T> getAttributeListValue(ScimCustomPerson source, Class<T> claz
private void transferAttributesToPerson(UserResource res, ScimCustomPerson person) {

log.debug("transferAttributesToPerson");
// NOTE: calling person.setAttribute("ATTR", null) is not changing the attribute in LDAP :(

// Set values trying to follow the order found in BaseScimResource class
person.setAttribute("jansExtId", res.getExternalId());
Expand Down
1 change: 1 addition & 0 deletions jans-scim/service/src/main/java/io/jans/scim/model/GluuGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,5 @@ public void setAttribute(String attributeName, String[] attributeValue) {
customAttributes.remove(attribute);
customAttributes.add(attribute);
}

}
Loading