Merge branch 'develop' into feature-fe-#295

Author: djk01281

apps/backend/package.json

@@ -34,6 +34,7 @@
     "@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",
@@ -43,6 +44,7 @@
     "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",
@@ -96,4 +98,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
+}

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: [
@@ -36,7 +40,7 @@ import { UserModule } from './user/user.module';
         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,
       }),
@@ -48,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

@@ -89,11 +89,18 @@ describe('AuthController', () => {
         .spyOn(jwtService, 'verify')
         .mockReturnValue({ sub: 1, provider: 'naver' });
       const req = { body: { refreshToken: 'valid-refresh-token' } } as any;
+      const res = {
+        cookie: jest.fn(),
+        json: jest.fn(),
+      } as any;
 
-      const result = await authController.refreshAccessToken(req);
-      expect(result).toEqual({
+      await authController.refreshAccessToken(req, res);
+      expect(res.cookie).toHaveBeenCalledWith('accessToken', 'test-token', {
+        httpOnly: true,
+        maxAge: 3600000,
+      });
+      expect(res.json).toHaveBeenCalledWith({
         message: '새로운 Access Token 발급 성공',
-        accessToken: 'test-token',
       });
     });
   });

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

@@ -1,8 +1,12 @@
-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';
+
+const HOUR = 60 * 60 * 1000;
+const WEEK = 7 * 24 * 60 * 60 * 1000;
 
 @Controller('auth')
 export class AuthController {
@@ -20,19 +24,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,
-    };
+
+    // 토큰을 쿠키에 담아서 메인 페이지로 리디렉션
+    res.cookie('accessToken', accessToken, { httpOnly: true, maxAge: HOUR });
+    res.cookie('refreshToken', refreshToken, {
+      httpOnly: true,
+      maxAge: WEEK,
+    });
+    res.redirect(302, '/');
   }
 
   @Get('kakao')
@@ -44,34 +50,39 @@ 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,
-    };
+
+    // 토큰을 쿠키에 담아서 메인 페이지로 리디렉션
+    res.cookie('accessToken', accessToken, { httpOnly: true, maxAge: HOUR });
+    res.cookie('refreshToken', refreshToken, {
+      httpOnly: true,
+      maxAge: WEEK,
+    });
+    res.redirect(302, '/');
   }
 
   @Post('refresh')
-  async refreshAccessToken(@Req() req) {
+  async refreshAccessToken(@Req() req, @Res() res: Response) {
     const { refreshToken } = req.body;
 
     const decoded = this.jwtService.verify(refreshToken, {
       secret: process.env.JWT_SECRET,
     });
     const payload = { sub: decoded.sub, provider: decoded.provider };
     const newAccessToken = this.jwtService.sign(payload, { expiresIn: '1h' });
-    return {
+    res.cookie('accessToken', newAccessToken, {
+      httpOnly: true,
+      maxAge: HOUR,
+    });
+    return res.json({
       message: '새로운 Access Token 발급 성공',
-      accessToken: newAccessToken,
-    };
+    });
   }
 
   // Example: 로그인한 사용자만 접근할 수 있는 엔드포인트

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

@@ -21,4 +21,8 @@ export class AuthService {
     const user = this.userRepository.create(dto);
     return this.userRepository.save(user);
   }
+
+  async findUserBySnowflakeId(snowflakeId: string): Promise<User | null> {
+    return await this.userRepository.findOneBy({ snowflakeId });
+  }
 }

apps/backend/src/auth/strategies/naver.strategy.ts

@@ -26,6 +26,6 @@ export class NaverStrategy extends PassportStrategy(Strategy, 'naver') {
     if (!user) {
       user = await this.authService.signUp(createUserDto);
     }
-    return user; // req.user로 반환
+    return user;
   }
 }

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

@@ -83,6 +83,7 @@ describe('EdgeController', () => {
         page: null,
         outgoingEdges: [],
         incomingEdges: [],
+        workspace: null,
       } as Node;
       const node4 = {
         id: 4,
@@ -92,6 +93,7 @@ describe('EdgeController', () => {
         page: null,
         outgoingEdges: [],
         incomingEdges: [],
+        workspace: null,
       } as Node;
       const node5 = {
         id: 5,
@@ -101,6 +103,7 @@ describe('EdgeController', () => {
         page: null,
         outgoingEdges: [],
         incomingEdges: [],
+        workspace: null,
       } as Node;
 
       const expectedEdges = [

apps/backend/src/edge/edge.entity.ts

@@ -7,6 +7,7 @@ import {
   JoinColumn,
 } from 'typeorm';
 import { Node } from '../node/node.entity';
+import { Workspace } from '../workspace/workspace.entity';
 
 @Entity()
 export class Edge {
@@ -21,6 +22,12 @@ export class Edge {
   @JoinColumn({ name: 'to_node_id' })
   toNode: Node;
 
+  @ManyToOne(() => Workspace, (workspace) => workspace.edges, {
+    onDelete: 'CASCADE',
+  })
+  @JoinColumn({ name: 'workspace_id' })
+  workspace: Workspace;
+
   // @Column({ nullable: true })
   // type: string;
 

apps/backend/src/edge/edge.module.ts

@@ -4,7 +4,7 @@ import { EdgeController } from './edge.controller';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { Edge } from './edge.entity';
 import { EdgeRepository } from './edge.repository';
-import { NodeModule } from 'src/node/node.module';
+import { NodeModule } from '../node/node.module';
 
 @Module({
   imports: [TypeOrmModule.forFeature([Edge]), forwardRef(() => NodeModule)],

apps/backend/src/edge/edge.repository.ts

@@ -8,4 +8,11 @@ export class EdgeRepository extends Repository<Edge> {
   constructor(@InjectDataSource() private dataSource: DataSource) {
     super(Edge, dataSource.createEntityManager());
   }
+
+  async findEdgesByWorkspace(workspaceId: number): Promise<Edge[]> {
+    return this.find({
+      where: { workspace: { id: workspaceId } },
+      relations: ['fromNode', 'toNode'],
+    });
+  }
 }