Merge branch 'develop' into feature-shared-#211

Author: yewonJin

.github/workflows/develop.yml

@@ -0,0 +1,105 @@
+name: Create Directory on Remote Server
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  env:
+    runs-on: ubuntu-latest
+
+    steps:
+      # 코드 체크아웃
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      # .env 파일 생성 후 붙여넣기
+      - name: Create .env file
+        run: |
+          echo "${{secrets.DEVELOPMENT_ENV}}" > ./.env
+
+      # sh 실행
+      - name: Connect to Remote Server and Run Commands
+        env:
+          REMOTE_HOST: ${{ secrets.REMOTE_DEV_IP }}
+          REMOTE_USER: ${{ secrets.REMOTE_USER }}
+          SSH_KEY: ${{ secrets.REMOTE_PRIVATE_KEY }}
+          BRANCH_NAME: "develop"
+        run: |
+          mkdir ~/.ssh
+          echo "$SSH_KEY" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          ssh -o StrictHostKeyChecking=no $REMOTE_USER@$REMOTE_HOST << 'EOF'
+            DIR="/home/root/app/octodocs"
+            
+            # Check if directory exists
+            if [ -d "$DIR" ]; then
+                echo "$DIR 디렉토리가 존재합니다. 최신 버전으로 업데이트 중..."
+                cd "$DIR"
+                git switch -c develop
+                git pull origin develop
+
+
+            else
+                echo "$DIR 디렉토리가 존재하지 않습니다. 클론 중..."
+                git clone https://github.com/boostcampwm-2024/web15-OctoDocs.git "$DIR"
+                cd "$DIR"
+                git switch -c develop
+                git pull origin develop
+            fi
+
+
+            # Install dependencies
+            echo "의존성 설치"
+            yarn -v
+            yarn install
+
+            # build
+            yarn build
+
+            # Check and kill existing process
+            EXISTING_PID=$(lsof -ti :3000)
+
+            if [ -n "$EXISTING_PID" ]; then
+                echo "3000 프로세스 종료 중...: $EXISTING_PID"
+                kill -9 "$EXISTING_PID"
+                echo "$EXISTING_PID 프로세스 종료"
+            else
+                echo "실행 중인 프로세스가 없습니다."
+            fi
+            EXISTING_PID=$(lsof -ti :1234)
+
+            if [ -n "$EXISTING_PID" ]; then
+                echo "1234 프로세스 종료 중...: $EXISTING_PID"
+                kill -9 "$EXISTING_PID"
+                echo "$EXISTING_PID 프로세스 종료"
+            else
+                echo "실행 중인 프로세스가 없습니다."
+            fi
+          EOF
+      # .env 파일 전송
+      - name: Copy .env to remote server
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.REMOTE_DEV_IP }}
+          username: ${{ secrets.REMOTE_USER }}
+          key: ${{ secrets.REMOTE_PRIVATE_KEY }}
+          source: ./.env
+          target: /home/root/app/octodocs/apps/backend
+      - name: Copy .env to remote server
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.REMOTE_DEV_IP }}
+          username: ${{ secrets.REMOTE_USER }}
+          key: ${{ secrets.REMOTE_PRIVATE_KEY }}
+          source: ./.env
+          target: /home/root/app/octodocs/apps/frontend
+
+      # yarn start
+      - name: yarn start
+        env:
+          REMOTE_HOST: ${{ secrets.REMOTE_DEV_IP }}
+          REMOTE_USER: ${{ secrets.REMOTE_USER }}
+          SSH_KEY: ${{ secrets.REMOTE_PRIVATE_KEY }}
+        run: |
+          ssh -o StrictHostKeyChecking=no $REMOTE_USER@$REMOTE_HOST "nohup node /home/root/app/octodocs/apps/backend/dist/main.js > nohup.out 2> nohup.err < /dev/null &"

.github/workflows/main.yml

@@ -2,7 +2,7 @@ name: Create Directory on Remote Server
 on:
   push:
     branches:
-      - develop
+      - main
 
 jobs:
   env:
@@ -16,15 +16,15 @@ jobs:
       # .env 파일 생성 후 붙여넣기
       - name: Create .env file
         run: |
-          echo "${{secrets.DEVELOPMENT_ENV}}" > ./.env
+          echo "${{secrets.PRODUCTION_ENV}}" > ./.env
 
       # sh 실행
       - name: Connect to Remote Server and Run Commands
         env:
-          REMOTE_HOST: ${{ secrets.REMOTE_DEV_IP }}
+          REMOTE_HOST: ${{ secrets.REMOTE_PROD_IP }}
           REMOTE_USER: ${{ secrets.REMOTE_USER }}
           SSH_KEY: ${{ secrets.REMOTE_PRIVATE_KEY }}
-          BRANCH_NAME: "develop"
+          BRANCH_NAME: "main"
         run: |
           mkdir ~/.ssh
           echo "$SSH_KEY" > ~/.ssh/id_rsa
@@ -36,16 +36,16 @@ jobs:
             if [ -d "$DIR" ]; then
                 echo "$DIR 디렉토리가 존재합니다. 최신 버전으로 업데이트 중..."
                 cd "$DIR"
-                git switch -c develop
-                git pull origin develop
+                git switch -c main
+                git pull origin main
 
 
             else
                 echo "$DIR 디렉토리가 존재하지 않습니다. 클론 중..."
                 git clone https://github.com/boostcampwm-2024/web15-OctoDocs.git "$DIR"
                 cd "$DIR"
-                git switch -c develop
-                git pull origin develop
+                git switch -c main
+                git pull origin main
             fi
 
 
@@ -61,7 +61,16 @@ jobs:
             EXISTING_PID=$(lsof -ti :3000)
 
             if [ -n "$EXISTING_PID" ]; then
-                echo "프로세스 종료 중...: $EXISTING_PID"
+                echo "3000 프로세스 종료 중...: $EXISTING_PID"
+                kill -9 "$EXISTING_PID"
+                echo "$EXISTING_PID 프로세스 종료"
+            else
+                echo "실행 중인 프로세스가 없습니다."
+            fi
+            EXISTING_PID=$(lsof -ti :1234)
+
+            if [ -n "$EXISTING_PID" ]; then
+                echo "1234 프로세스 종료 중...: $EXISTING_PID"
                 kill -9 "$EXISTING_PID"
                 echo "$EXISTING_PID 프로세스 종료"
             else
@@ -72,24 +81,25 @@ jobs:
       - name: Copy .env to remote server
         uses: appleboy/scp-action@master
         with:
-          host: ${{ secrets.REMOTE_DEV_IP }}
+          host: ${{ secrets.REMOTE_PROD_IP }}
           username: ${{ secrets.REMOTE_USER }}
           key: ${{ secrets.REMOTE_PRIVATE_KEY }}
           source: ./.env
           target: /home/root/app/octodocs/apps/backend
       - name: Copy .env to remote server
         uses: appleboy/scp-action@master
         with:
-          host: ${{ secrets.REMOTE_DEV_IP }}
+          host: ${{ secrets.REMOTE_PROD_IP }}
           username: ${{ secrets.REMOTE_USER }}
           key: ${{ secrets.REMOTE_PRIVATE_KEY }}
           source: ./.env
           target: /home/root/app/octodocs/apps/frontend
+
       # yarn start
       - name: yarn start
         env:
-          REMOTE_HOST: ${{ secrets.REMOTE_DEV_IP }}
+          REMOTE_HOST: ${{ secrets.REMOTE_PROD_IP }}
           REMOTE_USER: ${{ secrets.REMOTE_USER }}
           SSH_KEY: ${{ secrets.REMOTE_PRIVATE_KEY }}
         run: |
-          ssh -o StrictHostKeyChecking=no $REMOTE_USER@$REMOTE_HOST "nohup node /home/root/app/octodocs/apps/backend/dist/main.js > nohup.out 2> nohup.err < /dev/null &"
+          ssh -o StrictHostKeyChecking=no $REMOTE_USER@$REMOTE_HOST "nohup node /home/root/app/octodocs/apps/backend/dist/main.js > nohup.out 2> nohup.err < /dev/null &"

apps/backend/package.json

@@ -25,6 +25,7 @@
     "@nestjs/config": "^3.3.0",
     "@nestjs/core": "^10.0.0",
     "@nestjs/mapped-types": "*",
+    "@nestjs/passport": "^10.0.3",
     "@nestjs/platform-express": "^10.0.0",
     "@nestjs/platform-socket.io": "^10.4.8",
     "@nestjs/platform-ws": "^10.4.7",
@@ -38,6 +39,9 @@
     "lib0": "^0.2.98",
     "node-ts-cache": "^4.4.0",
     "node-ts-cache-storage-memory": "^4.4.0",
+    "passport": "^0.7.0",
+    "passport-kakao": "^1.0.1",
+    "passport-naver": "^1.0.6",
     "path": "^0.12.7",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.1",

apps/backend/src/app.module.ts

@@ -9,10 +9,13 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { Page } from './page/page.entity';
 import { Edge } from './edge/edge.entity';
 import { Node } from './node/node.entity';
+import { User } from './user/user.entity';
 import { YjsModule } from './yjs/yjs.module';
 import * as path from 'path';
 import { ServeStaticModule } from '@nestjs/serve-static';
 import { UploadModule } from './upload/upload.module';
+import { AuthModule } from './auth/auth.module';
+import { UserModule } from './user/user.module';
 
 @Module({
   imports: [
@@ -29,7 +32,7 @@ import { UploadModule } from './upload/upload.module';
       useFactory: (configService: ConfigService) => ({
         type: 'sqlite',
         database: configService.get('DB_NAME'),
-        entities: [Node, Page, Edge],
+        entities: [Node, Page, Edge, User],
         logging: true,
         synchronize: true,
       }),
@@ -39,6 +42,8 @@ import { UploadModule } from './upload/upload.module';
     EdgeModule,
     YjsModule,
     UploadModule,
+    AuthModule,
+    UserModule,
   ],
   controllers: [AppController],
   providers: [AppService],

apps/backend/src/auth/auth.controller.spec.ts

@@ -0,0 +1,25 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { AuthController } from './auth.controller';
+import { AuthService } from './auth.service';
+
+describe('AuthController', () => {
+  let controller: AuthController;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      controllers: [AuthController],
+      providers: [
+        {
+          provide: AuthService,
+          useValue: {},
+        },
+      ],
+    }).compile();
+
+    controller = module.get<AuthController>(AuthController);
+  });
+
+  it('should be defined', () => {
+    expect(controller).toBeDefined();
+  });
+});

apps/backend/src/auth/auth.controller.ts

@@ -0,0 +1,42 @@
+import { Controller, Get, UseGuards, Req } from '@nestjs/common';
+import { AuthGuard } from '@nestjs/passport';
+import { AuthService } from './auth.service';
+
+@Controller('auth')
+export class AuthController {
+  constructor(private readonly authService: AuthService) {}
+
+  @Get('naver')
+  @UseGuards(AuthGuard('naver'))
+  async naverLogin() {
+    // 네이버 로그인 페이지로 리디렉션
+    // Passport가 리디렉션 처리
+  }
+
+  @Get('naver/callback')
+  @UseGuards(AuthGuard('naver'))
+  async naverCallback(@Req() req) {
+    // 네이버 인증 후 사용자 정보 반환
+    return {
+      message: '네이버 로그인 성공',
+      user: req.user,
+    };
+  }
+
+  @Get('kakao')
+  @UseGuards(AuthGuard('kakao'))
+  async kakaoLogin() {
+    // 카카오 로그인 페이지로 리디렉션
+    // Passport가 리디렉션 처리
+  }
+
+  @Get('kakao/callback')
+  @UseGuards(AuthGuard('kakao'))
+  async kakaoCallback(@Req() req) {
+    // 카카오 인증 후 사용자 정보 반환
+    return {
+      message: '카카오 로그인 성공',
+      user: req.user,
+    };
+  }
+}

apps/backend/src/auth/auth.module.ts

@@ -0,0 +1,13 @@
+import { Module } from '@nestjs/common';
+import { UserRepository } from '../user/user.repository';
+import { UserModule } from 'src/user/user.module';
+import { AuthService } from './auth.service';
+import { AuthController } from './auth.controller';
+import { NaverStrategy } from './strategies/naver.strategy';
+import { KakaoStrategy } from './strategies/kakao.strategy';
+@Module({
+  imports: [UserModule],
+  controllers: [AuthController],
+  providers: [AuthService, NaverStrategy, KakaoStrategy, UserRepository],
+})
+export class AuthModule {}

apps/backend/src/auth/auth.service.spec.ts

@@ -0,0 +1,25 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { AuthService } from './auth.service';
+import { UserRepository } from '../user/user.repository';
+
+describe('AuthService', () => {
+  let service: AuthService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        AuthService,
+        {
+          provide: UserRepository,
+          useValue: {},
+        },
+      ],
+    }).compile();
+
+    service = module.get<AuthService>(AuthService);
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});

apps/backend/src/auth/auth.service.ts

@@ -0,0 +1,24 @@
+import { Injectable } from '@nestjs/common';
+import { UserRepository } from '../user/user.repository';
+import { User } from '../user/user.entity';
+import { CreateUserDto } from './dto/createUser.dto';
+
+@Injectable()
+export class AuthService {
+  constructor(private readonly userRepository: UserRepository) {}
+
+  async findUser(dto: CreateUserDto): Promise<User | null> {
+    const { providerId, provider } = dto;
+
+    const user = await this.userRepository.findOne({
+      where: { providerId, provider },
+    });
+
+    return user;
+  }
+
+  async createUser(dto: CreateUserDto): Promise<User> {
+    const user = this.userRepository.create(dto);
+    return this.userRepository.save(user);
+  }
+}