Orgs login migration

build.gradle

@@ -24,7 +24,7 @@ plugins {
     id "org.openapi.generator" version "7.11.0"
 }
 
-import org.openapitools.generator.gradle.plugin.tasks.GenerateTask
+
 import org.owasp.dependencycheck.reporting.ReportGenerator
 
 apply from: 'project-properties.gradle'
@@ -234,7 +234,6 @@ test {
     }
 }
 
-compileJava.dependsOn tasks.named('updateApiSubmodule')
 compileJava.dependsOn tasks.named('openApiGenerate')
 compileJava.dependsOn tasks.named('downloadManifestSchema')
 publish.dependsOn build

src/main/java/com/epam/ta/reportportal/core/events/activity/CreateInvitationLinkEvent.java

@@ -33,11 +33,8 @@ public class CreateInvitationLinkEvent extends AbstractEvent implements Activity
 
   private static final String EVENT_NAME = "createInvitationLink";
 
-  private final Long projectId;
-
-  public CreateInvitationLinkEvent(Long userId, String userLogin, Long projectId) {
+  public CreateInvitationLinkEvent(Long userId, String userLogin) {
     super(userId, userLogin);
-    this.projectId = projectId;
   }
 
   @Override
@@ -52,7 +49,6 @@ public Activity toActivity() {
         .addSubjectId(getUserId())
         .addSubjectName(getUserLogin())
         .addSubjectType(EventSubject.USER)
-        .addProjectId(projectId)
         .get();
   }
 }

src/main/java/com/epam/ta/reportportal/core/user/CreateUserHandler.java

@@ -18,7 +18,6 @@
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.model.YesNoRS;
-import com.epam.ta.reportportal.model.user.CreateUserRQConfirm;
 import com.epam.ta.reportportal.model.user.CreateUserRQFull;
 import com.epam.ta.reportportal.model.user.CreateUserRS;
 import com.epam.ta.reportportal.model.user.ResetPasswordRQ;
@@ -42,7 +41,6 @@ public interface CreateUserHandler {
    */
   CreateUserRS createUserByAdmin(CreateUserRQFull request, ReportPortalUser user, String basicUrl);
 
-
   /**
    * Create restore password bid
    *

src/main/java/com/epam/ta/reportportal/core/user/impl/EditUserHandlerImpl.java

@@ -28,6 +28,7 @@
 import static com.epam.reportportal.rules.exception.ErrorType.USER_ALREADY_EXISTS;
 import static com.epam.ta.reportportal.commons.Predicates.equalTo;
 import static com.epam.ta.reportportal.entity.user.UserType.INTERNAL;
+import static com.epam.ta.reportportal.util.email.EmailRulesValidator.NORMALIZE_EMAIL;
 import static java.util.Optional.ofNullable;
 
 import com.epam.reportportal.rules.commons.validation.BusinessRule;
@@ -48,7 +49,6 @@
 import com.epam.ta.reportportal.entity.user.UserType;
 import com.epam.ta.reportportal.model.user.ChangePasswordRQ;
 import com.epam.ta.reportportal.model.user.EditUserRQ;
-import com.epam.ta.reportportal.util.UserUtils;
 import com.epam.ta.reportportal.util.email.MailServiceFactory;
 import com.epam.ta.reportportal.ws.reporting.OperationCompletionRS;
 import java.awt.Dimension;
@@ -74,7 +74,7 @@
 import org.springframework.web.multipart.MultipartFile;
 
 /**
- * Edit user handler
+ * Edit user handler.
  *
  * @author Aliaksandr_Kazantsau
  * @author Andrei_Ramanchuk
@@ -98,6 +98,17 @@ public class EditUserHandlerImpl implements EditUserHandler {
 
   private final ApplicationEventPublisher eventPublisher;
 
+  /**
+   * Constructor.
+   *
+   * @param passwordEncoder       Password encoder
+   * @param userRepository        User repository
+   * @param projectRepository     Project repository
+   * @param userBinaryDataService User binary data service
+   * @param autoDetectParser      Auto detect parser
+   * @param emailServiceFactory   Email service factory
+   * @param eventPublisher        Event publisher
+   */
   @Autowired
   public EditUserHandlerImpl(PasswordEncoder passwordEncoder, UserRepository userRepository,
       ProjectRepository projectRepository,
@@ -120,36 +131,13 @@ public OperationCompletionRS editUser(String username, EditUserRQ editUserRq,
 
     updateRestrictedFields(editor, user, editUserRq);
 
-    if (null != editUserRq.getEmail() && !editUserRq.getEmail().equalsIgnoreCase(user.getEmail())) {
-      String updEmail = editUserRq.getEmail().toLowerCase().trim();
-      if (!editor.getUserRole().equals(UserRole.ADMINISTRATOR)) {
-        expect(user.getUserType(), equalTo(INTERNAL)).verify(ACCESS_DENIED,
-            "Unable to change email for external user");
-      }
-      expect(UserUtils.isEmailValid(updEmail), equalTo(true)).verify(BAD_REQUEST_ERROR,
-          " wrong email: " + updEmail);
-      final Optional<User> byEmail = userRepository.findByEmail(updEmail);
-
-      expect(byEmail, Predicates.not(Optional::isPresent)).verify(USER_ALREADY_EXISTS, updEmail);
-
-      List<Project> userProjects = projectRepository.findUserProjects(username);
-      userProjects.forEach(
-          project -> ProjectUtils.updateProjectRecipients(user.getEmail(), updEmail, project));
-      user.setEmail(updEmail);
-      try {
-        projectRepository.saveAll(userProjects);
-      } catch (Exception exp) {
-        throw new ReportPortalException("PROJECT update exception while USER editing.", exp);
-      }
-    }
+    ofNullable(editUserRq.getEmail())
+        .map(NORMALIZE_EMAIL)
+        .filter(email -> !email.equals(user.getEmail()))
+        .ifPresent(email -> updateEmail(email, user, editor));
 
-    if (null != editUserRq.getFullName()) {
-      if (!editor.getUserRole().equals(UserRole.ADMINISTRATOR)) {
-        expect(user.getUserType(), equalTo(INTERNAL)).verify(ACCESS_DENIED,
-            "Unable to change full name for external user");
-      }
-      user.setFullName(editUserRq.getFullName());
-    }
+    ofNullable(editUserRq.getFullName())
+        .ifPresent(fullName -> updateFullName(fullName, user, editor));
 
     ofNullable(editUserRq.getExternalId()).ifPresent(user::setExternalId);
 
@@ -160,7 +148,10 @@ public OperationCompletionRS editUser(String username, EditUserRQ editUserRq,
     }
 
     return new OperationCompletionRS(
-        "User with login = '" + user.getLogin() + "' successfully updated");
+        "User with login = '"
+            + user.getLogin()
+            + "' successfully updated"
+    );
   }
 
   @Override
@@ -229,11 +220,43 @@ public OperationCompletionRS changePassword(ReportPortalUser loggedInUser,
     return new OperationCompletionRS("Password has been changed successfully");
   }
 
+  private void updateEmail(String email, User user, ReportPortalUser editor) {
+    if (!editor.getUserRole().equals(UserRole.ADMINISTRATOR)) {
+      expect(user.getUserType(), equalTo(INTERNAL))
+          .verify(ACCESS_DENIED, "Unable to change email for external user");
+    }
+
+    expect(userRepository.findByEmail(email), Predicates.not(Optional::isPresent))
+        .verify(USER_ALREADY_EXISTS, email);
+
+    List<Project> userProjects = projectRepository.findUserProjects(user.getLogin());
+
+    userProjects.forEach(
+        project -> ProjectUtils.updateProjectRecipients(user.getEmail(), email, project));
+
+    user.setEmail(email);
+    user.setLogin(email);
+
+    try {
+      projectRepository.saveAll(userProjects);
+    } catch (Exception exp) {
+      throw new ReportPortalException("PROJECT update exception while USER editing.", exp);
+    }
+  }
+
+  private void updateFullName(String fullName, User user, ReportPortalUser editor) {
+    if (!editor.getUserRole().equals(UserRole.ADMINISTRATOR)) {
+      expect(user.getUserType(), equalTo(INTERNAL)).verify(
+          ACCESS_DENIED, "Unable to change full name for external user");
+    }
+    user.setFullName(fullName);
+  }
+
   private void updateRestrictedFields(ReportPortalUser editor, User user, EditUserRQ editUserRq) {
     ofNullable(editUserRq.getRole()).ifPresent(role -> {
       checkPossibilityToEdit(editor, user, "role");
-      UserRole newRole = UserRole.findByName(role)
-          .orElseThrow(() -> new ReportPortalException(BAD_REQUEST_ERROR,
+      UserRole newRole = UserRole.findByName(role).orElseThrow(
+          () -> new ReportPortalException(BAD_REQUEST_ERROR,
               "Incorrect specified Account Role parameter."));
       publishChangeUserTypeEvent(user, editor, newRole);
       user.setRole(newRole);
@@ -309,8 +332,13 @@ private Optional<Dimension> getImageDimension(MediaType mediaType, InputStream i
 
   private void publishChangeUserTypeEvent(User user, ReportPortalUser editor, UserRole newRole) {
     eventPublisher.publishEvent(
-        new ChangeUserTypeEvent(user.getId(), user.getLogin(),
-            user.getRole(), newRole, editor.getUserId(), editor.getUsername()));
+        new ChangeUserTypeEvent(
+            user.getId(),
+            user.getLogin(),
+            user.getRole(),
+            newRole,
+            editor.getUserId(),
+            editor.getUsername()));
   }
 
   private void checkPossibilityToEdit(ReportPortalUser editor, User user, String fieldName) {