boostcampwm-2024 · adkm12 · Dec 4, 2024 · Dec 4, 2024 · Dec 4, 2024 · Dec 4, 2024
diff --git a/BE/apps/api-server/src/modules/connection/connection.controller.ts b/BE/apps/api-server/src/modules/connection/connection.controller.ts
@@ -26,7 +26,8 @@ export class ConnectionController {
   @UseGuards(AuthGuard('jwt'))
   async getConnection(@Query() queryDto: ConnectionQueryDto, @User() user: UserDto) {
     const { type, id } = queryDto;
-
+    console.log('type:', type);
+    console.log('id:', id);
     switch (type) {
       case 'connection':
         return await this.connectionService.getConnection(id as string, user.id);

diff --git a/BE/apps/api-server/src/modules/connection/connection.service.ts b/BE/apps/api-server/src/modules/connection/connection.service.ts
@@ -25,7 +25,11 @@ export class ConnectionService {
 
   async createGuestConnection() {
     const connectionId = uuidv4();
-    await this.GeneralRedis.hset(connectionId, { type: 'guest' });
+    await Promise.all([
+      this.GeneralRedis.hset(connectionId, { type: 'guest', aiCount: 0, title: '제목없음' }),
+      this.GeneralRedis.set(`mindmapState:${connectionId}`, JSON.stringify({})),
+      this.GeneralRedis.set(`content:${connectionId}`, ''),
+    ]);
     return { connectionId, role: 'owner' };
   }
 
@@ -39,7 +43,8 @@ export class ConnectionService {
 
   async setConnection(mindmapId: number, userId: number) {
     const role = await this.userService.getRole(userId, mindmapId);
-    if (!role) {
+    this.logger.log(`role: ${role}`);
+    if (role === undefined) {
       throw new ForbiddenException('권한이 없습니다.');
     }
 

diff --git a/BE/apps/api-server/src/modules/user/user.controller.ts b/BE/apps/api-server/src/modules/user/user.controller.ts
@@ -1,4 +1,4 @@
-import { Controller, Get, UseGuards } from '@nestjs/common';
+import { Controller, Get, UnauthorizedException, UseGuards } from '@nestjs/common';
 import { UserService } from './user.service';
 import { AuthGuard } from '@nestjs/passport';
 import { User } from '../../decorators';
@@ -10,6 +10,10 @@ export class UserController {
   @Get('info')
   @UseGuards(AuthGuard('jwt'))
   async getUserInfo(@User() user) {
-    return await this.userService.getUserInfo(user.id);
+    try {
+      return await this.userService.getUserInfo(user.id);
+    } catch {
+      throw new UnauthorizedException();
+    }
   }
 }
diff --git a/client/index.html b/client/index.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="ko">
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/logo.png" />

diff --git a/client/src/api/index.ts b/client/src/api/index.ts
@@ -58,6 +58,8 @@ instance.interceptors.response.use(
             originalRequest.headers["Authorization"] = `Bearer ${newAccessToken.accessToken}`;
             return instance(originalRequest);
           } catch (error) {
+            await signOut();
+            useConnectionStore.getState().logout();
             return Promise.reject(error);
           }
         }

diff --git a/client/src/konva_mindmap/utils/nodeAttrs.ts b/client/src/konva_mindmap/utils/nodeAttrs.ts
@@ -10,7 +10,7 @@ export const TEXT_WIDTH = (depth: number) => NODE_DEFAULT_SIZE * 2 - depth * 18;
 
 //CONNECTED_LINE
 export const CONNECTED_LINE_FROM = (depth: number) => NODE_DEFAULT_SIZE - depth * 7 + 10;
-export const CONNECTED_LINE_TO = (depth: number) => NODE_DEFAULT_SIZE - depth * 7 + 5;
+export const CONNECTED_LINE_TO = (depth: number) => NODE_DEFAULT_SIZE - depth * 7 + 3;
 
 //TEXT
 export const TEXT_FONT_SIZE = 16;

diff --git a/client/src/store/createAuthSlice.ts b/client/src/store/createAuthSlice.ts
@@ -22,6 +22,7 @@ export const createAuthSlice: StateCreator<ConnectionStore, [], [], AuthSlice> =
   logout: () => {
     set({ email: null, name: null, token: "" });
     get().resetOwnedMindMap();
+    location.href = "/";
   },
 
   setUser: (email: string, name: string, id: number) => {

diff --git a/client/src/store/createSharedSlice.ts b/client/src/store/createSharedSlice.ts
@@ -20,6 +20,7 @@ export const createSharedSlice: StateCreator<ConnectionStore, [], [], SharedSlic
       get().token
         ? get().addOwnedMindMap(newMindMapConnectionId)
         : get().addOwnedMindMapForGuest(newMindMapConnectionId);
+      get().connectSocket(newMindMapConnectionId);
       navigate(`/mindmap/${newMindMapConnectionId}?mode=${targetMode}`);
     } catch (error) {
       throw error;

diff --git a/client/src/store/createSocketSlice.ts b/client/src/store/createSocketSlice.ts
@@ -103,7 +103,6 @@ export const createSocketSlice: StateCreator<ConnectionStore, [], [], SocketSlic
       if (socket) socket.disconnect();
       const response = await createMindmap();
       const connectionId = response.data.connectionId;
-      get().connectSocket(connectionId);
       return connectionId;
     } catch (error) {
       throw error;

diff --git a/client/src/utils/formData.ts b/client/src/utils/formData.ts
@@ -1,7 +1,12 @@
 export function audioFormData(file: File, mindmapId: string, connectionId: string) {
   const formData = new FormData();
-  formData.append("aiAudio", file);
+
+  const encodedFileName = encodeURIComponent(file.name);
+  const encodedFile = new File([file], encodedFileName, { type: file.type });
+
+  formData.append("aiAudio", encodedFile);
   formData.append("mindmapId", mindmapId);
   formData.append("connectionId", connectionId);
+
   return formData;
 }