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 regression with user bootstrap #3072

Closed
wants to merge 1 commit into from
Closed

fix regression with user bootstrap #3072

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimUserBootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void afterPropertiesSet() {
users.removeIf(u -> deleteMe.contains(u.getUsername()));
for (UaaUser u : users) {
u.setVerified(true);
addUser(u);
addUser(u, true);
}
}

Expand Down Expand Up @@ -135,14 +135,14 @@ private ScimUser getScimUser(UaaUser user) {
*
* @param user a UaaUser
*/
private void addUser(UaaUser user) {
private void addUser(UaaUser user, boolean propertiesSetup) {
ScimUser scimUser = getScimUser(user);
if (scimUser == null) {
if (isEmpty(user.getPassword()) && user.getOrigin().equals(OriginKeys.UAA)) {
logger.debug("User's password cannot be empty");
throw new InvalidPasswordException("Password cannot be empty", BAD_REQUEST);
}
createNewUser(user);
createNewUser(user, propertiesSetup);
} else {
if (override) {
updateUser(scimUser, user);
Expand Down Expand Up @@ -197,10 +197,10 @@ private void updateUser(ScimUser existingUser, UaaUser updatedUser, boolean upda
}
}

private void createNewUser(UaaUser user) {
private void createNewUser(UaaUser user, boolean propertiesSetup) {
logger.debug("Registering new user account: " + user);
ScimUser newScimUser = scimUserProvisioning.createUser(convertToScimUser(user), user.getPassword(), IdentityZoneHolder.get().getId());
addGroups(newScimUser.getId(), convertToGroups(user.getAuthorities()), newScimUser.getOrigin());
addGroups(newScimUser.getId(), convertToGroups(user.getAuthorities()), propertiesSetup && OriginKeys.LDAP.equalsIgnoreCase(newScimUser.getOrigin()) ? OriginKeys.UAA : newScimUser.getOrigin());
}

private void addGroups(String scimUserid, Collection<String> groups, String origin) {
Expand Down Expand Up @@ -270,7 +270,7 @@ public void onApplicationEvent(AuthEvent event) {
}

if (event instanceof NewUserAuthenticatedEvent) {
addUser(uaaUser);
addUser(uaaUser, false);
}
}

Expand Down
Loading