Skip to content

Commit 84037ff

Browse files
authored
Merge pull request #88 from eureca-final-capstone-project/develop
main 병합
2 parents 471346a + 2aaaac0 commit 84037ff

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

src/main/java/eureca/capstone/project/admin/auth/controller/AuthController.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,16 @@ public BaseResponseDto<LoginResponseDto> login(@RequestBody LoginRequestDto logi
4848
);
4949
log.info("authentication: {}", authentication);
5050

51+
CustomUserDetailsDto customUserDetailsDto = (CustomUserDetailsDto) authentication.getPrincipal();
52+
5153
String accessToken = tokenService.generateToken(
5254
(CustomUserDetailsDto) authentication.getPrincipal(),
5355
httpServletResponse
5456
);
5557

5658
LoginResponseDto loginResponseDto = LoginResponseDto.builder()
5759
.accessToken(accessToken)
60+
.userId(customUserDetailsDto.getUserId())
5861
.build();
5962
BaseResponseDto<LoginResponseDto> success = BaseResponseDto.success(loginResponseDto);
6063
log.info("success: {}", success);

src/main/java/eureca/capstone/project/admin/auth/dto/response/LoginResponseDto.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
@Builder
88
public class LoginResponseDto {
99
private String accessToken;
10+
private Long userId;
1011
}

0 commit comments

Comments
 (0)