Merge pull request #342 from reportportal/EPMRPP-96070-saml-uuid

EPMRPP-96070 || Provide uuid on user replication by default in db
reportportal · Oct 15, 2024 · 8695f65 · 8695f65
2 parents b6c3138 + ea0fbac
commit 8695f65
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -43,8 +43,8 @@ dependencies {
         api 'com.epam.reportportal:commons-dao'
         api 'com.epam.reportportal:commons'
     } else {
-        api 'com.github.reportportal:commons-dao:cce9625'
-        api 'com.github.reportportal:commons:50a1192'
+        api 'com.github.reportportal:commons-dao:develop-SNAPSHOT'
+        api 'com.github.reportportal:commons:develop-SNAPSHOT'
     }
 
     //Fix CVE-2021-41079, CVE-2022-23181, CVE-2021-33037, CVE-2021-30640, CVE-2022-42252, CVE-2023-46589, CVE-2024-24549

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
@@ -145,7 +145,6 @@ 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.setUuid(UUID.randomUUID());
     user.setLogin(login);
     updateUser(user, userResource, gitHubClient);
     user.setUserType(UserType.GITHUB);

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
@@ -104,7 +104,6 @@ private User createNewUser(DirContextOperations ctx, Map<String, String> syncAtt
       String email, String login) {
     User newUser = new User();
     newUser.setLogin(login);
-    newUser.setUuid(UUID.randomUUID());
 
     String fullName = getFullName(ctx, syncAttributes);
     newUser.setFullName(fullName);

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
@@ -103,7 +103,6 @@ public User replicateUser(ReportPortalSamlAuthentication samlAuthentication) {
 
     User user = new User();
     user.setLogin(userName);
-    user.setUuid(UUID.randomUUID());
 
     List<Attribute> details = samlAuthentication.getDetails();