Opaque instead of jwt

backend/spring-boot/.run/AllTests.run.xml

@@ -12,17 +12,8 @@
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="pattern" />
     <patterns>
-      <pattern testClass="org.bugzkit.api.user.integration.UserControllerIT" />
-      <pattern testClass="org.bugzkit.api.user.integration.RoleControllerIT" />
-      <pattern testClass="org.bugzkit.api.user.integration.ProfileControllerIT" />
-      <pattern testClass="org.bugzkit.api.auth.integration.AuthControllerIT" />
-      <pattern testClass="org.bugzkit.api.admin.integration.UserControllerIT" />
-      <pattern testClass="org.bugzkit.api.shared.integration.AccessingResourcesIT" />
-      <pattern testClass="org.bugzkit.api.shared.unit.EmailServiceTest" />
-      <pattern testClass="org.bugzkit.api.shared.unit.MessageServiceTest" />
-      <pattern testClass="org.bugzkit.api.user.data.UserRepositoryIT" />
-      <pattern testClass="org.bugzkit.api.user.data.RoleRepositoryIT" />
-      <pattern testClass="org.bugzkit.api.auth.data.RefreshTokenStoreRepositoryIT" />
+      <pattern testClass="org.bugzkit.api.*IT" />
+      <pattern testClass="org.bugzkit.api.*Test" />
     </patterns>
     <method v="2">
       <option name="Make" enabled="true" />

backend/spring-boot/.run/IntegrationTests.run.xml

@@ -6,12 +6,7 @@
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="pattern" />
     <patterns>
-      <pattern testClass="org.bugzkit.api.user.integration.UserControllerIT" />
-      <pattern testClass="org.bugzkit.api.user.integration.RoleControllerIT" />
-      <pattern testClass="org.bugzkit.api.user.integration.ProfileControllerIT" />
-      <pattern testClass="org.bugzkit.api.auth.integration.AuthControllerIT" />
-      <pattern testClass="org.bugzkit.api.admin.integration.UserControllerIT" />
-      <pattern testClass="org.bugzkit.api.shared.integration.AccessingResourcesIT" />
+      <pattern testClass="org.bugzkit.api.*IT" />
     </patterns>
     <method v="2">
       <option name="Make" enabled="true" />

backend/spring-boot/.run/UnitTests.run.xml

@@ -6,8 +6,7 @@
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="pattern" />
     <patterns>
-      <pattern testClass="org.bugzkit.api.shared.unit.EmailServiceTest" />
-      <pattern testClass="org.bugzkit.api.shared.unit.MessageServiceTest" />
+      <pattern testClass="org.bugzkit.api.*Test" />
     </patterns>
     <method v="2">
       <option name="Make" enabled="true" />

backend/spring-boot/src/main/java/org/bugzkit/api/admin/service/impl/UserServiceImpl.java

@@ -4,8 +4,8 @@
 import org.bugzkit.api.admin.payload.request.PatchUserRequest;
 import org.bugzkit.api.admin.payload.request.UserRequest;
 import org.bugzkit.api.admin.service.UserService;
-import org.bugzkit.api.auth.jwt.service.AccessTokenService;
-import org.bugzkit.api.auth.jwt.service.RefreshTokenService;
+import org.bugzkit.api.auth.service.AccessTokenService;
+import org.bugzkit.api.auth.service.RefreshTokenService;
 import org.bugzkit.api.auth.util.AuthUtil;
 import org.bugzkit.api.shared.error.exception.BadRequestException;
 import org.bugzkit.api.shared.error.exception.ConflictException;

backend/spring-boot/src/main/java/org/bugzkit/api/auth/controller/AuthController.java

@@ -4,7 +4,6 @@
 import jakarta.validation.Valid;
 import java.util.List;
 import org.bugzkit.api.auth.AuthTokens;
-import org.bugzkit.api.auth.jwt.util.JwtUtil;
 import org.bugzkit.api.auth.payload.dto.DeviceDTO;
 import org.bugzkit.api.auth.payload.request.AuthTokensRequest;
 import org.bugzkit.api.auth.payload.request.ForgotPasswordRequest;
@@ -15,6 +14,7 @@
 import org.bugzkit.api.auth.service.AuthService;
 import org.bugzkit.api.auth.service.DeviceService;
 import org.bugzkit.api.auth.util.AuthUtil;
+import org.bugzkit.api.auth.util.JwtUtil;
 import org.bugzkit.api.shared.constants.Path;
 import org.bugzkit.api.user.payload.dto.UserDTO;
 import org.springframework.beans.factory.annotation.Value;

backend/spring-boot/src/main/java/org/bugzkit/api/auth/jwt/event/email/JwtEmail.java → backend/spring-boot/src/main/java/org/bugzkit/api/auth/email/AuthEmail.java

@@ -1,12 +1,12 @@
-package org.bugzkit.api.auth.jwt.event.email;
+package org.bugzkit.api.auth.email;
 
 import jakarta.mail.MessagingException;
 import java.io.IOException;
 import org.bugzkit.api.shared.email.service.EmailService;
 import org.bugzkit.api.user.model.User;
 import org.springframework.core.env.Environment;
 
-public interface JwtEmail {
+public interface AuthEmail {
   void sendEmail(EmailService emailService, Environment environment, User user, String token)
       throws IOException, MessagingException;
 }

backend/spring-boot/src/main/java/org/bugzkit/api/auth/email/AuthEmailPurpose.java

@@ -0,0 +1,6 @@
+package org.bugzkit.api.auth.email;
+
+public enum AuthEmailPurpose {
+  VERIFY_EMAIL,
+  RESET_PASSWORD
+}

backend/spring-boot/src/main/java/org/bugzkit/api/auth/email/AuthEmailSupplier.java

@@ -0,0 +1,21 @@
+package org.bugzkit.api.auth.email;
+
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.function.Supplier;
+
+public class AuthEmailSupplier {
+  private static final Map<AuthEmailPurpose, Supplier<AuthEmail>> emailType =
+      new EnumMap<>(AuthEmailPurpose.class);
+
+  static {
+    emailType.put(AuthEmailPurpose.VERIFY_EMAIL, VerificationAuthEmail::new);
+    emailType.put(AuthEmailPurpose.RESET_PASSWORD, ResetPasswordAuthEmail::new);
+  }
+
+  public AuthEmail supplyEmail(AuthEmailPurpose purpose) {
+    final var emailSupplier = emailType.get(purpose);
+    if (emailSupplier == null) throw new IllegalArgumentException("Invalid email type: " + purpose);
+    return emailSupplier.get();
+  }
+}

backend/spring-boot/src/main/java/org/bugzkit/api/auth/jwt/event/OnSendJwtEmail.java → backend/spring-boot/src/main/java/org/bugzkit/api/auth/email/OnSendAuthEmail.java

@@ -1,19 +1,18 @@
-package org.bugzkit.api.auth.jwt.event;
+package org.bugzkit.api.auth.email;
 
 import java.io.Serial;
 import lombok.Getter;
-import org.bugzkit.api.auth.jwt.util.JwtUtil.JwtPurpose;
 import org.bugzkit.api.user.model.User;
 import org.springframework.context.ApplicationEvent;
 
 @Getter
-public class OnSendJwtEmail extends ApplicationEvent {
-  @Serial private static final long serialVersionUID = 6234594744610595282L;
+public class OnSendAuthEmail extends ApplicationEvent {
+  @Serial private static final long serialVersionUID = 6234594744610595283L;
   private final User user;
   private final String token;
-  private final JwtPurpose purpose;
+  private final AuthEmailPurpose purpose;
 
-  public OnSendJwtEmail(User user, String token, JwtPurpose purpose) {
+  public OnSendAuthEmail(User user, String token, AuthEmailPurpose purpose) {
     super(user);
     this.user = user;
     this.token = token;

backend/spring-boot/src/main/java/org/bugzkit/api/auth/jwt/event/listener/OnSendJwtEmailListener.java → backend/spring-boot/src/main/java/org/bugzkit/api/auth/email/OnSendAuthEmailListener.java

@@ -1,28 +1,26 @@
-package org.bugzkit.api.auth.jwt.event.listener;
+package org.bugzkit.api.auth.email;
 
 import jakarta.mail.MessagingException;
 import java.io.IOException;
-import org.bugzkit.api.auth.jwt.event.OnSendJwtEmail;
-import org.bugzkit.api.auth.jwt.event.email.JwtEmailSupplier;
 import org.bugzkit.api.shared.email.service.EmailService;
 import org.springframework.context.ApplicationListener;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
 @Component
-public class OnSendJwtEmailListener implements ApplicationListener<OnSendJwtEmail> {
+public class OnSendAuthEmailListener implements ApplicationListener<OnSendAuthEmail> {
   private final EmailService emailService;
   private final Environment environment;
 
-  public OnSendJwtEmailListener(EmailService emailService, Environment environment) {
+  public OnSendAuthEmailListener(EmailService emailService, Environment environment) {
     this.emailService = emailService;
     this.environment = environment;
   }
 
   @Override
-  public void onApplicationEvent(OnSendJwtEmail event) {
+  public void onApplicationEvent(OnSendAuthEmail event) {
     try {
-      new JwtEmailSupplier()
+      new AuthEmailSupplier()
           .supplyEmail(event.getPurpose())
           .sendEmail(emailService, environment, event.getUser(), event.getToken());
     } catch (IOException | MessagingException e) {

backend/spring-boot/src/main/java/org/bugzkit/api/auth/jwt/event/email/ResetPasswordEmail.java → backend/spring-boot/src/main/java/org/bugzkit/api/auth/email/ResetPasswordAuthEmail.java

@@ -1,4 +1,4 @@
-package org.bugzkit.api.auth.jwt.event.email;
+package org.bugzkit.api.auth.email;
 
 import com.google.common.io.CharStreams;
 import jakarta.mail.MessagingException;
@@ -11,7 +11,7 @@
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ClassPathResource;
 
-public class ResetPasswordEmail implements JwtEmail {
+public class ResetPasswordAuthEmail implements AuthEmail {
   @Override
   public void sendEmail(EmailService emailService, Environment environment, User user, String token)
       throws IOException, MessagingException {

backend/spring-boot/src/main/java/org/bugzkit/api/auth/jwt/event/email/VerificationEmail.java → backend/spring-boot/src/main/java/org/bugzkit/api/auth/email/VerificationAuthEmail.java

@@ -1,4 +1,4 @@
-package org.bugzkit.api.auth.jwt.event.email;
+package org.bugzkit.api.auth.email;
 
 import com.google.common.io.CharStreams;
 import jakarta.mail.MessagingException;
@@ -11,7 +11,7 @@
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ClassPathResource;
 
-public class VerificationEmail implements JwtEmail {
+public class VerificationAuthEmail implements AuthEmail {
   @Override
   public void sendEmail(EmailService emailService, Environment environment, User user, String token)
       throws IOException, MessagingException {

backend/spring-boot/src/main/java/org/bugzkit/api/auth/oauth2/OAuth2SuccessHandler.java

@@ -4,9 +4,9 @@
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.stream.Collectors;
-import org.bugzkit.api.auth.jwt.service.AccessTokenService;
-import org.bugzkit.api.auth.jwt.service.RefreshTokenService;
+import org.bugzkit.api.auth.service.AccessTokenService;
 import org.bugzkit.api.auth.service.DeviceService;
+import org.bugzkit.api.auth.service.RefreshTokenService;
 import org.bugzkit.api.auth.util.AuthUtil;
 import org.bugzkit.api.shared.logger.CustomLogger;
 import org.bugzkit.api.user.payload.dto.RoleDTO;

backend/spring-boot/src/main/java/org/bugzkit/api/auth/jwt/redis/model/AccessTokenBlacklist.java → backend/spring-boot/src/main/java/org/bugzkit/api/auth/redis/model/AccessTokenBlacklist.java

@@ -1,4 +1,4 @@
-package org.bugzkit.api.auth.jwt.redis.model;
+package org.bugzkit.api.auth.redis.model;
 
 import java.io.Serial;
 import java.io.Serializable;

backend/spring-boot/src/main/java/org/bugzkit/api/auth/jwt/redis/model/RefreshTokenStore.java → backend/spring-boot/src/main/java/org/bugzkit/api/auth/redis/model/RefreshTokenStore.java

@@ -1,4 +1,4 @@
-package org.bugzkit.api.auth.jwt.redis.model;
+package org.bugzkit.api.auth.redis.model;
 
 import java.io.Serial;
 import java.io.Serializable;