Skip to content

Commit 3e408a4

Browse files
committed
πŸ› fix: 데이터 λ°˜ν™˜ ν˜•μ‹ 였λ₯˜λ‘œ 버그 μˆ˜μ •
1 parent d24b486 commit 3e408a4

File tree

3 files changed

+31
-6
lines changed

3 files changed

+31
-6
lines changed

β€Žserver/src/user/controller/user.controller.tsβ€Ž

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ export class UserController {
7676
@Body() loginDto: LoginUserRequestDto,
7777
@Res({ passthrough: true }) response: Response,
7878
) {
79-
const accessToken = await this.userService.loginUser(loginDto, response);
80-
return ApiResponse.responseWithData('λ‘œκ·ΈμΈμ„ μ„±κ³΅ν–ˆμŠ΅λ‹ˆλ‹€.', {
81-
accessToken,
82-
});
79+
return ApiResponse.responseWithData(
80+
'λ‘œκ·ΈμΈμ„ μ„±κ³΅ν–ˆμŠ΅λ‹ˆλ‹€.',
81+
await this.userService.loginUser(loginDto, response),
82+
);
8383
}
8484

8585
@ApiRefreshToken()
@@ -90,7 +90,7 @@ export class UserController {
9090
const userInformation = req.user;
9191
return ApiResponse.responseWithData(
9292
'μ—‘μ„ΈμŠ€ 토큰을 μž¬λ°œκΈ‰ν–ˆμŠ΅λ‹ˆλ‹€.',
93-
this.userService.createToken(userInformation, 'access'),
93+
this.userService.refreshAccessToken(userInformation),
9494
);
9595
}
9696

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { ApiProperty } from '@nestjs/swagger';
2+
3+
export class CreateAccessTokenResponseDto {
4+
@ApiProperty({
5+
example: 'exampleJWTAccessToken',
6+
description: 'μ—‘μ„ΈμŠ€ 토큰',
7+
})
8+
accessToken: string;
9+
10+
private constructor(partial: Partial<CreateAccessTokenResponseDto>) {
11+
Object.assign(this, partial);
12+
}
13+
14+
static toResponseDto(accessToken: string) {
15+
return new CreateAccessTokenResponseDto({
16+
accessToken,
17+
});
18+
}
19+
}

β€Žserver/src/user/service/user.service.tsβ€Ž

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { UpdateUserRequestDto } from '../dto/request/updateUser.dto';
2121
import { FileService } from '../../file/service/file.service';
2222
import { CheckEmailDuplicationResponseDto } from '../dto/response/checkEmailDuplication.dto';
2323
import { REDIS_KEYS } from '../../common/redis/redis.constant';
24+
import { CreateAccessTokenResponseDto } from '../dto/response/createAccessToken.dto';
2425

2526
@Injectable()
2627
export class UserService {
@@ -110,7 +111,12 @@ export class UserService {
110111
maxAge: REFRESH_TOKEN_TTL,
111112
});
112113

113-
return accessToken;
114+
return CreateAccessTokenResponseDto.toResponseDto(accessToken);
115+
}
116+
117+
refreshAccessToken(userInformation: Payload) {
118+
const accessToken = this.createToken(userInformation, 'access');
119+
return CreateAccessTokenResponseDto.toResponseDto(accessToken);
114120
}
115121

116122
createToken(userInformation: Payload, mode: string) {

0 commit comments

Comments
Β (0)