Merge pull request #238 from tmddus2/feature/231117-login

Refactor: ResponseDto 추가 및 코드컨벤션 적용
boostcampwm2023 · Dec 9, 2023 · c098181 · c098181
2 parents 00b2d50 + 721d5e3
commit c098181
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/backend/src/auth/auth.controller.ts b/backend/src/auth/auth.controller.ts
@@ -1,10 +1,11 @@
 import { Body, Controller, Get, HttpException, HttpStatus, Post, Req, Res, UseGuards } from '@nestjs/common';
-import { ApiBody, ApiResponse, ApiTags } from '@nestjs/swagger';
+import { ApiBody, ApiHeader, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { Response } from 'express';
 import { CustomAuthGuard } from './auth.guard';
 import { AuthService } from './auth.service';
-import { SignInDto } from './dto/auth.signin.dto';
-import { SignUpDto } from './dto/auth.signup.dto';
+import { ResponseSignInDto } from './dto/response-signin.dto';
+import { SignInDto } from './dto/sign-in.dto';
+import { SignUpDto } from './dto/sign-up.dto';
 
 @ApiTags('auth')
 @Controller('auth')
@@ -25,17 +26,18 @@ export class AuthController {
 
   @Post('/signin')
   @ApiBody({ type: SignInDto })
-  @ApiResponse({ status: 200 })
+  @ApiResponse({ status: 200, type: ResponseSignInDto })
   @ApiResponse({ status: 404, description: '해당 사용자가 없습니다.' })
   async signIn(@Body() signInDto: SignInDto, @Res() res: Response) {
     const user = this.authService.findUserByEmail(signInDto.email);
     if (!user) {
       throw new HttpException('해당 사용자가 없습니다.', HttpStatus.NOT_FOUND);
     }
     const result = await this.authService.signIn(signInDto);
-    return res.status(HttpStatus.OK).send({ token: result });
+    return res.status(HttpStatus.OK).send(new ResponseSignInDto(result));
   }
 
+  @ApiHeader({ name: 'Authorization' })
   @UseGuards(CustomAuthGuard)
   @Get('profile')
   getProfile(@Req() req: any) {

diff --git a/backend/src/auth/auth.service.ts b/backend/src/auth/auth.service.ts
@@ -3,10 +3,10 @@ import { JwtService } from '@nestjs/jwt';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import { User } from 'src/user/user.schema';
-import { SignUpDto } from './dto/auth.signup.dto';
-import { SignInDto } from './dto/auth.signin.dto';
 import { ConfigService } from '@nestjs/config';
 import { decryptPassword, encryptPassword } from 'src/utils/GenerateUtils';
+import { SignUpDto } from './dto/sign-up.dto';
+import { SignInDto } from './dto/sign-in.dto';
 
 @Injectable()
 export class AuthService {

diff --git a/backend/src/auth/dto/response-signin.dto.ts b/backend/src/auth/dto/response-signin.dto.ts
@@ -0,0 +1,10 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+export class ResponseSignInDto {
+  @ApiProperty()
+  token: string;
+
+  constructor(token: string) {
+    this.token = token;
+  }
+}
diff --git a/backend/src/auth/dto/auth.signin.dto.ts → backend/src/auth/dto/sign-in.dto.ts b/backend/src/auth/dto/auth.signin.dto.ts → backend/src/auth/dto/sign-in.dto.ts
diff --git a/backend/src/auth/dto/auth.signup.dto.ts → backend/src/auth/dto/sign-up.dto.ts b/backend/src/auth/dto/auth.signup.dto.ts → backend/src/auth/dto/sign-up.dto.ts
diff --git a/backend/src/user/dto/user.update.dto.ts → backend/src/user/dto/update-user.dto.ts b/backend/src/user/dto/user.update.dto.ts → backend/src/user/dto/update-user.dto.ts
diff --git a/backend/src/user/user.controller.ts b/backend/src/user/user.controller.ts
@@ -2,9 +2,9 @@ import { Body, Controller, Get, HttpException, HttpStatus, Post, Req, Res, UseGu
 import { Response } from 'express';
 import { UserService } from './user.service';
 import { UserInfoDto } from '../auth/dto/userInfo.dto';
-import { UserUpdateDto } from './dto/user.update.dto';
 import { ApiBody, ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { CustomAuthGuard } from 'src/auth/auth.guard';
+import { UserUpdateDto } from './dto/update-user.dto';
 
 @ApiTags('profile')
 @Controller('/profile')