Merge pull request #29 from kusitms-28th-Meetup-E/feat/bubble

fix : 로그인 시 userId 리턴
kusitms-28th-Meetup-E · Nov 23, 2023 · 890d51a · 890d51a
2 parents a709dc8 + dab82e4
commit 890d51a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/gwangjang/server/domain/auth/application/dto/response/SignInResponse.java b/src/main/java/gwangjang/server/domain/auth/application/dto/response/SignInResponse.java
@@ -15,6 +15,7 @@ public class SignInResponse {
     private String accessToken;
     private String refreshToken;
     private Boolean registrationStatus;
+    private String memberId;
 
     public static SignInResponse from(TokenInfoResponse tokenInfoResponse, RegistrationStatus registrationStatus) {
         return SignInResponse.builder()
@@ -23,4 +24,8 @@ public static SignInResponse from(TokenInfoResponse tokenInfoResponse, Registrat
                 .registrationStatus(registrationStatus.equals(RegistrationStatus.COMPLETED))
                 .build();
     }
+
+    public void updateMemberId(String memberId) {
+        this.memberId = memberId;
+    }
 }
diff --git a/src/main/java/gwangjang/server/global/response/TokenInfoResponse.java b/src/main/java/gwangjang/server/global/response/TokenInfoResponse.java
@@ -12,13 +12,15 @@ public class TokenInfoResponse {
     private String accessToken;
     private String refreshToken;
     private Long refreshTokenExpirationTime;
+    private String memberId;
 
-    public static TokenInfoResponse from(String grantType, String accessToken, String refreshToken, Long refreshTokenExpirationTime) {
+    public static TokenInfoResponse from(String grantType, String accessToken, String refreshToken, Long refreshTokenExpirationTime,String socialId) {
         return TokenInfoResponse.builder()
                 .grantType(grantType)
                 .accessToken(accessToken)
                 .refreshToken(refreshToken)
                 .refreshTokenExpirationTime(refreshTokenExpirationTime)
+                .memberId(socialId)
                 .build();
     }
 

diff --git a/src/main/java/gwangjang/server/global/security/jwt/service/TokenUtil.java b/src/main/java/gwangjang/server/global/security/jwt/service/TokenUtil.java
@@ -78,7 +78,7 @@ public TokenInfoResponse createToken(String socialId, boolean isAdditionalInfoPr
                 .signWith(SignatureAlgorithm.HS256, secretKey)
                 .compact();
 
-        return TokenInfoResponse.from("Bearer", accessToken, refreshToken, refreshTokenValidityTime);
+        return TokenInfoResponse.from("Bearer", accessToken, refreshToken, refreshTokenValidityTime,socialId);
     }
 
     public boolean verifyToken(String token) {