diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts index cb79120..6b716d2 100644 --- a/src/auth/auth.service.ts +++ b/src/auth/auth.service.ts @@ -31,13 +31,14 @@ export class AuthService { async login(user: User): Promise { // eslint-disable-next-line @typescript-eslint/no-unused-vars const { password, ...result } = user - return (result['access_token'] = await this.getAccessToken(user)) + result['access_token'] = await this.getAccessToken(user) + return result } - async register(data: UserDTO): Promise { - data.refresh_token = await this.getRefreshToken(data) - data.password = await this.getEcryptedPassword(data.password) - return await this.userService.add(data) + async register(user: UserDTO): Promise { + user.refresh_token = await this.getRefreshToken(user) + user.password = await this.getEcryptedPassword(user.password) + return await this.userService.add(user) } //Access Token 재발행 @@ -50,16 +51,16 @@ export class AuthService { //Access Token 및 refresh Token 재발행 async recreate(user: User): Promise { - const tokens = await this.getTokens(user) - await this.userService.update({ + const refresh_token = await this.getRefreshToken(user) + const updateedUser = await this.userService.update({ where: { id: user.id }, - data: { refresh_token: tokens.refresh_token } + data: { refresh_token: refresh_token } }) - return tokens + return this.login(updateedUser) } async getAccessToken(data: UserDTO): Promise { - const token = await this.jwtService.sign( + return await this.jwtService.sign( { email: data.email, name: data.name @@ -69,13 +70,9 @@ export class AuthService { expiresIn: jwtConstants.access_expiresIn } ) - return { - token: token, - expiresIn: jwtConstants.access_expiresIn - } } async getRefreshToken(data: UserDTO): Promise { - const token = await this.jwtService.sign( + return await this.jwtService.sign( { email: data.email, name: data.name @@ -85,10 +82,6 @@ export class AuthService { expiresIn: jwtConstants.refresh_expiresIn } ) - return { - token: token, - expiresIn: jwtConstants.refresh_expiresIn - } } async getTokens(data: UserDTO): Promise { return {