Merge branch 'develop-be-#278' into feature-fe-#270

Author: yewonJin

.dockerignore

@@ -0,0 +1,46 @@
+
+# compiled output
+*/dist
+*/node_modules
+dist
+node_modules
+dist-ssr
+
+# Logs
+logs
+*.log
+npm-debug.log*
+pnpm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# OS
+.DS_Store
+
+# Tests
+/coverage
+/.nyc_output
+
+# IDEs and editors
+/.idea
+.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+db.sqlite

.gitignore

@@ -3,6 +3,9 @@
 .env*
 *.local
 .turbo
+.crt
+.key
+!Dockerfile.local
 
 # compiled output
 */dist
@@ -49,3 +52,5 @@ lerna-debug.log*
 !.vscode/launch.json
 !.vscode/extensions.json
 db.sqlite
+services/nginx/ssl/localhost.crt
+services/nginx/ssl/localhost.key

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "files.associations": {
+        "*.ttml": "xml",
+        "*.ttss": "css"
+    }
+}

apps/backend/package.json

@@ -34,16 +34,17 @@
     "@nestjs/swagger": "^8.0.5",
     "@nestjs/typeorm": "^10.0.2",
     "@nestjs/websockets": "^10.4.8",
+    "@theinternetfolks/snowflake": "^1.3.0",
     "@types/multer": "^1.4.12",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "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",
+    "pg": "^8.13.1",
+    "prosemirror-view": "^1.37.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.1",
     "socket.io": "^4.8.1",

apps/backend/src/app.module.ts

@@ -10,12 +10,16 @@ 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 { Workspace } from './workspace/workspace.entity';
+import { Role } from './role/role.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';
+import { WorkspaceModule } from './workspace/workspace.module';
+import { RoleModule } from './role/role.module';
 
 @Module({
   imports: [
@@ -24,15 +28,19 @@ import { UserModule } from './user/user.module';
     }),
     ConfigModule.forRoot({
       isGlobal: true,
-      envFilePath: path.join(__dirname, '..', '.env'), // * nest 디렉터리 기준
+      envFilePath: path.join(__dirname, '..', '..', '..', '.env'), // * nest 디렉터리 기준
     }),
     TypeOrmModule.forRootAsync({
       imports: [ConfigModule],
       inject: [ConfigService],
       useFactory: (configService: ConfigService) => ({
-        type: 'sqlite',
+        type: 'postgres',
+        host: configService.get('DB_HOST'),
+        port: configService.get('DB_PORT'),
+        username: configService.get('DB_USER'),
+        password: configService.get('DB_PASSWORD'),
         database: configService.get('DB_NAME'),
-        entities: [Node, Page, Edge, User],
+        entities: [Node, Page, Edge, User, Workspace, Role],
         logging: true,
         synchronize: true,
       }),
@@ -44,6 +52,8 @@ import { UserModule } from './user/user.module';
     UploadModule,
     AuthModule,
     UserModule,
+    WorkspaceModule,
+    RoleModule,
   ],
   controllers: [AppController],
   providers: [AppService],

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

@@ -1,22 +1,18 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { AuthController } from './auth.controller';
 import { AuthService } from './auth.service';
-import { JwtService } from '@nestjs/jwt';
-import { InvalidTokenException } from '../exception/invalid.exception';
-// import { LoginRequiredException } from '../exception/login.exception';
+import { JwtAuthGuard } from './guards/jwt-auth.guard';
+import { TokenService } from './token/token.service';
+import { LoginRequiredException } from '../exception/login.exception';
 
-// TODO: 테스트 코드 개선
 describe('AuthController', () => {
   let authController: AuthController;
-  // let authService: AuthService;
-  let jwtService: JwtService;
+  let authService: AuthService;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       controllers: [AuthController],
       providers: [
-        AuthService,
-        JwtService,
         {
           provide: AuthService,
           useValue: {
@@ -26,23 +22,23 @@ describe('AuthController', () => {
           },
         },
         {
-          provide: JwtService,
+          provide: TokenService,
           useValue: {
-            sign: jest.fn().mockReturnValue('test-token'),
-            verify: jest.fn((token: string) => {
-              if (token === 'invalid-token') {
-                throw new InvalidTokenException();
-              }
-              return { sub: 1, provider: 'naver' };
-            }),
+            generateAccessToken: jest.fn(() => 'mockedAccessToken'),
+            generateRefreshToken: jest.fn(() => 'mockedRefreshToken'),
+            refreshAccessToken: jest.fn(() => 'mockedAccessToken'),
           },
         },
       ],
-    }).compile();
+    })
+      .overrideGuard(JwtAuthGuard)
+      .useValue({
+        canActivate: jest.fn(() => true),
+      })
+      .compile();
 
     authController = module.get<AuthController>(AuthController);
-    // authService = module.get<AuthService>(AuthService);
-    jwtService = module.get<JwtService>(JwtService);
+    authService = module.get<AuthService>(AuthService);
   });
 
   it('컨트롤러 클래스가 정상적으로 인스턴스화된다.', () => {
@@ -61,40 +57,13 @@ describe('AuthController', () => {
       });
     });
 
-    // it('JWT 토큰이 유효가지 않은 경우 InvalidTokenException을 throw한다.', async () => {
-    //   const req = {
-    //     headers: { authorization: 'Bearer invalid-token' },
-    //     user: undefined,
-    //   } as any;
-    //   try {
-    //     await authController.getProfile(req);
-    //   } catch (error) {
-    //     expect(error).toBeInstanceOf(InvalidTokenException);
-    //   }
-    // });
-
-    // it('JWT 토큰이 없는 경우 LoginRequiredException을 throw한다.', async () => {
-    //   const req = { headers: {}, user: undefined } as any;
-    //   try {
-    //     await authController.getProfile(req);
-    //   } catch (error) {
-    //     expect(error).toBeInstanceOf(LoginRequiredException);
-    //   }
-    // });
-  });
-
-  describe('refreshAccessToken', () => {
-    it('refresh token이 유효한 경우 access token을 성공적으로 발급한다.', async () => {
-      jest
-        .spyOn(jwtService, 'verify')
-        .mockReturnValue({ sub: 1, provider: 'naver' });
-      const req = { body: { refreshToken: 'valid-refresh-token' } } as any;
-
-      const result = await authController.refreshAccessToken(req);
-      expect(result).toEqual({
-        message: '새로운 Access Token 발급 성공',
-        accessToken: 'test-token',
-      });
+    it('JWT 토큰이 없는 경우 예외를 던진다.', async () => {
+      const req = {} as any;
+      try {
+        authController.getProfile(req);
+      } catch (error) {
+        expect(error).toBeInstanceOf(LoginRequiredException);
+      }
     });
   });
 });

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

@@ -1,14 +1,21 @@
-import { Controller, Get, UseGuards, Req, Post } from '@nestjs/common';
+import { Controller, Get, UseGuards, Req, Res, Post } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
 import { AuthService } from './auth.service';
-import { JwtService } from '@nestjs/jwt';
 import { JwtAuthGuard } from './guards/jwt-auth.guard';
+import { Response } from 'express';
+import { MessageResponseDto } from './dtos/messageResponse.dto';
+import { ApiOperation, ApiResponse } from '@nestjs/swagger';
+import { TokenService } from './token/token.service';
+
+export enum AuthResponseMessage {
+  AUTH_LOGGED_OUT = '로그아웃하였습니다.',
+}
 
 @Controller('auth')
 export class AuthController {
   constructor(
     private readonly authService: AuthService,
-    private readonly jwtService: JwtService,
+    private readonly tokenService: TokenService,
   ) {}
 
   @Get('naver')
@@ -20,19 +27,21 @@ export class AuthController {
 
   @Get('naver/callback')
   @UseGuards(AuthGuard('naver'))
-  async naverCallback(@Req() req) {
+  async naverCallback(@Req() req, @Res() res: Response) {
     // 네이버 인증 후 사용자 정보 반환
     const user = req.user;
-    // TODO: 후에 권한 (workspace 조회, 편집 기능)도 payload에 추가
-    const payload = { sub: user.id, provider: user.provider };
-    const accessToken = this.jwtService.sign(payload, { expiresIn: '1h' });
-    const refreshToken = this.jwtService.sign(payload, { expiresIn: '7d' });
-    return {
-      message: '네이버 로그인 성공',
-      user,
-      accessToken,
-      refreshToken,
-    };
+
+    // primary Key인 id 포함 payload 생성함
+    // TODO: 여기서 권한 추가해야함
+    const payload = { sub: user.id };
+    const accessToken = this.tokenService.generateAccessToken(payload);
+    const refreshToken = this.tokenService.generateRefreshToken(payload);
+
+    // 토큰을 쿠키에 담아서 메인 페이지로 리디렉션
+    this.tokenService.setAccessTokenCookie(res, accessToken);
+    this.tokenService.setRefreshTokenCookie(res, refreshToken);
+
+    res.redirect(302, '/');
   }
 
   @Get('kakao')
@@ -44,34 +53,32 @@ export class AuthController {
 
   @Get('kakao/callback')
   @UseGuards(AuthGuard('kakao'))
-  async kakaoCallback(@Req() req) {
-    // 카카오 인증 후 사용자 정보 반환
+  async kakaoCallback(@Req() req, @Res() res: Response) {
+    /// 카카오 인증 후 사용자 정보 반환
     const user = req.user;
-    // TODO: 후에 권한 (workspace 조회, 편집 기능)도 payload에 추가
-    const payload = { sub: user.id, provider: user.provider };
-    const accessToken = this.jwtService.sign(payload, { expiresIn: '1h' });
-    const refreshToken = this.jwtService.sign(payload, { expiresIn: '7d' });
-    return {
-      message: '카카오 로그인 성공',
-      user,
-      accessToken,
-      refreshToken,
-    };
-  }
 
-  @Post('refresh')
-  async refreshAccessToken(@Req() req) {
-    const { refreshToken } = req.body;
+    // primary Key인 id 포함 payload 생성함
+    // TODO: 여기서 권한 추가해야함
+    const payload = { sub: user.id };
+    const accessToken = this.tokenService.generateAccessToken(payload);
+    const refreshToken = this.tokenService.generateRefreshToken(payload);
 
-    const decoded = this.jwtService.verify(refreshToken, {
-      secret: process.env.JWT_SECRET,
+    // 토큰을 쿠키에 담아서 메인 페이지로 리디렉션
+    this.tokenService.setAccessTokenCookie(res, accessToken);
+    this.tokenService.setRefreshTokenCookie(res, refreshToken);
+
+    res.redirect(302, '/');
+  }
+
+  @ApiResponse({ type: MessageResponseDto })
+  @ApiOperation({ summary: '사용자가 로그아웃합니다.' })
+  @Post('logout')
+  logout(@Res() res: Response) {
+    // 쿠키 삭제 (옵션이 일치해야 삭제됨)
+    this.tokenService.clearCookies(res);
+    return res.status(200).json({
+      message: AuthResponseMessage.AUTH_LOGGED_OUT,
     });
-    const payload = { sub: decoded.sub, provider: decoded.provider };
-    const newAccessToken = this.jwtService.sign(payload, { expiresIn: '1h' });
-    return {
-      message: '새로운 Access Token 발급 성공',
-      accessToken: newAccessToken,
-    };
   }
 
   // Example: 로그인한 사용자만 접근할 수 있는 엔드포인트

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

@@ -5,22 +5,11 @@ import { AuthService } from './auth.service';
 import { AuthController } from './auth.controller';
 import { NaverStrategy } from './strategies/naver.strategy';
 import { KakaoStrategy } from './strategies/kakao.strategy';
-import { JwtModule } from '@nestjs/jwt';
 import { JwtAuthGuard } from './guards/jwt-auth.guard';
-import { ConfigModule, ConfigService } from '@nestjs/config';
+import { TokenModule } from './token/token.module';
 
 @Module({
-  imports: [
-    UserModule,
-    ConfigModule.forRoot({ isGlobal: true }),
-    JwtModule.registerAsync({
-      imports: [ConfigModule],
-      inject: [ConfigService],
-      useFactory: async (configService: ConfigService) => ({
-        secret: configService.get<string>('JWT_SECRET'),
-      }),
-    }),
-  ],
+  imports: [UserModule, TokenModule],
   controllers: [AuthController],
   providers: [
     AuthService,

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

@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { AuthService } from './auth.service';
 import { UserRepository } from '../user/user.repository';
-import { SignUpDto } from './dto/signUp.dto';
+import { SignUpDto } from './dtos/signUp.dto';
 import { User } from '../user/user.entity';
 
 describe('AuthService', () => {