diff --git a/src/auth/guards/AccessToken.guard.ts b/src/auth/guards/AccessToken.guard.ts index 1825c54..5aee76b 100644 --- a/src/auth/guards/AccessToken.guard.ts +++ b/src/auth/guards/AccessToken.guard.ts @@ -54,13 +54,7 @@ export class AccessTokenGuard implements CanActivate { ]); const payload = this.authService.verifyAccessJWT(jwtString); - const existCheck = await this.authService.checkUserExist(payload.id); - if (!existCheck) { - throw new UnauthorizedException( - AuthErrorDefine['Auth-1004'], - '디비에서 유저 조회시에 발생하는 오류' - ); - } + // const user = payload const user = payload; const newObj: any = request; diff --git a/src/users/users.controller.ts b/src/users/users.controller.ts index b47663b..0bff7d1 100644 --- a/src/users/users.controller.ts +++ b/src/users/users.controller.ts @@ -39,6 +39,8 @@ import { ResponseRandomCommentDto } from './dtos/RandomComment.response.dto'; import { UserFindDto } from './dtos/UserFind.dto'; import { ResponseCommentNumDto } from './dtos/CommentNum.response.dto'; import { ResponseRandomCommentUserDto } from './dtos/RandomCommentUser.response.dto'; +import { ErrorResponse } from 'src/common/decorators/ErrorResponse.decorator'; +import { AuthErrorDefine } from 'src/auth/Errors/AuthErrorDefine'; @ApiTags('users') @ApiBearerAuth('accessToken') @@ -53,10 +55,7 @@ export class UsersController { description: '요청 성공시', type: UserProfileDto }) - @ApiUnauthorizedResponse({ - status: 401, - description: 'AccessToken이 없을 경우' - }) + @ErrorResponse(HttpStatus.UNAUTHORIZED, [AuthErrorDefine['Auth-1003']]) @Get('') async getMyUserInfo(@ReqUser() user: User) { // findOneByUserId diff --git a/src/users/users.service.ts b/src/users/users.service.ts index 06c5bf4..736b219 100644 --- a/src/users/users.service.ts +++ b/src/users/users.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Logger } from '@nestjs/common'; +import { Injectable, Logger, UnauthorizedException } from '@nestjs/common'; import { User } from 'src/database/entities/user.entity'; import { UserRepository } from 'src/database/repositories/user.repository'; import { RequestUserNameDto } from './dtos/UserName.request.dto'; @@ -14,6 +14,7 @@ import { ScrollOptionsDto } from './dtos/Scroll/ScrollOptions.dto'; import { ResponseScrollCommentsDto } from './dtos/Scroll/ScrollComments.response.dto'; import { RequestRandomCommentDto } from './dtos/RandomComment.request.dto'; import { UserFindDto } from './dtos/UserFind.dto'; +import { AuthErrorDefine } from 'src/auth/Errors/AuthErrorDefine'; @Injectable() export class UsersService { @@ -29,6 +30,12 @@ export class UsersService { async getMyInfo(user: User) { Logger.log(user); const myInfo = await this.userRepository.getMyInfo(user); + if (!myInfo) { + throw new UnauthorizedException( + AuthErrorDefine['Auth-1003'], + '디비에서 유저 조회시에 발생하는 오류' + ); + } return plainToInstance(UserProfileDto, myInfo); } @@ -108,7 +115,9 @@ export class UsersService { // 댓글 랜덤 조회(유저 정보 포함) async getRandomCommentUser(requestRandomCommentDto: RequestRandomCommentDto) { - return await this.commentRepository.getRandomCommentUser(requestRandomCommentDto); + return await this.commentRepository.getRandomCommentUser( + requestRandomCommentDto + ); } // 댓글 삭제