Merge pull request #14 from Neighbors-dev/develop

[FEAT] refresh token으로 access token 재발급 하는 로직 구현

Author: imscow11253

src/main/java/com/neighbors/tohero/application/auth/dto/ReissueTokenResponse.java

@@ -0,0 +1,8 @@
+package com.neighbors.tohero.application.auth.dto;
+
+import com.neighbors.tohero.common.jwt.AuthTokens;
+
+public record ReissueTokenResponse(
+        AuthTokens authTokens
+) {
+}

src/main/java/com/neighbors/tohero/application/auth/service/AuthService.java

@@ -0,0 +1,34 @@
+package com.neighbors.tohero.application.auth.service;
+
+import com.neighbors.tohero.application.auth.dto.ReissueTokenResponse;
+import com.neighbors.tohero.application.baseResponse.BaseResponse;
+import com.neighbors.tohero.application.baseResponse.BaseResponseMessage;
+import com.neighbors.tohero.application.baseResponse.BaseResponseStatus;
+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.GetUser;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class AuthService {
+
+    private final JwtProvider jwtProvider;
+    private final GetUser getUser;
+
+    public BaseResponse<ReissueTokenResponse> reissueToken(String refreshToken){
+        //TODO : Redis에 refreshToken 확인 작업
+        jwtProvider.isExpiredToken(refreshToken);
+        long userId = jwtProvider.getId(refreshToken);
+        User user = getUser.getUserById(userId);
+        AuthTokens authTokens = jwtProvider.createToken(JwtUserDetails.from(user));
+        return new BaseResponse(
+                BaseResponseStatus.OK,
+                BaseResponseMessage.토큰_재발급이_성공했습니다.getMessage(),
+                new ReissueTokenResponse(authTokens)
+        );
+    }
+}

src/main/java/com/neighbors/tohero/application/baseResponse/BaseResponseMessage.java

@@ -8,6 +8,9 @@ public enum BaseResponseMessage {
     //oauth success
     로그인_성공했습니다("로그인 성공했습니다"),
 
+    //auth
+    토큰_재발급이_성공했습니다("토큰 재발급이 성공했습니다"),
+
     //notice success
     공지_조회_성공했습니댜("공지 조회 성공했습니댜"),
 

src/main/java/com/neighbors/tohero/common/jwt/JwtProvider.java

@@ -35,7 +35,7 @@ public AuthTokens createToken(JwtUserDetails jwtUserDetails) {
 
         claims.put("role", jwtUserDetails.getRole());
         if(jwtUserDetails.getRole() == Role.USER) {
-            claims.put("userId", jwtUserDetails.getUserId());
+            claims.put("id", jwtUserDetails.getUserId());
             claims.put("email", jwtUserDetails.getEmail());
         }
 
@@ -87,20 +87,25 @@ public boolean isExpiredToken(String token) throws JwtInvalidTokenException {
         }
     }
 
-    public String getEmail(String token) {
+    public String getNickname(String token) {
         return Jwts.parserBuilder()
                 .setSigningKey(JWT_SECRET_KEY).build()
                 .parseClaimsJws(token)
                 .getBody()
                 .getSubject();
     }
 
-    public Long getId(String token) {
-        return Long.valueOf(Jwts.parserBuilder()
+    public void loggingToken(String token) {
+        Claims tokenInfo = Jwts.parserBuilder()
                 .setSigningKey(JWT_SECRET_KEY).build()
                 .parseClaimsJws(token)
-                .getBody()
-                .getId());
+                .getBody();
+        log.info("[JwtTokenProvider.loggingToken] token={}", tokenInfo);
+    }
+
+    public Long getId(String token) {
+        Claims claims = getBody(token);
+        return Long.parseLong(claims.get("id").toString());
     }
 
     private Claims getBody(String token) {

src/main/java/com/neighbors/tohero/domain/domain/user/service/GetUser.java

@@ -11,6 +11,10 @@ public class GetUser {
     private final UserRepository userRepository;
 
     public User getUserByEmail(String email) {
-        return userRepository.getUserByEmail(email);
+        return userRepository.getUser(repo -> repo.findByEmail(email));
+    }
+
+    public User getUserById(long userId) {
+        return userRepository.getUser(repo -> repo.findByUserId(userId));
     }
 }

src/main/java/com/neighbors/tohero/domain/query/UserRepository.java

@@ -10,5 +10,5 @@
 public interface UserRepository {
     User createUser(User user);
     User updateUserName(Function<UserEntityRepository, Optional<UserEntity>> findUserFunction, String nickname);
-    User getUserByEmail(String email);
+    User getUser(Function<UserEntityRepository, Optional<UserEntity>> findUserFunction);
 }

src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserRepositoryImpl.java

@@ -24,7 +24,7 @@ public class UserRepositoryImpl implements UserRepository {
     @Override
     public User createUser(User user) {
         try{
-            return getUserByEmail(user.getEmail());
+            return getUser(repo -> repo.findByEmail(user.getEmail()));
         }catch(UserException e){
             UserEntity userEntity = userMapper.toEntity(user);
             userEntityRepository.save(userEntity);
@@ -52,8 +52,8 @@ public User updateUserName(Function<UserEntityRepository, Optional<UserEntity>>
     }
 
     @Override
-    public User getUserByEmail(String email) {
-        UserEntity userEntity = userEntityRepository.findByEmail(email)
+    public User getUser(Function<UserEntityRepository, Optional<UserEntity>> findUserFunction) {
+        UserEntity userEntity = findUserFunction.apply(userEntityRepository)
                 .orElseThrow(() -> new UserException(
                         BaseResponseStatus.NO_RESULT,
                         BaseResponseMessage.존재하지_않는_유저입니다.getMessage()

src/main/java/com/neighbors/tohero/presentation/controller/AuthController.java

@@ -0,0 +1,25 @@
+package com.neighbors.tohero.presentation.controller;
+
+import com.neighbors.tohero.application.auth.service.AuthService;
+import com.neighbors.tohero.application.baseResponse.BaseResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/")
+public class AuthController {
+
+    private final AuthService authService;
+
+    @GetMapping("/auth/refreshToken")
+    public ResponseEntity<BaseResponse> refreshAccessToken(@RequestParam String refreshToken) {
+        return ResponseEntity.ok()
+                .body(authService.reissueToken(refreshToken));
+    }
+
+}