Fix singleton UI scope for password reset use case (#654)

---------

Co-authored-by: Steffengreiner <[email protected]>

Author: sven1103

identity/src/main/java/life/qbic/identity/application/user/registration/ConfirmEmailInput.java

@@ -19,7 +19,6 @@
 import life.qbic.identity.application.user.policy.directive.WhenUserActivatedSubmitIntegrationEvent;
 import life.qbic.identity.application.user.policy.directive.WhenUserRegisteredSendConfirmationEmail;
 import life.qbic.identity.application.user.policy.directive.WhenUserRegisteredSubmitIntegrationEvent;
-import life.qbic.identity.application.user.registration.EmailAddressConfirmation;
 import life.qbic.identity.domain.repository.UserDataStorage;
 import life.qbic.identity.domain.repository.UserRepository;
 import life.qbic.infrastructure.email.EmailServiceProvider;
@@ -41,11 +40,11 @@
 import life.qbic.projectmanagement.application.policy.MeasurementUpdatedPolicy;
 import life.qbic.projectmanagement.application.policy.OfferAddedPolicy;
 import life.qbic.projectmanagement.application.policy.ProjectAccessGrantedPolicy;
+import life.qbic.projectmanagement.application.policy.ProjectChangedPolicy;
 import life.qbic.projectmanagement.application.policy.ProjectRegisteredPolicy;
 import life.qbic.projectmanagement.application.policy.QCAddedPolicy;
 import life.qbic.projectmanagement.application.policy.SampleDeletedPolicy;
 import life.qbic.projectmanagement.application.policy.SampleRegisteredPolicy;
-import life.qbic.projectmanagement.application.policy.ProjectChangedPolicy;
 import life.qbic.projectmanagement.application.policy.directive.AddSampleToBatch;
 import life.qbic.projectmanagement.application.policy.directive.CreateNewSampleStatisticsEntry;
 import life.qbic.projectmanagement.application.policy.directive.DeleteSampleFromBatch;
@@ -89,11 +88,6 @@ public class AppConfig {
 
   Section starts below
   */
-  @Bean
-  public EmailAddressConfirmation confirmEmailInput(
-      IdentityService identityService) {
-    return new EmailAddressConfirmation(identityService);
-  }
 
   @Bean
   public IdentityService userRegistrationService(

identity/src/main/java/life/qbic/identity/application/user/registration/ConfirmEmailOutput.java

@@ -6,22 +6,15 @@
 import com.vaadin.flow.server.PWA;
 import com.vaadin.flow.theme.Theme;
 import java.io.Serial;
-import life.qbic.datamanager.views.login.LoginHandler;
 import life.qbic.datamanager.views.login.newpassword.NewPasswordHandler;
-import life.qbic.datamanager.views.login.passwordreset.PasswordResetHandler;
 import life.qbic.identity.application.user.password.NewPassword;
 import life.qbic.identity.application.user.password.NewPasswordOutput;
-import life.qbic.identity.application.user.password.PasswordResetOutput;
-import life.qbic.identity.application.user.password.PasswordResetRequest;
-import life.qbic.identity.application.user.registration.ConfirmEmailOutput;
-import life.qbic.identity.application.user.registration.EmailAddressConfirmation;
 import life.qbic.identity.domain.registry.DomainRegistry;
 import life.qbic.identity.domain.repository.UserRepository;
 import life.qbic.identity.domain.service.UserDomainService;
 import life.qbic.logging.api.Logger;
 import life.qbic.logging.service.LoggerFactory;
 import life.qbic.projectmanagement.application.DataRepoConnectionTester;
-import org.springframework.beans.BeansException;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration;
@@ -70,21 +63,5 @@ public static void main(String[] args) {
     // We need to set up the domain registry and register important services:
     var userRepository = appContext.getBean(UserRepository.class);
     DomainRegistry.instance().registerService(new UserDomainService(userRepository));
-
-    setupUseCases(appContext);
-  }
-
-  private static void setupUseCases(ConfigurableApplicationContext context) {
-    var emailAddressConfirmation = context.getBean(EmailAddressConfirmation.class);
-    var loginHandler = (ConfirmEmailOutput) context.getBean(LoginHandler.class);
-    emailAddressConfirmation.setConfirmEmailOutput(loginHandler);
-
-    var passwordReset = context.getBean(PasswordResetRequest.class);
-    var passwordResetHandler = (PasswordResetOutput) context.getBean(PasswordResetHandler.class);
-    passwordReset.setUseCaseOutput(passwordResetHandler);
-
-    var newPassword = context.getBean(NewPassword.class);
-    var newPasswordHandler = (NewPasswordOutput) context.getBean(NewPasswordHandler.class);
-    newPassword.setUseCaseOutput(newPasswordHandler);
   }
 }

identity/src/main/java/life/qbic/identity/application/user/registration/EmailAddressConfirmation.java

@@ -1,15 +1,7 @@
 package life.qbic.datamanager.views.login;
 
-import com.vaadin.flow.router.BeforeEvent;
-import java.util.List;
-import java.util.Map;
+import java.util.Objects;
 import life.qbic.datamanager.Application;
-import life.qbic.datamanager.views.AppRoutes;
-import life.qbic.datamanager.views.AppRoutes.Projects;
-import life.qbic.datamanager.views.notifications.ErrorMessage;
-import life.qbic.datamanager.views.notifications.InformationMessage;
-import life.qbic.identity.application.user.registration.ConfirmEmailInput;
-import life.qbic.identity.application.user.registration.ConfirmEmailOutput;
 import life.qbic.logging.api.Logger;
 import life.qbic.logging.service.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,102 +14,20 @@
  * @since 1.0.0
  */
 @Component
-public class LoginHandler implements LoginHandlerInterface, ConfirmEmailOutput {
+public class LoginHandler {
 
   private static final Logger logger = LoggerFactory.logger(Application.class.getName());
 
-  private LoginLayout registeredLoginView;
-
-  private final ConfirmEmailInput confirmEmailInput;
 
   private final String emailConfirmationParameter;
 
   @Autowired
-  LoginHandler(ConfirmEmailInput confirmEmailInput,
-      @Value("${EMAIL_CONFIRMATION_PARAMETER:confirm-email}") String emailConfirmationParameter) {
-    this.confirmEmailInput = confirmEmailInput;
-    this.emailConfirmationParameter = emailConfirmationParameter;
-  }
-
-  @Override
-  public void handle(LoginLayout loginView) {
-    if (registeredLoginView != loginView) {
-      registeredLoginView = loginView;
-    }
-    initFields();
-    addListener();
-  }
-
-  private void initFields() {
-    clearNotifications();
-  }
-
-  private void showInvalidCredentialsError() {
-    showError("Incorrect username or password", "Please try again.");
-  }
-
-  private void showEmailConfirmationInformation() {
-    showInformation("Email address confirmed", "You can now login with your credentials.");
-  }
-
-  private void showEmailConfirmationReminder() {
-    showInformation("Registration mail sent",
-        "Please check your mail inbox to confirm your registration");
-  }
-
-  public void clearNotifications() {
-    registeredLoginView.notificationLayout.removeAll();
-  }
-
-  public void showError(String title, String description) {
-    clearNotifications();
-    ErrorMessage errorMessage = new ErrorMessage(title, description);
-    registeredLoginView.notificationLayout.add(errorMessage);
-  }
-
-  public void showInformation(String title, String description) {
-    clearNotifications();
-    InformationMessage informationMessage = new InformationMessage(title, description);
-    registeredLoginView.notificationLayout.add(informationMessage);
-  }
-
-  private void addListener() {
-    registeredLoginView.addLoginListener(it ->
-        onLoginSucceeded());
-    registeredLoginView.addForgotPasswordListener(
-        it -> it.getSource().getUI().ifPresent(ui -> ui.navigate(AppRoutes.RESET_PASSWORD)));
-  }
-
-  private void onLoginSucceeded() {
-    clearNotifications();
-    registeredLoginView.getUI().ifPresentOrElse(
-        ui -> ui.navigate(Projects.PROJECTS),
-        () -> logger.error("No UI found!"));
+  LoginHandler(@Value("${EMAIL_CONFIRMATION_PARAMETER:confirm-email}") String emailConfirmationParameter) {
+    this.emailConfirmationParameter = Objects.requireNonNull(emailConfirmationParameter);
   }
 
-  @Override
-  public void handle(BeforeEvent beforeEvent) {
-    Map<String, List<String>> queryParams = beforeEvent.getLocation().getQueryParameters()
-        .getParameters();
-    if (queryParams.containsKey("error")) {
-      showInvalidCredentialsError();
-    }
-    if (queryParams.containsKey(emailConfirmationParameter)) {
-      String userId = queryParams.get(emailConfirmationParameter).iterator().next();
-      confirmEmailInput.confirmEmailAddress(userId);
-    }
-    if (queryParams.containsKey("userRegistered")) {
-      showEmailConfirmationReminder();
-    }
+  public String emailConfirmationParameter() {
+    return emailConfirmationParameter;
   }
 
-  @Override
-  public void onEmailConfirmationSuccess() {
-    showEmailConfirmationInformation();
-  }
-
-  @Override
-  public void onEmailConfirmationFailure(String reason) {
-    showError("Email confirmation failed", reason);
-  }
 }