Merge pull request #69 from yomankum-project/fix/68-login

fix(login): login 수정

src/main/java/com/account/yomankum/user/controller/LoginController.java

@@ -1,6 +1,5 @@
 package com.account.yomankum.user.controller;
 
-import com.account.yomankum.security.service.CustomUserDetails;
 import com.account.yomankum.user.dto.request.FirstLoginUserInfoSaveDto;
 import com.account.yomankum.user.dto.response.LoginResDto;
 import com.account.yomankum.user.service.UserService;
@@ -9,10 +8,10 @@
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.web.bind.annotation.*;
-
-import java.security.Principal;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import static com.account.yomankum.user.dto.UserDto.UserLoginDto;
 
@@ -33,8 +32,8 @@ public LoginResDto login(@RequestBody @Valid UserLoginDto userLoginDto) {
 
     @PostMapping("/first")
     @Operation(summary = "첫 로그인 정보 받기", description = "첫 로그인 후 기본 정보를 저장하기 위한 창")
-    public void firstLogin(@RequestBody @Valid FirstLoginUserInfoSaveDto firstLoginUserInfoSaveDto, @AuthenticationPrincipal Principal principal) {
-        userService.saveFirstLoginUserInfo(firstLoginUserInfoSaveDto, (CustomUserDetails) principal);
+    public void firstLogin(@RequestBody @Valid FirstLoginUserInfoSaveDto firstLoginUserInfoSaveDto) {
+        userService.saveFirstLoginUserInfo(firstLoginUserInfoSaveDto);
     }
 
 }

src/main/java/com/account/yomankum/user/dto/request/FirstLoginUserInfoSaveDto.java

@@ -7,6 +7,8 @@
 import java.time.LocalDate;
 
 public record FirstLoginUserInfoSaveDto(
+        @NotNull
+        Long id,
         @NotBlank
         String nickname,
         @NotNull

src/main/java/com/account/yomankum/user/dto/response/LoginResDto.java

@@ -1,18 +1,21 @@
 package com.account.yomankum.user.dto.response;
 
+import com.account.yomankum.user.domain.User;
 import lombok.Builder;
 
 @Builder
 public record LoginResDto(
         String accessToken,
         String refreshToken,
+        Long id,
         String nickname
 ) {
-    public static LoginResDto of(String accessToken, String refreshToken, String nickname) {
+    public static LoginResDto of(String accessToken, String refreshToken, User user) {
         return LoginResDto.builder()
                 .accessToken(accessToken)
                 .refreshToken(refreshToken)
-                .nickname(nickname)
+                .nickname(user.getNickname())
+                .id(user.getId())
                 .build();
     }
 }

src/main/java/com/account/yomankum/user/service/UserService.java

@@ -14,6 +14,6 @@ public interface UserService {
     LoginResDto login(UserLoginDto userLoginDto);
     UserInfoDto getUserInfo(CustomUserDetails userDetails);
     void updatePassword(String uuid, String password);
-    void saveFirstLoginUserInfo(FirstLoginUserInfoSaveDto firstLoginUserInfoSaveDto, CustomUserDetails userDetails);
+    void saveFirstLoginUserInfo(FirstLoginUserInfoSaveDto firstLoginUserInfoSaveDto);
     void updateUserInfo(CustomUserDetails userDetails, UserInfoUpdateDto dto);
 }

src/main/java/com/account/yomankum/user/service/UserServiceImpl.java

@@ -72,9 +72,8 @@ public LoginResDto login(UserLoginDto userLoginDto) {
 
         String accessToken = tokenService.creatToken(findUser.getId(), findUser.getNickname(), findUser.getRole().getRoleName());
         String refreshToken = tokenService.createRefreshToken();
-        String nickname = findUser.getNickname();
 
-        return LoginResDto.of(accessToken, refreshToken, nickname);
+        return LoginResDto.of(accessToken, refreshToken, findUser);
     }
 
     @Override
@@ -108,11 +107,11 @@ public void updatePassword(String uuid, String passwordJson) {
     }
 
     @Override
-    public void saveFirstLoginUserInfo(FirstLoginUserInfoSaveDto firstLoginUserInfoSaveDto, CustomUserDetails userDetails) {
-        User findUser = userRepository.findByEmailFetchRole(userDetails.getUsername())
+    public void saveFirstLoginUserInfo(FirstLoginUserInfoSaveDto dto) {
+        User findUser = userRepository.findById(dto.id())
                 .orElseThrow(() -> new BadRequestException(Exception.USER_NOT_FOUND));
 
-        findUser.updateFirstUserInfo(firstLoginUserInfoSaveDto);
+        findUser.updateFirstUserInfo(dto);
         userRepository.save(findUser);
     }
 

src/main/resources/application.yml

@@ -136,8 +136,8 @@ springdoc:
 
 commit:
   final:
-    number: 65
-    datetime: 2024-03-15 13:14
+    number: 68
+    datetime: 2024-03-19 23:47
 
 ---
 spring: