Merge branch 'usercreation-password-fix' into 'master'

Fix user creation password auto generation

See merge request entgra/carbon-device-mgt!99
revert-70aa11f8
Charitha Goonetilleke 6 years ago
commit 66174b7c4b

@ -143,7 +143,13 @@ public class UserManagementServiceImpl implements UserManagementService {
"was refused.").build()).build(); "was refused.").build()).build();
} }
String initialUserPassword = this.generateInitialUserPassword(); String initialUserPassword;
if (userInfo.getPassword() != null) {
initialUserPassword = userInfo.getPassword();
} else {
initialUserPassword = this.generateInitialUserPassword();
}
Map<String, String> defaultUserClaims = Map<String, String> defaultUserClaims =
this.buildDefaultUserClaims(userInfo.getFirstname(), userInfo.getLastname(), this.buildDefaultUserClaims(userInfo.getFirstname(), userInfo.getLastname(),
userInfo.getEmailAddress()); userInfo.getEmailAddress());

Loading…
Cancel
Save