feat : 로그인/비로그인 유저 JWT 토큰 생성 로직 구현

imscow11253 · imscow11253 · commit 6d665bdd2f3e · 2025-01-09T02:27:40.000+09:00
diff --git a/src/main/java/com/neighbors/tohero/application/baseResponse/BaseResponseMessage.java b/src/main/java/com/neighbors/tohero/application/baseResponse/BaseResponseMessage.java
@@ -16,6 +16,10 @@ public enum BaseResponseMessage {
     유저_이름_변경이_완료되었습니다("유저 이름 변경이 완료되었습니다"),
     존재하지_않는_유저입니다("존재하지 않는 유저입니다"),
     유저_이름의_길이는_1부터_5까지만_가능합니다("유저 이름의 길이는 1부터 5까지만 가능합니다"),
+    ROLE_필드는_필수입력입니다("ROLE 필드는 필수입력입니다"),
+    이메일_형식이_올바르지_못합니다("이메일 형식이 올바르지 못합니다"),
+    유저가_성공적으로_인증되었습니다("유저가 성공적으로 인증되었습니다"),
+    GUEST_유저_토큰이_정상적으로_생성되었습니다("GUEST 유저 토큰이 정상적으로 생성되었습니다"),
 
     //jwt error message
     JWT_토큰_오류입니다("JWT 토큰 오류입니다"),
diff --git a/src/main/java/com/neighbors/tohero/application/user/dto/AuthenticateUserRequest.java b/src/main/java/com/neighbors/tohero/application/user/dto/AuthenticateUserRequest.java
@@ -1,6 +1,22 @@
 package com.neighbors.tohero.application.user.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.neighbors.tohero.common.enums.Role;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+
 public record AuthenticateUserRequest (
+        @NotNull
+        Role role,
+
+        @NotBlank
+        @Length(min = 1, max = 5)
+        String nickname,
 
+        @JsonInclude(JsonInclude.Include.NON_NULL)
+        @Email
+        String email
 ){
 }
diff --git a/src/main/java/com/neighbors/tohero/application/user/dto/AuthenticateUserResponse.java b/src/main/java/com/neighbors/tohero/application/user/dto/AuthenticateUserResponse.java
@@ -0,0 +1,30 @@
+package com.neighbors.tohero.application.user.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.neighbors.tohero.common.enums.Role;
+import com.neighbors.tohero.common.jwt.AuthTokens;
+import com.neighbors.tohero.domain.domain.user.model.User;
+
+public record AuthenticateUserResponse(
+        AuthTokens authTokens,
+
+        @JsonInclude(JsonInclude.Include.NON_NULL)
+        UserInfo userInfo
+) {
+    public record UserInfo(
+            long userId,
+            String nickname,
+            String email,
+            Role role
+    ){
+    }
+
+    public static AuthenticateUserResponse toUserDTO(AuthTokens authTokens, User user) {
+        UserInfo userInfo  = new UserInfo(user.getUserId(), user.getUserName(), user.getEmail(), user.getRole());
+        return new AuthenticateUserResponse(authTokens, userInfo);
+    }
+
+    public static AuthenticateUserResponse toGuestDTO(AuthTokens authTokens) {
+        return new AuthenticateUserResponse(authTokens, null);
+    }
+}
diff --git a/src/main/java/com/neighbors/tohero/application/user/service/UserService.java b/src/main/java/com/neighbors/tohero/application/user/service/UserService.java
@@ -4,6 +4,13 @@
 import com.neighbors.tohero.application.baseResponse.BaseResponseMessage;
 import com.neighbors.tohero.application.baseResponse.BaseResponseStatus;
 import com.neighbors.tohero.application.user.dto.AuthenticateUserRequest;
+import com.neighbors.tohero.application.user.dto.AuthenticateUserResponse;
+import com.neighbors.tohero.common.enums.Role;
+import com.neighbors.tohero.common.jwt.AuthTokens;
+import com.neighbors.tohero.common.jwt.JwtProvider;
+import com.neighbors.tohero.common.jwt.JwtUserDetails;
+import com.neighbors.tohero.domain.domain.user.model.User;
+import com.neighbors.tohero.domain.domain.user.service.CreateUser;
 import com.neighbors.tohero.domain.domain.user.service.UpdateUser;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -13,18 +20,42 @@
 public class UserService {
 
     private final UpdateUser updateUser;
+    private final CreateUser createUser;
+    private final JwtProvider jwtProvider;
 
     public BaseResponse updateUserName(long userId, String nickname){
 
         updateUser.updateUserName(userId, nickname);
-
         return new BaseResponse(
                 BaseResponseStatus.OK,
                 BaseResponseMessage.유저_이름_변경이_완료되었습니다.getMessage()
         );
     }
 
-    public BaseResponse authenticateUser(AuthenticateUserRequest authenticateUserRequest){
-        return null;
+    public BaseResponse<AuthenticateUserResponse> authenticateUser(AuthenticateUserRequest authenticateUserRequest){
+        if(authenticateUserRequest.role() == Role.USER){
+            return returnLoginedUserToken(authenticateUserRequest);
+        }
+        return returnGuestUserToken(authenticateUserRequest);
+    }
+
+    private BaseResponse<AuthenticateUserResponse> returnLoginedUserToken(AuthenticateUserRequest authenticateUserRequest) {
+        User createdUser = createUser.createUser(User.toEntity(authenticateUserRequest));
+        AuthTokens authTokens = jwtProvider.createToken(JwtUserDetails.from(createdUser));
+
+        return new BaseResponse(
+                BaseResponseStatus.OK,
+                BaseResponseMessage.유저가_성공적으로_인증되었습니다.getMessage(),
+                AuthenticateUserResponse.toUserDTO(authTokens, createdUser)
+        );
+    }
+
+    private BaseResponse<AuthenticateUserResponse> returnGuestUserToken(AuthenticateUserRequest authenticateUserRequest) {
+        AuthTokens authTokens = jwtProvider.createToken(JwtUserDetails.makeGuestJwtDetails(authenticateUserRequest.nickname()));
+        return new BaseResponse(
+                BaseResponseStatus.OK,
+                BaseResponseMessage.GUEST_유저_토큰이_정상적으로_생성되었습니다.getMessage(),
+                AuthenticateUserResponse.toGuestDTO(authTokens)
+        );
     }
 }
diff --git a/src/main/java/com/neighbors/tohero/common/config/SecurityConfig.java b/src/main/java/com/neighbors/tohero/common/config/SecurityConfig.java
@@ -41,6 +41,7 @@ public WebSecurityCustomizer webSecurityCustomizer() {
                 "/v3/api-docs/**",
                 "/oauth/kakao/callback",
                 "/oauth/kakao/callback2",
+                "/user/auth",
                 "/auth/refreshToken",
                 "/address",
                 "/notice/**",
diff --git a/src/main/java/com/neighbors/tohero/common/jwt/JwtProvider.java b/src/main/java/com/neighbors/tohero/common/jwt/JwtProvider.java
@@ -29,8 +29,6 @@ public class JwtProvider {
     private long REFRESH_TOKEN_EXPIRED_IN;
 
     public AuthTokens createToken(JwtUserDetails jwtUserDetails) {
-        log.info("JWT key={}", JWT_SECRET_KEY);
-
         Claims claims = Jwts.claims()
                 .setSubject(jwtUserDetails.getNickname())
                 .setIssuer("ToHero");
@@ -40,7 +38,7 @@ public AuthTokens createToken(JwtUserDetails jwtUserDetails) {
             claims.put("userId", jwtUserDetails.getUserId());
             claims.put("email", jwtUserDetails.getEmail());
         }
-        
+
         Date now = new Date();
         Date accessTokenExpiredAt = new Date(now.getTime() + JWT_EXPIRED_IN);
         Date refreshTokenExpiredAt = new Date(now.getTime() + REFRESH_TOKEN_EXPIRED_IN);
diff --git a/src/main/java/com/neighbors/tohero/domain/domain/user/model/User.java b/src/main/java/com/neighbors/tohero/domain/domain/user/model/User.java
@@ -1,5 +1,6 @@
 package com.neighbors.tohero.domain.domain.user.model;
 
+import com.neighbors.tohero.application.user.dto.AuthenticateUserRequest;
 import com.neighbors.tohero.common.enums.Role;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -17,4 +18,12 @@ public class User {
     public static User of (Long userId, String userName, String email, Role role) {
         return new User(userId, userName, email, role);
     }
+
+    public static User toEntity(AuthenticateUserRequest authenticateUserRequest) {
+        return User.builder()
+                .userName(authenticateUserRequest.nickname())
+                .email(authenticateUserRequest.email())
+                .role(authenticateUserRequest.role())
+                .build();
+    }
 }
diff --git a/src/main/java/com/neighbors/tohero/domain/domain/user/service/UpdateUser.java b/src/main/java/com/neighbors/tohero/domain/domain/user/service/UpdateUser.java
@@ -1,6 +1,7 @@
 package com.neighbors.tohero.domain.domain.user.service;
 
 import com.neighbors.tohero.common.annotaion.DomainService;
+import com.neighbors.tohero.domain.domain.user.model.User;
 import com.neighbors.tohero.domain.query.UserRepository;
 import lombok.RequiredArgsConstructor;
 
@@ -10,7 +11,11 @@ public class UpdateUser {
 
     private final UserRepository userRepository;
 
-    public void updateUserName(long userId, String nickname) {
-        userRepository.updateUserName(userId, nickname);
+    public User updateUserName(long userId, String nickname) {
+        return userRepository.updateUserName(repo -> repo.findByUserId(userId), nickname);
+    }
+
+    public User updateUserName(String email, String nickname){
+        return userRepository.updateUserName(repo -> repo.findByEmail(email), nickname);
     }
 }
diff --git a/src/main/java/com/neighbors/tohero/domain/query/UserRepository.java b/src/main/java/com/neighbors/tohero/domain/query/UserRepository.java
@@ -1,9 +1,14 @@
 package com.neighbors.tohero.domain.query;
 
 import com.neighbors.tohero.domain.domain.user.model.User;
+import com.neighbors.tohero.infrastructure.entity.UserEntity;
+import com.neighbors.tohero.infrastructure.repository.UserEntityRepository;
+
+import java.util.Optional;
+import java.util.function.Function;
 
 public interface UserRepository {
     User createUser(User user);
-    void updateUserName(long userId, String nickname);
+    User updateUserName(Function<UserEntityRepository, Optional<UserEntity>> findUserFunction, String nickname);
     User getUserByEmail(String email);
 }
diff --git a/src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserRepositoryImpl.java b/src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserRepositoryImpl.java
@@ -11,6 +11,9 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
+import java.util.Optional;
+import java.util.function.Function;
+
 @Repository
 @RequiredArgsConstructor
 public class UserRepositoryImpl implements UserRepository {
@@ -20,27 +23,32 @@ public class UserRepositoryImpl implements UserRepository {
 
     @Override
     public User createUser(User user) {
-        UserEntity userEntity = userMapper.toEntity(user);
-        userEntityRepository.save(userEntity);
+        try{
+            return getUserByEmail(user.getEmail());
+        }catch(UserException e){
+            UserEntity userEntity = userMapper.toEntity(user);
+            userEntityRepository.save(userEntity);
 
-        UserEntity createdUserEntity = userEntityRepository.findByEmail(user.getEmail())
-                .orElseThrow(() -> new UserException(
-                        BaseResponseStatus.NO_RESULT,
-                        BaseResponseMessage.존재하지_않는_유저입니다.getMessage()
-                ));;
-        return userMapper.toDomain(createdUserEntity);
+            UserEntity createdUserEntity = userEntityRepository.findByEmail(user.getEmail())
+                    .orElseThrow(() -> new UserException(
+                            BaseResponseStatus.NO_RESULT,
+                            BaseResponseMessage.존재하지_않는_유저입니다.getMessage()
+                    ));;
+            return userMapper.toDomain(createdUserEntity);
+        }
     }
 
     @Override
-    public void updateUserName(long userId, String nickname) {
-        UserEntity matchedUserEntity = userEntityRepository.findByUserId(userId)
+    public User updateUserName(Function<UserEntityRepository, Optional<UserEntity>> findUserFunction, String nickname) {
+        UserEntity matchedUserEntity = findUserFunction.apply(userEntityRepository)
                 .orElseThrow(() -> new UserException(
                         BaseResponseStatus.BAD_REQUEST,
                         BaseResponseMessage.존재하지_않는_유저입니다.getMessage()
                 ));
 
         matchedUserEntity.changeNickname(nickname);
-        userEntityRepository.save(matchedUserEntity);
+        UserEntity userEntity = userEntityRepository.save(matchedUserEntity);
+        return userMapper.toDomain(userEntity);
     }
 
     @Override
diff --git a/src/main/java/com/neighbors/tohero/presentation/exception_handler/DTOFieldExceptionControllerAdvice.java b/src/main/java/com/neighbors/tohero/presentation/exception_handler/DTOFieldExceptionControllerAdvice.java
@@ -14,8 +14,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.neighbors.tohero.application.baseResponse.BaseResponseMessage.유저_이름의_길이는_1부터_5까지만_가능합니다;
-import static com.neighbors.tohero.application.baseResponse.BaseResponseMessage.주소_검색_쿼리의_길이는_1부터_50까지만_가능합니다;
+import static com.neighbors.tohero.application.baseResponse.BaseResponseMessage.*;
 
 @Priority(0)
 @RestControllerAdvice
@@ -27,6 +26,8 @@ public DTOFieldExceptionControllerAdvice() {
         fieldErrorMapper = new HashMap<>();
         fieldErrorMapper.put("nickname", 유저_이름의_길이는_1부터_5까지만_가능합니다);
         fieldErrorMapper.put("searchAddress", 주소_검색_쿼리의_길이는_1부터_50까지만_가능합니다);
+        fieldErrorMapper.put("role", ROLE_필드는_필수입력입니다);
+        fieldErrorMapper.put("email", 이메일_형식이_올바르지_못합니다);
     }
 
     @ResponseStatus(HttpStatus.BAD_REQUEST)
