feat: refactor code after remove username

src/main/java/org/cardanofoundation/authentication/aop/UserAspect.java

@@ -28,27 +28,26 @@ public class UserAspect {
 
   @AfterReturning("execution(* org.cardanofoundation.authentication.service.impl.AuthenticationServiceImpl.signIn(*)) && args(signInRequest)")
   public void signInLog(SignInRequest signInRequest) {
-    String username = "";
+    String accountId = "";
     Integer type = signInRequest.getType();
     if (type == 0) {
-      username = signInRequest.getUsername();
+      accountId = signInRequest.getEmail();
     } else {
-      username = signInRequest.getAddress();
+      accountId = signInRequest.getAddress();
     }
-    UserEntity user = userService.findByUsername(username);
+    UserEntity user = userService.findByAccountId(accountId);
     userHistoryService.saveUserHistory(EUserAction.LOGIN, Instant.now(), user);
   }
 
   @AfterReturning("execution(* org.cardanofoundation.authentication.service.impl.AuthenticationServiceImpl.signUp(*)) && args(signUpRequest)")
   public void signUpLog(SignUpRequest signUpRequest) {
-    UserEntity user = userService.findByUsername(signUpRequest.getEmail());
+    UserEntity user = userService.findByAccountId(signUpRequest.getEmail());
     userHistoryService.saveUserHistory(EUserAction.CREATED, Instant.now(), user);
   }
 
   @AfterReturning("execution(* org.cardanofoundation.authentication.service.impl.AuthenticationServiceImpl.signOut(org.cardanofoundation.authentication.model.request.auth.SignOutRequest,..)) && args(signOutRequest,..)")
   public void signOutLog(SignOutRequest signOutRequest) {
-    String username = signOutRequest.getUsername();
-    UserEntity user = userService.findByUsername(username);
+    UserEntity user = userService.findByAccountId(signOutRequest.getAccountId());
     userHistoryService.saveUserHistory(EUserAction.LOGOUT, Instant.now(), user);
   }
 }

src/main/java/org/cardanofoundation/authentication/config/AuthTokenFilter.java

@@ -43,8 +43,8 @@ protected void doFilterInternal(@NotNull HttpServletRequest request,
       throw new InvalidAccessTokenException();
     }
 
-    String username = jwtProvider.getUserNameFromJwtToken(token);
-    UserDetailsImpl userDetails = (UserDetailsImpl) userService.loadUserByUsername(username);
+    String accountId = jwtProvider.getAccountIdFromJwtToken(token);
+    UserDetailsImpl userDetails = (UserDetailsImpl) userService.loadUserByUsername(accountId);
     UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(
         userDetails.getUsername(), null, userDetails.getAuthorities());
     authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));

src/main/java/org/cardanofoundation/authentication/constant/AuthConstant.java

@@ -8,29 +8,33 @@ public final class AuthConstant {
 
   public static final String BASE_AUTH_PATH = "/api/v1/auth/";
 
-  public static final String BASE_ADMIN_PATH = "/api/v1/admin/";
-
   public static final String BASE_USER_PATH = "/api/v1/user/";
 
   public static final String BASE_VERIFY_PATH = "/api/v1/verify/";
 
   public static final String[] AUTH_WHITELIST = {
-      BASE_AUTH_PATH + "sign-in", BASE_AUTH_PATH + "sign-up",
-      BASE_AUTH_PATH + "refresh-token", BASE_AUTH_PATH + "sign-out",
+      BASE_AUTH_PATH + "sign-in",
+      BASE_AUTH_PATH + "sign-up",
+      BASE_AUTH_PATH + "refresh-token",
+      BASE_AUTH_PATH + "sign-out",
       BASE_AUTH_PATH + "get-nonce***",
-      BASE_ADMIN_PATH + "sign-up", BASE_ADMIN_PATH + "sign-in",
-      BASE_ADMIN_PATH + "refresh-token", BASE_ADMIN_PATH + "sign-out",
-      BASE_VERIFY_PATH + "active", BASE_VERIFY_PATH + "forgot-password",
+      BASE_VERIFY_PATH + "active",
+      BASE_VERIFY_PATH + "forgot-password",
       BASE_VERIFY_PATH + "reset-password"
   };
 
   public static final String[] USER_WHITELIST = {
-      BASE_USER_PATH + "exist-username", BASE_USER_PATH + "exist-email"};
+      BASE_USER_PATH + "exist-email"
+  };
 
-  public static final String[] DOCUMENT_WHITELIST = {"/v3/api-docs/**", "/planning/",
-      "/swagger-ui/**", "/swagger-ui.html"};
+  public static final String[] DOCUMENT_WHITELIST = {
+      "/v3/api-docs/**",
+      "/planning/",
+      "/swagger-ui/**",
+      "/swagger-ui.html"
+  };
 
   public static final String[] CLIENT_WHITELIST = {"/", "/error", "/favicon.ico", "/**/*.png",
-      "/**/*.gif", "/**/*.svg", "/**/*.jpg", "/**/*.html", "/**/*.css", "/**/*.scss", "/**/*.js"};
-
+      "/**/*.gif", "/**/*.svg", "/**/*.jpg", "/**/*.html", "/**/*.css", "/**/*.scss", "/**/*.js"
+  };
 }

src/main/java/org/cardanofoundation/authentication/controller/UserController.java

@@ -25,11 +25,6 @@ public class UserController {
 
   private final UserService userService;
 
-  @GetMapping("/exist-username")
-  public ResponseEntity<Boolean> checkExistUsername(@RequestParam("username") String username) {
-    return ResponseEntity.ok(userService.checkExistUsername(username));
-  }
-
   @PutMapping("/edit-avatar")
   public ResponseEntity<UserResponse> editAvatar(@RequestParam("avatar") MultipartFile avatar,
       HttpServletRequest httpServletRequest) {

src/main/java/org/cardanofoundation/authentication/controller/VerifyMailController.java

@@ -1,10 +1,10 @@
 package org.cardanofoundation.authentication.controller;
 
-import org.cardanofoundation.authentication.model.request.admin.ResetPasswordRequest;
-import org.cardanofoundation.authentication.model.response.MessageResponse;
-import org.cardanofoundation.authentication.service.VerifyService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.cardanofoundation.authentication.model.request.auth.ResetPasswordRequest;
+import org.cardanofoundation.authentication.model.response.MessageResponse;
+import org.cardanofoundation.authentication.service.VerifyService;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/org/cardanofoundation/authentication/mapper/UserMapper.java

@@ -1,7 +1,6 @@
 package org.cardanofoundation.authentication.mapper;
 
 import org.cardanofoundation.authentication.model.entity.UserEntity;
-import org.cardanofoundation.authentication.model.request.admin.SignUpAdminRequest;
 import org.cardanofoundation.authentication.model.request.auth.SignUpRequest;
 import org.cardanofoundation.authentication.model.response.UserResponse;
 import org.mapstruct.Mapper;
@@ -15,6 +14,4 @@ public interface UserMapper {
   UserEntity requestToEntity(SignUpRequest request);
 
   UserResponse entityToResponse(UserEntity user);
-
-  UserEntity requestAdminToEntity(SignUpAdminRequest request);
 }

src/main/java/org/cardanofoundation/authentication/model/entity/UserEntity.java

@@ -10,7 +10,6 @@
 import jakarta.persistence.JoinTable;
 import jakarta.persistence.ManyToMany;
 import jakarta.persistence.Table;
-import jakarta.validation.constraints.NotNull;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
@@ -34,11 +33,7 @@
 @Where(clause = "is_deleted = false")
 public class UserEntity extends BaseEntity {
 
-  @Column(name = "username", length = 64, nullable = false)
-  @NotNull
-  private String username;
-
-  @Column(name = "email", length = 64)
+  @Column(name = "email", length = 64, unique = true)
   private String email;
 
   @Column(name = "avatar")
@@ -52,7 +47,6 @@ public class UserEntity extends BaseEntity {
   private EStatus status;
 
   @Column(name = "is_deleted", nullable = false, columnDefinition = "BOOLEAN DEFAULT false")
-  @NotNull
   private boolean isDeleted;
 
   @ManyToMany(fetch = FetchType.EAGER)

src/main/java/org/cardanofoundation/authentication/model/entity/security/UserDetailsImpl.java

@@ -1,6 +1,7 @@
 package org.cardanofoundation.authentication.model.entity.security;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.io.Serial;
 import org.cardanofoundation.authentication.model.entity.UserEntity;
 import java.util.Collection;
 import java.util.List;
@@ -12,6 +13,7 @@
 
 public class UserDetailsImpl implements UserDetails {
 
+  @Serial
   private static final long serialVersionUID = 1L;
 
   private final Long id;
@@ -34,17 +36,15 @@ public UserDetailsImpl(Long id, String username, String email, String password,
     this.authorities = authorities;
   }
 
-  public static UserDetailsImpl build(UserEntity user, String password) {
-    List<GrantedAuthority> authorities =
+  public static UserDetailsImpl build(UserEntity user, String accountId, String password) {
+    List<SimpleGrantedAuthority> authorities =
         user.getRoles().stream()
             .map(role -> new SimpleGrantedAuthority(role.getName().name()))
-            .collect(Collectors.toList());
-
+            .toList();
     return new UserDetailsImpl(
-        user.getId(), user.getUsername(), user.getEmail(), password, authorities);
+        user.getId(), accountId, user.getEmail(), password, authorities);
   }
 
-
   @Override
   public Collection<? extends GrantedAuthority> getAuthorities() {
     return authorities;

src/main/java/org/cardanofoundation/authentication/model/request/admin/ResetPasswordRequest.java → src/main/java/org/cardanofoundation/authentication/model/request/auth/ResetPasswordRequest.java

@@ -1,4 +1,4 @@
-package org.cardanofoundation.authentication.model.request.admin;
+package org.cardanofoundation.authentication.model.request.auth;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;

src/main/java/org/cardanofoundation/authentication/model/request/auth/SignInRequest.java

@@ -12,7 +12,7 @@ public class SignInRequest {
 
   private String signature;
 
-  private String username;
+  private String email;
 
   private String password;
 

src/main/java/org/cardanofoundation/authentication/model/request/auth/SignOutRequest.java

@@ -15,5 +15,5 @@ public class SignOutRequest {
 
   @NotNull
   @NotBlank
-  private String username;
+  private String accountId;
 }