diff --git a/src/main/java/com/epam/reportportal/auth/integration/github/GitHubUserReplicator.java b/src/main/java/com/epam/reportportal/auth/integration/github/GitHubUserReplicator.java index 7440d747..c98aac67 100644 --- a/src/main/java/com/epam/reportportal/auth/integration/github/GitHubUserReplicator.java +++ b/src/main/java/com/epam/reportportal/auth/integration/github/GitHubUserReplicator.java @@ -144,8 +144,10 @@ private void updateUser(User user, UserResource userResource, GitHubClient gitHu private User createUser(UserResource userResource, GitHubClient gitHubClient) { User user = new User(); - String login = normalizeId(userResource.getLogin()); - user.setLogin(login); + user.setLogin(normalizeId(userResource.getLogin())); + user.setUuid(UUID.randomUUID()); + user.setActive(Boolean.TRUE); + updateUser(user, userResource, gitHubClient); user.setUserType(UserType.GITHUB); user.setRole(UserRole.USER); diff --git a/src/main/java/com/epam/reportportal/auth/integration/ldap/LdapUserReplicator.java b/src/main/java/com/epam/reportportal/auth/integration/ldap/LdapUserReplicator.java index 5ff1a8a6..d41190f5 100644 --- a/src/main/java/com/epam/reportportal/auth/integration/ldap/LdapUserReplicator.java +++ b/src/main/java/com/epam/reportportal/auth/integration/ldap/LdapUserReplicator.java @@ -102,23 +102,25 @@ private String validateEmail(String email) { private User createNewUser(DirContextOperations ctx, Map syncAttributes, String email, String login) { - User newUser = new User(); - newUser.setLogin(login); + User user = new User(); + user.setLogin(login); + user.setUuid(UUID.randomUUID()); + user.setActive(Boolean.TRUE); String fullName = getFullName(ctx, syncAttributes); - newUser.setFullName(fullName); + user.setFullName(fullName); checkEmail(email); - newUser.setEmail(email); - newUser.setMetadata(defaultMetaData()); - newUser.setUserType(UserType.LDAP); - newUser.setRole(UserRole.USER); - newUser.setExpired(false); + user.setEmail(email); + user.setMetadata(defaultMetaData()); + user.setUserType(UserType.LDAP); + user.setRole(UserRole.USER); + user.setExpired(false); - final Project project = generatePersonalProject(newUser); - newUser.getProjects().add(project.getUsers().iterator().next()); + final Project project = generatePersonalProject(user); + user.getProjects().add(project.getUsers().iterator().next()); - return userRepository.save(newUser); + return userRepository.save(user); } private String getFullName(DirContextOperations ctx, Map syncAttributes) { diff --git a/src/main/java/com/epam/reportportal/auth/integration/saml/SamlUserReplicator.java b/src/main/java/com/epam/reportportal/auth/integration/saml/SamlUserReplicator.java index 778ec8c0..47791f1f 100644 --- a/src/main/java/com/epam/reportportal/auth/integration/saml/SamlUserReplicator.java +++ b/src/main/java/com/epam/reportportal/auth/integration/saml/SamlUserReplicator.java @@ -103,6 +103,8 @@ public User replicateUser(ReportPortalSamlAuthentication samlAuthentication) { User user = new User(); user.setLogin(userName); + user.setUuid(UUID.randomUUID()); + user.setActive(Boolean.TRUE); List details = samlAuthentication.getDetails();