refactor : 로그인 반환에 access,refresh토큰 추가

Kusitms-28th-Meet-Up-B · Nov 21, 2023 · 0eadbce · 0eadbce
1 parent 95e9b3a
commit 0eadbce
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 9 deletions.
diff --git a/src/main/java/kusitms/gallae/controller/AuthenticationController.java b/src/main/java/kusitms/gallae/controller/AuthenticationController.java
@@ -31,7 +31,7 @@ public class AuthenticationController {
 
     // 로그인 요청을 처리하는 메서드
     @PostMapping("/login")
-    public ResponseEntity<BaseResponse<User>> login(
+    public ResponseEntity<BaseResponse<LoginResponse>> login(
             @Parameter(description = "아이디", example = "아이")
             @RequestParam(value = "loginId", required = true)
             String loginId,

diff --git a/src/main/java/kusitms/gallae/domain/User.java b/src/main/java/kusitms/gallae/domain/User.java
@@ -28,7 +28,7 @@ public class User {
 
     private String nickName;   //기업이면 이게 기관명
 
-        private String registrationNum;
+    private String registrationNum;
 
     private String department;  //담당 부서
 

diff --git a/src/main/java/kusitms/gallae/dto/user/LoginResponse.java b/src/main/java/kusitms/gallae/dto/user/LoginResponse.java
@@ -1,27 +1,44 @@
 package kusitms.gallae.dto.user;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import kusitms.gallae.global.Role;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDate;
+
 @Data
 public class LoginResponse {
     private Long id;
-    private String role;
+
+    private String nickName;   //기업이면 이게 기관명
+
+    private String registrationNum;
+
+    private String department;  //담당 부서
+
     private String loginId;
-    private String nickName;
+    private String name;   //담당자 명
+    private String phoneNumber;
     private String email;
-    private String name;
     private String imageUrl;
-    private String phoneNumber;
+
+    private Long point;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDate birth;
+
+    private String role;
     private String accessToken;
     private String refreshToken;
 
     @Builder
-    public LoginResponse(Long id, String name,String loginId, String phoneNumber, String nickName, String email, String imageUrl, String accessToken, String refreshToken,  String role) {
+    public LoginResponse(Long id, String name,String department,String registrationNum,
+                         String loginId, String phoneNumber, String nickName, String email, Long point, LocalDate birth,
+                         String imageUrl, String accessToken, String refreshToken,  String role) {
         this.id = id;
         this.nickName = nickName;
         this.phoneNumber = phoneNumber;
@@ -32,6 +49,10 @@ public LoginResponse(Long id, String name,String loginId, String phoneNumber, St
         this.accessToken = accessToken;
         this.refreshToken = refreshToken;
         this.role = role;
+        this.department = department;
+        this.registrationNum = registrationNum;
+        this.point = point;
+        this.birth = birth;
     }
 
 }
diff --git a/src/main/java/kusitms/gallae/service/user/AuthenticationService.java b/src/main/java/kusitms/gallae/service/user/AuthenticationService.java
@@ -29,7 +29,7 @@ public class AuthenticationService {
     @Autowired
     private UserRepository userRepository;
 
-    public User login(LoginRequestDto loginRequestDto, HttpServletResponse httpServletResponse) {
+    public LoginResponse login(LoginRequestDto loginRequestDto, HttpServletResponse httpServletResponse) {
         // 사용자 정보 조회
         User user = userRepository.findByLoginIdAndLoginPw(loginRequestDto.getLoginId(), loginRequestDto.getLoginPw())
                 .orElseThrow(() -> new RuntimeException("User not found"));
@@ -45,7 +45,22 @@ public User login(LoginRequestDto loginRequestDto, HttpServletResponse httpServl
         AuthUtil.setRefreshTokenCookie(httpServletResponse, user.getRefreshToken());
 
         // 로그인 응답 생성 및 반환
-        return user;
+        return LoginResponse.builder()
+                .id(user.getId())
+                .email(user.getEmail())
+                .loginId(user.getLoginId())
+                .imageUrl(user.getProfileImageUrl())
+                .nickName(user.getNickName())
+                .phoneNumber(user.getPhoneNumber())
+                .name(user.getName())
+                .accessToken(accessToken)
+                .birth(user.getBirth())
+                .registrationNum(user.getRegistrationNum())
+                .point(user.getPoint())
+                .department(user.getDepartment())
+                .refreshToken(user.getRefreshToken())
+                .role(user.getRole().toString())
+                .build();
 
     }