[fix] 로그인 시 초기 유저, 기존 유저 구분 boolean 추가

Mojacknong · Oct 29, 2023 · fee7553 · fee7553
1 parent 19f40ba
commit fee7553
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/.jpb/jpb-settings.xml b/.jpb/jpb-settings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JpaPluginProjectSettings">
+    <option name="entityNameTemplate" />
+    <option name="isLombokBuilder" value="true" />
+    <option name="isLombokAllArgsConstructor" value="true" />
+    <option name="isLombokNoArgsConstructor" value="true" />
+    <option name="scaffoldingLanguage" />
+  </component>
+</project>
diff --git a/src/main/java/modernfarmer/server/farmususer/user/dto/response/TokenResponseDto.java b/src/main/java/modernfarmer/server/farmususer/user/dto/response/TokenResponseDto.java
@@ -17,4 +17,6 @@ public class TokenResponseDto {
     private String accessToken;
 
     private String refreshToken;
+
+    private boolean early;
 }
diff --git a/src/main/java/modernfarmer/server/farmususer/user/service/AuthService.java b/src/main/java/modernfarmer/server/farmususer/user/service/AuthService.java
@@ -28,6 +28,7 @@ public class AuthService{
     public UserRepository userRepository;
 
     private final WebClient webClient;
+    private boolean early = false;
 
     @Autowired
     public AuthService(WebClient webClient, UserRepository userRepository, JwtTokenProvider jwtTokenProvider, RedisTemplate<String, String> redisTemplate) {
@@ -57,6 +58,7 @@ public TokenResponseDto googleLogin(String accessToken) {
                     .role("USER")
                     .profileImage(userInfo.getPicture())
                     .build();
+            early = true;
 
             userRepository.save(user);
         }
@@ -69,6 +71,7 @@ public TokenResponseDto googleLogin(String accessToken) {
         TokenResponseDto tokenResponseDto = TokenResponseDto.builder()
                 .message("OK")
                 .code(200)
+                .early(early)
                 .accessToken(jwtTokenProvider.createAccessToken(
                         userLoginData.get().getId(),
                         String.valueOf(userLoginData.get().getRole())))
@@ -103,6 +106,8 @@ public TokenResponseDto kakaoLogin(String accessToken) {
                     .profileImage(userInfo.getKakao_account().getProfile().getProfile_image_url())
                     .build();
 
+            early = true;
+
             userRepository.save(user);
         }
 
@@ -114,6 +119,7 @@ public TokenResponseDto kakaoLogin(String accessToken) {
         TokenResponseDto tokenResponseDto = TokenResponseDto.builder()
                 .message("OK")
                 .code(200)
+                .early(early)
                 .accessToken(jwtTokenProvider.createAccessToken(
                         userLoginData.get().getId(),
                         String.valueOf(userLoginData.get().getRole())))