[Weekly/11/Refactor/TokenResponse] token response에 사용자 아이디, 타입 반환하도록 …

…반영 (#139)
kakao-tech-campus-2nd-step3 · Nov 15, 2024 · cdf57ab · cdf57ab
1 parent a1c3cfd
commit cdf57ab
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/src/main/java/org/ktc2/cokaen/wouldyouin/_develop/api/TempCreateController.java b/src/main/java/org/ktc2/cokaen/wouldyouin/_develop/api/TempCreateController.java
@@ -75,6 +75,7 @@ public ResponseEntity<ApiResponseBody<TokenResponse>> testCreateToken(
     }
 
     private TokenResponse createToken(MemberIdentifier identifier) {
-        return TokenResponse.from(jwtService.createAccessToken(identifier.id(), identifier.type()));
+        String accessToken = jwtService.createAccessToken(identifier.id(), identifier.type());
+        return TokenResponse.of(accessToken, identifier.id(), identifier.type());
     }
 }
diff --git a/src/main/java/org/ktc2/cokaen/wouldyouin/auth/api/dto/SocialTokenResponse.java b/src/main/java/org/ktc2/cokaen/wouldyouin/auth/api/dto/SocialTokenResponse.java
@@ -1,8 +1,9 @@
 package org.ktc2.cokaen.wouldyouin.auth.api.dto;
 
 import lombok.Builder;
+import org.ktc2.cokaen.wouldyouin.member.persist.MemberType;
 
 @Builder
-public record SocialTokenResponse(Boolean isWelcomeMember, String token) {
+public record SocialTokenResponse(Boolean isWelcomeMember, String token, Long memberId, MemberType memberType) {
 
 }
diff --git a/src/main/java/org/ktc2/cokaen/wouldyouin/auth/api/dto/TokenResponse.java b/src/main/java/org/ktc2/cokaen/wouldyouin/auth/api/dto/TokenResponse.java
@@ -1,13 +1,16 @@
 package org.ktc2.cokaen.wouldyouin.auth.api.dto;
 
 import lombok.Builder;
+import org.ktc2.cokaen.wouldyouin.member.persist.MemberType;
 
 @Builder
-public record TokenResponse(String token) {
+public record TokenResponse(String token, Long memberId, MemberType memberType) {
 
-    public static TokenResponse from(String token) {
+    public static TokenResponse of(String token, Long memberId, MemberType memberType) {
         return TokenResponse.builder()
             .token(token)
+            .memberId(memberId)
+            .memberType(memberType)
             .build();
     }
 }
diff --git a/src/main/java/org/ktc2/cokaen/wouldyouin/auth/application/AuthService.java b/src/main/java/org/ktc2/cokaen/wouldyouin/auth/application/AuthService.java
@@ -33,12 +33,14 @@ public class AuthService {
     @Transactional
     public TokenResponse localSignup(LocalSignupRequest request) {
         baseMemberService.checkUniqueEmailOrThrow(request.getEmail());
-        return TokenResponse.from(createToken(hostService.createHost(request)));
+        MemberResponse response = hostService.createHost(request);
+        return TokenResponse.of(createToken(response), response.getMemberId(), response.getMemberType());
     }
 
     @Transactional(readOnly = true)
     public TokenResponse localLogin(LocalLoginRequest request) {
-        return TokenResponse.from(createToken(hostService.getMemberResponseBy(request)));
+        MemberResponse response = hostService.getMemberResponseBy(request);
+        return TokenResponse.of(createToken(response), response.getMemberId(), response.getMemberType());
     }
 
     @Transactional
@@ -55,13 +57,17 @@ public SocialTokenResponse socialLogin(AccountType accountType, String code) {
                 return SocialTokenResponse.builder()
                     .isWelcomeMember(false)
                     .token(createToken(id))
+                    .memberId(id.id())
+                    .memberType(id.type())
                     .build();
             }
             // 소셜 계정이지만 아직 추가 정보 기입이 되지 않은 경우
             else {
                 return SocialTokenResponse.builder()
                     .isWelcomeMember(true)
                     .token(createToken(id))
+                    .memberId(id.id())
+                    .memberType(id.type())
                     .build();
             }
         }
@@ -78,12 +84,15 @@ public SocialTokenResponse socialLogin(AccountType accountType, String code) {
         return SocialTokenResponse.builder()
             .isWelcomeMember(true)
             .token(createToken(welcomeMemberResponse))
+            .memberId(welcomeMemberResponse.getMemberId())
+            .memberType(welcomeMemberResponse.getMemberType())
             .build();
     }
 
     @Transactional
     public TokenResponse acceptAdditionalInfo(Long welcomeMemberId, MemberAdditionalInfoRequest request) {
-        return TokenResponse.from(createToken(memberService.updateWelcomeMember(welcomeMemberId, request)));
+        MemberResponse response = memberService.updateWelcomeMember(welcomeMemberId, request);
+        return TokenResponse.of(createToken(response), response.getMemberId(), response.getMemberType());
     }
 
     private String createToken(MemberIdentifier identifier) {