[Chore] 토큰 시간 조정, 로그인 시 가입 여부 응답 추가 (#191)

CCC-org · Jan 15, 2023 · 4f20ce5 · 4f20ce5
1 parent 5c4559a
commit 4f20ce5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/keewe-api/src/main/java/ccc/keeweapi/component/UserAssembler.java b/keewe-api/src/main/java/ccc/keeweapi/component/UserAssembler.java
@@ -9,8 +9,8 @@
 @Component
 public class UserAssembler {
 
-    public UserSignUpResponse toUserSignUpResponse(User user, String accessToken) {
-        return UserSignUpResponse.of(user.getId(), accessToken);
+    public UserSignUpResponse toUserSignUpResponse(User user, boolean isAlreadySignedUp, String accessToken) {
+        return UserSignUpResponse.of(user.getId(), isAlreadySignedUp, accessToken);
     }
 
     public UserSignUpDto toUserSignUpDto(String vendorId, VendorType vendorType, String email) {

diff --git a/keewe-api/src/main/java/ccc/keeweapi/config/security/jwt/JwtUtils.java b/keewe-api/src/main/java/ccc/keeweapi/config/security/jwt/JwtUtils.java
@@ -25,7 +25,8 @@ public class JwtUtils {
     @Value("${jwt.secret}")
     private String secretKey;
 
-    private final long tokenValidTime = 600 * 600 * 1000L;
+    // note. 약 41일
+    private final long tokenValidTime = 600 * 600 * 10000L;
 
     private final UserDetailsService userDetailsService;
 

diff --git a/keewe-api/src/main/java/ccc/keeweapi/dto/user/UserSignUpResponse.java b/keewe-api/src/main/java/ccc/keeweapi/dto/user/UserSignUpResponse.java
@@ -1,13 +1,12 @@
 package ccc.keeweapi.dto.user;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 @Data
 @AllArgsConstructor(staticName = "of")
 public class UserSignUpResponse {
     private Long userId;
+    private boolean isAlreadySignedUp;
     private String accessToken;
 }
diff --git a/keewe-api/src/main/java/ccc/keeweapi/service/user/UserApiService.java b/keewe-api/src/main/java/ccc/keeweapi/service/user/UserApiService.java
@@ -34,7 +34,7 @@ public <T extends OauthResponse> UserSignUpResponse signupWithOauth(String code,
         Optional<User> userOps = userDomainService.getUserByVendorIdAndVendorType(account.getId(), vendorType);
 
         if(userOps.isPresent()) {
-            return userAssembler.toUserSignUpResponse(userOps.get(), getToken(userOps.get().getId()));
+            return userAssembler.toUserSignUpResponse(userOps.get(), true, getToken(userOps.get().getId()));
         }
 
         User user = signUpWithOauth(
@@ -43,7 +43,7 @@ public <T extends OauthResponse> UserSignUpResponse signupWithOauth(String code,
                 , KeeweStringUtils.getOrDefault(account.getEmail(), "")
         );
 
-        return userAssembler.toUserSignUpResponse(user, getToken(user.getId()));
+        return userAssembler.toUserSignUpResponse(user, false, getToken(user.getId()));
     }
 
     public String getToken(Long userId) {

diff --git a/keewe-api/src/test/java/ccc/keeweapi/controller/api/user/UserSignupControllerTest.java b/keewe-api/src/test/java/ccc/keeweapi/controller/api/user/UserSignupControllerTest.java
@@ -39,6 +39,7 @@ void kakao_signup() throws Exception {
         // given
         UserSignUpResponse userSignUpDto = UserSignUpResponse.of(
                 1L,
+                true,
                 "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJoYXZlYWx3YXlzYmVlbkBrYWthby5jb20iLCJyb2xlcyI6W10sImlhdCI6MTY1NzQzNjU2MywiZXhwIjoxNjU3Nzk2NTYzfQ.AJX7rGRXjmi4TopUBsX6zWVgMYgjN_uRYtF_Yb_80KE"
         );
 
@@ -58,6 +59,7 @@ void kakao_signup() throws Exception {
                                         fieldWithPath("message").description("요청 결과 메세지"),
                                         fieldWithPath("code").description("결과 코드"),
                                         fieldWithPath("data.userId").description("생성된 유저 ID"),
+                                        fieldWithPath("data.alreadySignedUp").description("기존 회원가입 여부"),
                                         fieldWithPath("data.accessToken").description("발급된 유저의 JWT"))
                                 .tag("SignUp")
                                 .build()
@@ -71,6 +73,7 @@ void naver_signup() throws Exception {
         String state = "123456789";
         UserSignUpResponse userSignUpDto = UserSignUpResponse.of(
                 1L,
+                true,
                 "[발급된 JWT]"
         );
 
@@ -97,6 +100,7 @@ void naver_signup() throws Exception {
                                         fieldWithPath("message").description("요청 결과 메세지"),
                                         fieldWithPath("code").description("결과 코드"),
                                         fieldWithPath("data.userId").description("생성된 유저 ID"),
+                                        fieldWithPath("data.alreadySignedUp").description("기존 회원가입 여부"),
                                         fieldWithPath("data.accessToken").description("발급된 유저의 JWT"))
                                 .tag("SignUp")
                                 .build()
@@ -108,6 +112,7 @@ void naver_signup() throws Exception {
     void google_signup() throws Exception {
         UserSignUpResponse userSignUpDto = UserSignUpResponse.of(
                 1L,
+                true,
                 "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJoYXZlYWx3YXlzYmVlbkBrYWthby5jb20iLCJyb2xlcyI6W10sImlhdCI6MTY1NzQzNjU2MywiZXhwIjoxNjU3Nzk2NTYzfQ.AJX7rGRXjmi4TopUBsX6zWVgMYgjN_uRYtF_Yb_80KE"
         );
 
@@ -127,6 +132,7 @@ void google_signup() throws Exception {
                                         fieldWithPath("message").description("요청 결과 메세지"),
                                         fieldWithPath("code").description("결과 코드"),
                                         fieldWithPath("data.userId").description("생성된 유저 ID"),
+                                        fieldWithPath("data.alreadySignedUp").description("기존 회원가입 여부"),
                                         fieldWithPath("data.accessToken").description("발급된 유저의 JWT"))
                                 .tag("SignUp")
                                 .build()