diff --git a/src/main/java/com/example/helloworldmvc/converter/UserConverter.java b/src/main/java/com/example/helloworldmvc/converter/UserConverter.java index 4e1c251..2f2f50a 100644 --- a/src/main/java/com/example/helloworldmvc/converter/UserConverter.java +++ b/src/main/java/com/example/helloworldmvc/converter/UserConverter.java @@ -37,9 +37,10 @@ public static UserResponseDTO.OAuthResponse toOAuthResponse(TokenDTO accessToken .build(); } - public static TokenListDTO toTokenList(List tokens){ + public static TokenListDTO toTokenList(List tokens, Boolean isExist){ return TokenListDTO.builder() .tokenList(tokens) + .isExist(isExist) .build(); } } diff --git a/src/main/java/com/example/helloworldmvc/service/GoogleServiceImpl.java b/src/main/java/com/example/helloworldmvc/service/GoogleServiceImpl.java index 71589f8..9e7acf3 100644 --- a/src/main/java/com/example/helloworldmvc/service/GoogleServiceImpl.java +++ b/src/main/java/com/example/helloworldmvc/service/GoogleServiceImpl.java @@ -96,8 +96,9 @@ public TokenListDTO loginGoogle(String token) { List tokenDTOList = new ArrayList<>(); tokenDTOList.add(refreshToken); tokenDTOList.add(accessToken); - - return UserConverter.toTokenList(tokenDTOList); + // 로그인 진행 + boolean isExist = true; + return UserConverter.toTokenList(tokenDTOList, isExist); } else { User user = userRepository.save(UserConverter.toGoogleUser(googleProfile)); TokenDTO accessToken = jwtTokenProvider.createAccessToken(user.getEmail()); @@ -107,8 +108,9 @@ public TokenListDTO loginGoogle(String token) { List tokenDTOList = new ArrayList<>(); tokenDTOList.add(refreshToken); tokenDTOList.add(accessToken); - - return UserConverter.toTokenList(tokenDTOList); + // 회원가입 진행 + boolean isExist = false; + return UserConverter.toTokenList(tokenDTOList, isExist); } } @@ -139,7 +141,8 @@ public TokenListDTO reissueToken(String token) { // Redis에 refresh token 업데이트 redisTemplate.opsForValue().set("RT:" + email, newRefreshToken.getToken(), newRefreshToken.getTokenExpriresTime().getTime(), TimeUnit.MILLISECONDS); - return UserConverter.toTokenList(tokenDTOList); + Boolean isExist = true; + return UserConverter.toTokenList(tokenDTOList, isExist); } @Override diff --git a/src/main/java/com/example/helloworldmvc/service/UserServiceImpl.java b/src/main/java/com/example/helloworldmvc/service/UserServiceImpl.java index f95c08a..0a96763 100644 --- a/src/main/java/com/example/helloworldmvc/service/UserServiceImpl.java +++ b/src/main/java/com/example/helloworldmvc/service/UserServiceImpl.java @@ -40,8 +40,9 @@ public TokenListDTO loginGmail(UserRequestDTO.GoogleEmailRequest request) { List tokenDTOList = new ArrayList<>(); tokenDTOList.add(refreshToken); tokenDTOList.add(accessToken); + Boolean isExist = true; - return UserConverter.toTokenList(tokenDTOList); + return UserConverter.toTokenList(tokenDTOList, isExist); } diff --git a/src/main/java/com/example/helloworldmvc/web/controller/UserController.java b/src/main/java/com/example/helloworldmvc/web/controller/UserController.java index 1c630a8..fc37128 100644 --- a/src/main/java/com/example/helloworldmvc/web/controller/UserController.java +++ b/src/main/java/com/example/helloworldmvc/web/controller/UserController.java @@ -79,7 +79,7 @@ public ApiResponse loginGoogleEmail(@RequestBody @Valid UserReques @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200", description = "OK, 성공"), }) @Parameters({ - @Parameter(name = "token", description = "query string(RequestParam) - refreshToken 입력"), + @Parameter(name = "RTK", description = "query string(RequestParam) - refreshToken 입력"), }) @GetMapping("/login/reissue") public ApiResponse reissueGoogleLoginInfo(@RequestParam(value = "RTK") String token) { diff --git a/src/main/java/com/example/helloworldmvc/web/dto/TokenListDTO.java b/src/main/java/com/example/helloworldmvc/web/dto/TokenListDTO.java index f43989c..6d0906d 100644 --- a/src/main/java/com/example/helloworldmvc/web/dto/TokenListDTO.java +++ b/src/main/java/com/example/helloworldmvc/web/dto/TokenListDTO.java @@ -10,4 +10,5 @@ @Builder public class TokenListDTO { private List tokenList; + private Boolean isExist; // 회원여부 (0:비회원, 1:회원) }