Merge pull request #32 from LearnMate-Dev/chore/#31

[Chore/#31] accessToken 반환 방식 수정
LearnMate-Dev · Dec 3, 2024 · ed5a5ab · ed5a5ab
2 parents e1b2a44 + e50a996
commit ed5a5ab
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/src/main/java/LearnMate/dev/controller/UserController.java b/src/main/java/LearnMate/dev/controller/UserController.java
@@ -4,9 +4,8 @@
 import LearnMate.dev.model.dto.request.UserSignInRequest;
 import LearnMate.dev.model.dto.request.UserSignUpRequest;
 import LearnMate.dev.model.dto.response.HomeResponse;
-import LearnMate.dev.model.dto.response.UserSignInResponse;
+import LearnMate.dev.model.dto.response.TokenDto;
 import LearnMate.dev.service.UserService;
-import com.google.protobuf.Api;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 import jakarta.validation.Valid;
@@ -28,9 +27,9 @@ public ApiResponse<String> signUp(@RequestBody @Valid UserSignUpRequest request)
     }
 
     @PostMapping("/signIn")
-    public ApiResponse<String> signIn(@RequestBody @Valid UserSignInRequest request,
-                                      HttpServletResponse response,
-                                      HttpSession session) {
+    public ApiResponse<TokenDto> signIn(@RequestBody @Valid UserSignInRequest request,
+                                        HttpServletResponse response,
+                                        HttpSession session) {
 
         return ApiResponse.onSuccessData("로그인 성공", userService.signIn(request, response, session));
 

diff --git a/src/main/java/LearnMate/dev/model/converter/TokenConverter.java b/src/main/java/LearnMate/dev/model/converter/TokenConverter.java
@@ -0,0 +1,11 @@
+package LearnMate.dev.model.converter;
+
+import LearnMate.dev.model.dto.response.TokenDto;
+
+public class TokenConverter {
+    public static TokenDto toToken(String token) {
+        return TokenDto.builder()
+                .accessToken(token)
+                .build();
+    }
+}
diff --git a/src/main/java/LearnMate/dev/model/dto/response/TokenDto.java b/src/main/java/LearnMate/dev/model/dto/response/TokenDto.java
@@ -0,0 +1,14 @@
+package LearnMate.dev.model.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class TokenDto {
+    private String accessToken;
+}
diff --git a/src/main/java/LearnMate/dev/service/UserService.java b/src/main/java/LearnMate/dev/service/UserService.java
@@ -3,9 +3,11 @@
 import LearnMate.dev.common.exception.ApiException;
 import LearnMate.dev.common.ErrorStatus;
 import LearnMate.dev.model.converter.HomeConverter;
+import LearnMate.dev.model.converter.TokenConverter;
 import LearnMate.dev.model.dto.request.UserSignInRequest;
 import LearnMate.dev.model.dto.request.UserSignUpRequest;
 import LearnMate.dev.model.dto.response.HomeResponse;
+import LearnMate.dev.model.dto.response.TokenDto;
 import LearnMate.dev.model.entity.Diary;
 import LearnMate.dev.model.entity.Plan;
 import LearnMate.dev.model.entity.User;
@@ -48,7 +50,7 @@ public String signUp(UserSignUpRequest request) {
         return "회원가입 성공";
     }
 
-    public String signIn(UserSignInRequest request, HttpServletResponse response, HttpSession session) {
+    public TokenDto signIn(UserSignInRequest request, HttpServletResponse response, HttpSession session) {
 
         User user = findUserByLoginId(request.getLoginId());
         validPassword(request.getPassword(), user.getPassword());
@@ -59,7 +61,7 @@ public String signIn(UserSignInRequest request, HttpServletResponse response, Ht
         // RefreshToken 발급 및 세션에 저장
         jwtProvider.storeRefreshTokenInSession(user, session);
 
-        return "accessToken: " + accessToken;
+        return TokenConverter.toToken(accessToken);
 
     }