From 5db6966fe27b8e9e503d7f758f1a0f98c8cdd468 Mon Sep 17 00:00:00 2001 From: jupi Date: Sat, 20 Jul 2024 18:27:16 +0900 Subject: [PATCH 1/4] =?UTF-8?q?:green=5Fheart:=20[Chore]=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EA=B5=AC=ED=98=84=EC=99=84=EB=A3=8C?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EA=B0=9C=EB=B0=9C=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EC=9D=98=20x-my-id=20=EA=B2=80=EC=A6=9D=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/libs/api/client.ts | 3 +-- frontend/src/libs/api/socket.ts | 19 +++++-------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/frontend/src/libs/api/client.ts b/frontend/src/libs/api/client.ts index d8fe6d38..7eff5f2e 100644 --- a/frontend/src/libs/api/client.ts +++ b/frontend/src/libs/api/client.ts @@ -2,9 +2,8 @@ import axios, { AxiosError, AxiosResponse } from 'axios'; import { getAccessToken } from './auth'; const createAxiosInstance = () => { - const isDev = import.meta.env.MODE === 'development'; const token = getAccessToken(); - const headers = isDev ? { 'x-my-id': token ?? '1' } : { Authorization: `Bearer ${token}` }; + const headers = { Authorization: `Bearer ${token}` }; return axios.create({ baseURL: import.meta.env.VITE_API_URL, headers, timeout: 100000, withCredentials: true }); }; diff --git a/frontend/src/libs/api/socket.ts b/frontend/src/libs/api/socket.ts index b3c4e9a9..5fc89e6d 100644 --- a/frontend/src/libs/api/socket.ts +++ b/frontend/src/libs/api/socket.ts @@ -2,22 +2,13 @@ import { io } from 'socket.io-client'; import { getAccessToken } from './auth'; const createSocketInstance = () => { - const isDev = import.meta.env.MODE === 'development'; const token = getAccessToken(); - if (isDev) { - return io(import.meta.env.VITE_BASE_URL, { - autoConnect: false, - extraHeaders: { 'x-my-id': token ?? '1' }, - withCredentials: true, - }); - } else { - return io(import.meta.env.VITE_BASE_URL, { - autoConnect: false, - auth: { token: `${token ?? ''}` }, - withCredentials: true, - }); - } + return io(import.meta.env.VITE_BASE_URL, { + autoConnect: false, + auth: { token: `${token ?? ''}` }, + withCredentials: true, + }); }; export const socket = createSocketInstance(); From f85510ec68c2762a6bde99520602a4bea64290db Mon Sep 17 00:00:00 2001 From: jupi Date: Sat, 20 Jul 2024 18:27:34 +0900 Subject: [PATCH 2/4] =?UTF-8?q?:green=5Fheart:=20[Chore]=20=EB=A1=9C?= =?UTF-8?q?=EC=BB=AC=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20=EC=8B=A4?= =?UTF-8?q?=ED=96=89=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 package.json diff --git a/package.json b/package.json new file mode 100644 index 00000000..8119efb9 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "name": "ghostpong", + "version": "1.0.0", + "scripts": { + "start": "docker-compose -f ./docker-compose.local.yml up", + "restart": "docker-compose -f ./docker-compose.local.yml up --build", + "stop": "docker-compose down" + }, + "author": "", + "license": "ISC" +} From c0c2a39d2cd496c75d7fb86f7c2103fad434aff7 Mon Sep 17 00:00:00 2001 From: Kimhannah Date: Sat, 20 Jul 2024 18:29:47 +0900 Subject: [PATCH 3/4] =?UTF-8?q?:green=5Fheart:=20[Chore]=20db=20local=20en?= =?UTF-8?q?v=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.local.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.local.yml b/docker-compose.local.yml index bd37b4d9..a06dad41 100644 --- a/docker-compose.local.yml +++ b/docker-compose.local.yml @@ -4,7 +4,7 @@ services: image: postgres:15.3-alpine restart: always env_file: - - ./backend/.env + - ./backend/.env.local volumes: - db_data_local:/var/lib/postgresql/data expose: From 8d0c70250ce27db7b9937253f6fbe6285b466927 Mon Sep 17 00:00:00 2001 From: Kimhannah Date: Sat, 20 Jul 2024 18:30:29 +0900 Subject: [PATCH 4/4] =?UTF-8?q?:green=5Fheart:=20[Chore]=20guard=EC=97=90?= =?UTF-8?q?=EC=84=9C=20dev=20=ED=99=98=EA=B2=BD=20=EA=B2=80=EC=A6=9D=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/auth/guard/user.guard.ts | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/backend/src/auth/guard/user.guard.ts b/backend/src/auth/guard/user.guard.ts index 94516953..32b1bf90 100644 --- a/backend/src/auth/guard/user.guard.ts +++ b/backend/src/auth/guard/user.guard.ts @@ -1,7 +1,6 @@ -import { Injectable, ExecutionContext, BadRequestException } from '@nestjs/common'; +import { Injectable, ExecutionContext } from '@nestjs/common'; import { Reflector } from '@nestjs/core'; import { AuthGuard } from '@nestjs/passport'; -import { Request } from 'express'; import { Observable } from 'rxjs'; import { AppConfigService } from '../../config/app/configuration.service'; @@ -13,22 +12,6 @@ export class UserGuard extends AuthGuard('user') { } canActivate(context: ExecutionContext): boolean | Promise | Observable { - const skipUserGuard = this.reflector.get('skipUserGuard', context.getHandler()); - if (skipUserGuard) { - return true; - } - // 개발 환경에서는 토큰 검증을 하지 않음 - if (this.appConfigService.env === 'development') { - const request: Request = context.switchToHttp().getRequest(); - const userId = request.headers['x-my-id']; - if (userId === undefined) { - throw new BadRequestException('x-my-id is undefined'); - } - request.user = { - userId: +userId, - }; - return true; - } return super.canActivate(context); } }