[merge] be-develop 브랜치 내용 main 브랜치에 반영

.github/workflows/deploy.yml

@@ -2,14 +2,14 @@ name: CD
 
 on:
   push:
-    branches: [be-develop, main]
+    branches: [main, be-develop]
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout...
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node
         uses: actions/setup-node@v3
@@ -46,4 +46,4 @@ jobs:
             docker pull traveline/traveline-docker
             docker stop traveline-container || true
             docker rm traveline-container || true
-            docker run -e DB_HOST=${{ secrets.DB_HOST }} -e DB_PORT=${{ secrets.DB_PORT }} -e DB_USER=${{ secrets.DB_USER }} -e DB_PASSWORD=${{ secrets.DB_PASSWORD }} -e DB_DATABASE=${{ secrets.DB_DATABASE }} -e NCP_ACCESS_KEY_ID=${{ secrets.NCP_ACCESS_KEY_ID }} -e NCP_SECRET_ACCESS_KEY=${{ secrets.NCP_SECRET_ACCESS_KEY }} -e NCP_REGION=${{ secrets.NCP_REGION }} -e JWT_SECRET_ACCESS=${{ secrets.JWT_SECRET_ACCESS }} -e JWT_SECRET_REFRESH=${{ secrets.JWT_SECRET_REFRESH }} -e CLIENT_ID=${{ secrets.CLIENT_ID }} -e TEAM_ID=${{ secrets.TEAM_ID }} -e KEY_ID=${{ secrets.KEY_ID }} -e AUTH_KEY_LINE1=${{ secrets.AUTH_KEY_LINE1 }} -e AUTH_KEY_LINE2=${{ secrets.AUTH_KEY_LINE2 }} -e AUTH_KEY_LINE3=${{ secrets.AUTH_KEY_LINE3 }} -e AUTH_KEY_LINE4=${{ secrets.AUTH_KEY_LINE4 }} -e KAKAO_REST_API_KEY=${{ secrets.KAKAO_REST_API_KEY }} -e X_NCP_APIGW_API_KEY_ID=${{ secrets.X_NCP_APIGW_API_KEY_ID }} -e X_NCP_APIGW_API_KEY=${{ secrets.X_NCP_APIGW_API_KEY }} -e AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} -e AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} -e AWS_REGION=${{ secrets.AWS_REGION }} -e GREENEYE_SECRET_KEY=${{ secrets.GREENEYE_SECRET_KEY }} -e GREENEYE_DOMAIN_ID=${{ secrets.GREENEYE_DOMAIN_ID }} -e GREENEYE_SIGNATURE=${{ secrets.GREENEYE_SIGNATURE }} -d -p ${{secrets.EXTERNAL_PORT}}:${{secrets.INTERNAL_PORT}} --name traveline-container traveline/traveline-docker
+            docker run -e DB_HOST=${{ secrets.DB_HOST }} -e DB_PORT=${{ secrets.DB_PORT }} -e DB_USER=${{ secrets.DB_USER }} -e DB_PASSWORD=${{ secrets.DB_PASSWORD }} -e DB_DATABASE=${{ secrets.DB_DATABASE }} -e NCP_ACCESS_KEY_ID=${{ secrets.NCP_ACCESS_KEY_ID }} -e NCP_SECRET_ACCESS_KEY=${{ secrets.NCP_SECRET_ACCESS_KEY }} -e NCP_REGION=${{ secrets.NCP_REGION }} -e JWT_SECRET_ACCESS=${{ secrets.JWT_SECRET_ACCESS }} -e JWT_SECRET_REFRESH=${{ secrets.JWT_SECRET_REFRESH }} -e CLIENT_ID=${{ secrets.CLIENT_ID }} -e TEAM_ID=${{ secrets.TEAM_ID }} -e KEY_ID=${{ secrets.KEY_ID }} -e AUTH_KEY_LINE1=${{ secrets.AUTH_KEY_LINE1 }} -e AUTH_KEY_LINE2=${{ secrets.AUTH_KEY_LINE2 }} -e AUTH_KEY_LINE3=${{ secrets.AUTH_KEY_LINE3 }} -e AUTH_KEY_LINE4=${{ secrets.AUTH_KEY_LINE4 }} -e KAKAO_REST_API_KEY=${{ secrets.KAKAO_REST_API_KEY }} -e AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} -e AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} -e AWS_REGION=${{ secrets.AWS_REGION }} -e GREENEYE_SECRET_KEY=${{ secrets.GREENEYE_SECRET_KEY }} -e GREENEYE_DOMAIN_ID=${{ secrets.GREENEYE_DOMAIN_ID }} -e GREENEYE_SIGNATURE=${{ secrets.GREENEYE_SIGNATURE }} -d -p ${{secrets.EXTERNAL_PORT}}:${{secrets.INTERNAL_PORT}} --name traveline-container traveline/traveline-docker

BE/src/app.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, Get, Param, Render, Res } from '@nestjs/common';
+import { Controller, Get, Param, Res } from '@nestjs/common';
 import { AppService } from './app.service';
 
 @Controller()
@@ -16,9 +16,10 @@ export class AppController {
     response.redirect(url);
   }
 
-  @Get('ip-process-result')
-  @Render('ip-process-result.ejs')
-  ipProcessResult() {
-    return {};
-  }
+  // 추후 수정 예정
+  // @Get('ip-process-result')
+  // @Render('ip-process-result.ejs')
+  // ipProcessResult() {
+  //   return {};
+  // }
 }

BE/src/auth/auth.controller.ts

@@ -6,17 +6,20 @@ import {
   Get,
   Req,
   UseGuards,
-  Query,
-  ParseBoolPipe,
-  Res,
+  Param,
 } from '@nestjs/common';
 import { AuthService } from './auth.service';
-import { ApiOkResponse, ApiOperation, ApiTags } from '@nestjs/swagger';
-import { CreateAuthRequestDto } from './dto/create-auth-request.dto';
+import {
+  ApiOkResponse,
+  ApiOperation,
+  ApiParam,
+  ApiTags,
+} from '@nestjs/swagger';
 import { CreateAuthRequestForDevDto } from './dto/create-auth-request-for-dev.dto';
-import { DeleteAuthDto } from './dto/delete-auth.dto';
 import { AuthGuard } from './auth.guard';
 import { login, refresh, withdrawal } from './auth.swagger';
+import { SocialLoginRequestDto } from 'src/socialLogin/dto/social-login-request.dto';
+import { SocialWithdrawRequestDto } from 'src/socialLogin/dto/social-withdraw-request.dto';
 
 @Controller('auth')
 @ApiTags('Auth API')
@@ -30,18 +33,8 @@ export class AuthController {
   })
   @ApiOkResponse({ description: 'OK', schema: { example: refresh } })
   refresh(@Req() request) {
-    return this.authService.refresh(request);
-  }
-
-  @Post('login')
-  @ApiOperation({
-    summary: '로그인 또는 회원가입 API',
-    description:
-      '전달받은 idToken 내의 회원 정보를 확인하고 존재하는 회원이면 로그인을, 존재하지 않는 회원이면 회원가입을 진행합니다.',
-  })
-  @ApiOkResponse({ description: 'OK', schema: { example: login } })
-  login(@Req() request, @Body() createAuthDto: CreateAuthRequestDto) {
-    return this.authService.login(request, createAuthDto);
+    const headerMap: Map<string, string> = this.makeHeaderMap(request);
+    return this.authService.refresh(headerMap);
   }
 
   @Post('login/dev')
@@ -57,8 +50,34 @@ export class AuthController {
     return this.authService.loginForDev(createAuthForDevDto);
   }
 
+  @Post('login/:social')
+  @ApiParam({
+    name: 'social',
+    enum: ['apple', 'kakao'],
+    description: '소셜 로그인 종류',
+  })
+  @ApiOperation({
+    summary: '로그인 또는 회원가입 API',
+    description:
+      '전달받은 idToken 내의 회원 정보를 확인하고 존재하는 회원이면 로그인을, 존재하지 않는 회원이면 회원가입을 진행합니다.',
+  })
+  @ApiOkResponse({ description: 'OK', schema: { example: login } })
+  socialLogin(
+    @Req() request,
+    @Param('social') social: string,
+    @Body() socialLoginRequestDto: SocialLoginRequestDto
+  ) {
+    const headerMap: Map<string, string> = this.makeHeaderMap(request);
+    return this.authService.login(social, headerMap, socialLoginRequestDto);
+  }
+
   @UseGuards(AuthGuard)
-  @Delete('withdrawal')
+  @Delete('withdraw/:social')
+  @ApiParam({
+    name: 'social',
+    enum: ['apple', 'kakao'],
+    description: '소셜 로그인 종류',
+  })
   @ApiOperation({
     summary: '탈퇴 API',
     description:
@@ -68,19 +87,55 @@ export class AuthController {
     description: 'OK',
     schema: { example: withdrawal },
   })
-  withdrawal(@Req() request, @Body() deleteAuthDto: DeleteAuthDto) {
-    return this.authService.withdrawal(request, deleteAuthDto);
+  socialWithdraw(
+    @Req() request,
+    @Param('social') social: string,
+    @Body() socialWithdrawRequestDto: SocialWithdrawRequestDto
+  ) {
+    const userId = request['user'].id;
+    return this.authService.withdraw(social, userId, socialWithdrawRequestDto);
   }
 
-  @Get('ip')
-  async manageIp(
-    @Res() response,
-    @Query('id') id: string,
-    @Query('ip') ip: string,
-    @Query('allow', ParseBoolPipe) allow: boolean
-  ) {
-    if (await this.authService.manageIp(id, ip, allow)) {
-      response.redirect('/ip-process-result');
-    }
+  private makeHeaderMap(request): Map<string, string> {
+    return Object.keys(request.headers).reduce((m, key) => {
+      m.set(key, request.headers[key]);
+      return m;
+    }, new Map<string, string>());
   }
+
+  // @UseGuards(AuthGuard)
+  // @Delete('withdrawal')
+  // @ApiOperation({
+  //   summary: '탈퇴 API',
+  //   description:
+  //     '전달받은 idToken과 authorizationCode를 이용해 탈퇴를 진행합니다.',
+  // })
+  // @ApiOkResponse({
+  //   description: 'OK',
+  //   schema: { example: withdrawal },
+  // })
+  // withdrawal(
+  //   @Req() request,
+  //   @Body() socialWithdrawRequestDto: SocialWithdrawRequestDto
+  // ) {
+  //   const userId = request['user'].id;
+  //   return this.authService.withdrawalApple(
+  //     'apple',
+  //     userId,
+  //     socialWithdrawRequestDto
+  //   );
+  // }
+
+  // 추후 수정 예정
+  // @Get('ip')
+  // async manageIp(
+  //   @Res() response,
+  //   @Query('id') id: string,
+  //   @Query('ip') ip: string,
+  //   @Query('allow', ParseBoolPipe) allow: boolean
+  // ) {
+  //   if (await this.authService.manageIp(id, ip, allow)) {
+  //     response.redirect('/ip-process-result');
+  //   }
+  // }
 }

BE/src/auth/auth.module.ts

@@ -7,10 +7,19 @@ import { StorageService } from 'src/storage/storage.service';
 import { HttpModule } from '@nestjs/axios';
 import { AuthGuard } from './auth.guard';
 import { EmailModule } from 'src/email/email.module';
+import { KakaoLoginStrategy } from 'src/socialLogin/kakao-login-strategy';
+import { AppleLoginStrategy } from 'src/socialLogin/apple-login-strategy';
 
 @Module({
   imports: [UsersModule, HttpModule, EmailModule],
   controllers: [AuthController],
-  providers: [AuthService, UsersService, StorageService, AuthGuard],
+  providers: [
+    AuthService,
+    UsersService,
+    StorageService,
+    AuthGuard,
+    KakaoLoginStrategy,
+    AppleLoginStrategy,
+  ],
 })
 export class AuthModule {}