V1.2.0

.github/workflows/deployment.yml

@@ -0,0 +1,42 @@
+name: Deployment
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  funch-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: funch server deploy
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.FUNCH_SSH_KEY }}
+          SERVER_HOST: ${{ secrets.FUNCH_HOST }}
+          SERVER_USER: ${{ secrets.FUNCH_USER }}
+        run: |
+          echo "${FUNCH_SSH_KEY}" > deploy_key
+          chmod 600 deploy_key
+          ssh -i deploy_key ${{ secrets.FUNCH_USER }}@${{ secrets.FUNCH_HOST}}
+          cd /root/web25-funch
+          git switch main
+          git pull origin main
+          pm2 reload ecosystem.config.js
+
+  media-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: media server deploy
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.MEDIA_SSH_KEY }}
+          SERVER_HOST: ${{ secrets.MEDIA_HOST }}
+          SERVER_USER: ${{ secrets.MEDIA_USER }}
+        run: |
+          echo "${MEDIA_SSH_KEY}" > deploy_key
+          chmod 600 deploy_key
+          ssh -i deploy_key ${{ secrets.MEDIA_USER }}@${{ secrets.MEDIA_HOST}}
+          git switch main
+          cd /service/web25-funch
+          git pull origin main
+          cd mediaServer
+          pm2 reload ecosystem.config.js

.github/workflows/integration.yml

@@ -0,0 +1,28 @@
+name: Integration
+
+on:
+  pull_request:
+    branches:
+      - dev
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22.11.0
+          cache: npm
+      - name: application server test
+        run: |
+          cd applicationServer
+          npm install
+          npm test
+
+      - name: client test
+        run: |
+          cd client
+          npm install
+          npm test

.gitignore

@@ -1,8 +1,8 @@
 node_modules/
-.github
 .env
 .gitmessage.txt
 logs/
+.github/
 
 # client
 .env*

README.md

@@ -30,3 +30,28 @@
 </div>
 
 <br><br>
+
+## 👩🏻‍💻🧑🏻‍💻 기술 스택
+
+<br>
+
+
+### 공통
+<img src="https://firebasestorage.googleapis.com/v0/b/stackticon-81399.appspot.com/o/images%2F1732786637665?alt=media&token=d070c4d4-5a58-4e23-af1d-a7e678d4035b" alt="" />
+
+### FE
+<img src="https://firebasestorage.googleapis.com/v0/b/stackticon-81399.appspot.com/o/images%2F1732798743094?alt=media&token=d5b7a4d0-af68-4e54-bc3a-ba25d35a1af1)](https://github.com/msdio/stackticon" alt="" />
+
+### BE
+<img src="https://firebasestorage.googleapis.com/v0/b/stackticon-81399.appspot.com/o/images%2F1732804776477?alt=media&token=24f661e1-d9b7-4441-bb1a-640cb838c7b0" alt="" />
+
+<br><br>
+
+
+## 👩🏻‍💻🧑🏻‍💻 인프라
+
+<br>
+
+![image](https://github.com/user-attachments/assets/8fb4260a-714d-49f7-8057-93d47da0bdb7)
+
+

applicationServer/package.json

@@ -69,8 +69,10 @@
       "^@member/(.*)$": "<rootDir>/src/member/$1",
       "^@auth/(.*)$": "<rootDir>/src/auth/core/$1",
       "^@github/(.*)$": "<rootDir>/src/auth/github/$1",
+      "^@naver/(.*)$": "<rootDir>/src/auth/naver/$1",
       "^@cookie/(.*)$": "<rootDir>/src/auth/cookie/$1",
-      "^@authUtil/(.*)$": "<rootDir>/src/auth/util/$1"
+      "^@authUtil/(.*)$": "<rootDir>/src/auth/util/$1",
+      "^@follow/(.*)$": "<rootDir>/src/follow/$1"
     }
   }
 }

applicationServer/src/app.module.ts

@@ -5,11 +5,14 @@ import { MemberModule } from '@member/member.module';
 import { LiveModule } from '@live/live.module';
 import { GithubAuthModule } from '@github/github.module';
 import { AuthModule } from '@auth/auth.module';
+import { FollowModule } from '@follow/follow.module';
+import { NaverAuthModule } from '@naver/naver.module';
+import { GoogleAuthModule } from '@google/google.module';
 
 dotenv.config();
 
 @Module({
-  imports: [MemberModule, GithubAuthModule, AuthModule, LiveModule],
+  imports: [MemberModule, GithubAuthModule, AuthModule, LiveModule, FollowModule, NaverAuthModule, GoogleAuthModule],
 })
 export class AppModule implements NestModule {
   configure(consumer: MiddlewareConsumer) {

applicationServer/src/auth/core/auth.guard.ts

@@ -11,6 +11,7 @@ class NoNeedLoginGuard implements CanActivate {
     const request = context.switchToHttp().getRequest();
     const accessToken = request.headers['authorization']?.split(' ')[1];
 
+    if (accessToken == 'null') return true;
     if (accessToken && this.authService.verifyToken(accessToken)) {
       throw new HttpException('이미 로그인이 되어있습니다.', HttpStatus.BAD_REQUEST);
     }

applicationServer/src/auth/core/auth.service.ts

@@ -16,6 +16,7 @@ class AuthService {
   }
 
   verifyToken(token: string) {
+    if (!token) return false;
     try {
       return this.jwtService.verify(token);
     } catch (error) {

applicationServer/src/auth/github/github.controller.ts

@@ -22,7 +22,7 @@ class GithubAuthController {
     const githubAccessToken = await this.githubAuthService.getAccessToken(code);
     const { id, avatar_url } = await this.githubAuthService.getUserInfo(githubAccessToken);
 
-    const member = await this.findOrRegisterMember(`Github@${id}`, avatar_url);
+    const member = await this.memberService.findOrRegisterMember(`Github@${id}`, avatar_url);
     const accessToken = this.authService.generateAccessToken(member.id);
     const refreshToken = this.authService.generateRefreshToken(member.id);
 
@@ -31,15 +31,6 @@ class GithubAuthController {
 
     return { accessToken, name: member.name, profile_image: member.profile_image, broadcast_id: member.broadcast_id };
   }
-
-  private async findOrRegisterMember(memberId: string, avatar_url: string) {
-    const member = await this.memberService.findOneMemberWithCondition({ id: memberId });
-    if (!member) {
-      const newMember = await this.memberService.register(memberId, avatar_url);
-      return newMember;
-    }
-    return member;
-  }
 }
 
 export { GithubAuthController };

applicationServer/src/auth/github/github.service.ts

@@ -1,6 +1,6 @@
 import { Injectable, HttpException, HttpStatus } from '@nestjs/common';
 import axios from 'axios';
-import { ACCESS_TOKEN_URL, APPLICATION_JSON, RESOURCE_URL } from '@src/constants';
+import { GITHUB_ACCESS_TOKEN_URL, APPLICATION_JSON, GITHUB_RESOURCE_URL } from '@src/constants';
 
 @Injectable()
 class GithubAuthService {
@@ -9,14 +9,18 @@ class GithubAuthService {
   async getAccessToken(code: string): Promise<string> {
     const request = {
       code,
-      client_id: process.env.CLIENT_ID,
-      client_secret: process.env.CLIENT_SECRETS,
+      client_id: process.env.GITHUB_CLIENT_ID,
+      client_secret: process.env.GITHUB_CLIENT_SECRET,
     };
-    const response = await axios.post(ACCESS_TOKEN_URL, request, {
-      headers: {
-        accept: APPLICATION_JSON,
-      },
-    });
+    const response = await axios
+      .post(GITHUB_ACCESS_TOKEN_URL, request, {
+        headers: {
+          accept: APPLICATION_JSON,
+        },
+      })
+      .catch(() => {
+        throw new HttpException('Github AccessToken 가져오기 실패', HttpStatus.UNAUTHORIZED);
+      });
 
     if (response.data.error) {
       throw new HttpException('Github AccessToken 가져오기 실패', HttpStatus.UNAUTHORIZED);
@@ -25,11 +29,15 @@ class GithubAuthService {
   }
 
   async getUserInfo(accessToken: string) {
-    const { data } = await axios.get(RESOURCE_URL, {
-      headers: {
-        Authorization: `token ${accessToken}`,
-      },
-    });
+    const { data } = await axios
+      .get(GITHUB_RESOURCE_URL, {
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+        },
+      })
+      .catch(() => {
+        throw new HttpException('Github 유저 정보 가져오기 실패', HttpStatus.FAILED_DEPENDENCY);
+      });
 
     return data;
   }

applicationServer/src/auth/google/google.controller.ts

@@ -0,0 +1,36 @@
+import { Controller, Post, Body, Res, UseGuards } from '@nestjs/common';
+import { Response } from 'express';
+import { MemberService } from '@src/member/member.service';
+import { GoogleAuthService } from '@google/google.service';
+import { AuthService } from '@auth/auth.service';
+import { CookieService } from '@cookie/cookie.service';
+import { NoNeedLoginGuard } from '@auth/auth.guard';
+import { REFRESH_TOKEN } from '@src/constants';
+
+@Controller('auth/google')
+class GoogleAuthController {
+  constructor(
+    private readonly googleAuthService: GoogleAuthService,
+    private readonly memberService: MemberService,
+    private readonly authService: AuthService,
+    private readonly cookieService: CookieService,
+  ) {}
+
+  @Post('/callback')
+  @UseGuards(NoNeedLoginGuard)
+  async getAccessToken(@Body('code') code: string, @Res({ passthrough: true }) res: Response) {
+    const googleAccessToken = await this.googleAuthService.getAccessToken(decodeURIComponent(code));
+    const { id, picture } = await this.googleAuthService.getUserInfo(googleAccessToken);
+
+    const member = await this.memberService.findOrRegisterMember(`Google@${id}`, picture);
+    const accessToken = this.authService.generateAccessToken(member.id);
+    const refreshToken = this.authService.generateRefreshToken(member.id);
+
+    this.authService.saveRefreshToken(member.id, refreshToken);
+    this.cookieService.setCookie(res, REFRESH_TOKEN, refreshToken);
+
+    return { accessToken, name: member.name, profile_image: member.profile_image, broadcast_id: member.broadcast_id };
+  }
+}
+
+export { GoogleAuthController };

applicationServer/src/auth/google/google.module.ts

@@ -0,0 +1,14 @@
+import { Module } from '@nestjs/common';
+import { GoogleAuthController } from '@google/google.controller';
+import { GoogleAuthService } from '@google/google.service';
+import { DatabaseModule } from '@src/database/database.module';
+import { MemberModule } from '@src/member/member.module';
+import { AuthModule } from '@auth/auth.module';
+import { CookieModule } from '@cookie/cookie.module';
+
+@Module({
+  imports: [DatabaseModule, MemberModule, AuthModule, CookieModule],
+  controllers: [GoogleAuthController],
+  providers: [GoogleAuthService],
+})
+export class GoogleAuthModule {}

applicationServer/src/auth/google/google.service.ts

@@ -0,0 +1,48 @@
+import { Injectable, HttpException, HttpStatus } from '@nestjs/common';
+import axios from 'axios';
+import { AUTHORIZATION_CODE, GOOGLE_ACCESS_TOKEN_URL, APPLICATION_JSON, GOOGLE_RESOURCE_URL } from '@src/constants';
+
+@Injectable()
+class GoogleAuthService {
+  constructor() {}
+
+  async getAccessToken(code: string): Promise<string> {
+    const request = {
+      code,
+      client_id: process.env.GOOGLE_CLIENT_ID,
+      client_secret: process.env.GOOGLE_CLIENT_SECRET,
+      redirect_uri: process.env.GOOGLE_REDIRECT_URL,
+      grant_type: AUTHORIZATION_CODE,
+    };
+
+    const response = await axios
+      .post(GOOGLE_ACCESS_TOKEN_URL, request, {
+        headers: {
+          accept: APPLICATION_JSON,
+        },
+      })
+      .catch(() => {
+        throw new HttpException('Google AccessToken 가져오기 실패', HttpStatus.UNAUTHORIZED);
+      });
+
+    if (response.data.error) {
+      throw new HttpException('Google AccessToken 가져오기 실패', HttpStatus.UNAUTHORIZED);
+    }
+    return response.data.access_token;
+  }
+
+  async getUserInfo(accessToken: string) {
+    const { data } = await axios
+      .get(GOOGLE_RESOURCE_URL, {
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+        },
+      })
+      .catch(() => {
+        throw new HttpException('Google 유저 정보 가져오기 실패', HttpStatus.FAILED_DEPENDENCY);
+      });
+    return data;
+  }
+}
+
+export { GoogleAuthService };

applicationServer/src/auth/naver/naver.controller.ts

@@ -0,0 +1,39 @@
+import { Controller, Post, Body, Res, UseGuards } from '@nestjs/common';
+import { Response } from 'express';
+import { MemberService } from '@src/member/member.service';
+import { NaverAuthService } from '@naver/naver.service';
+import { AuthService } from '@auth/auth.service';
+import { CookieService } from '@cookie/cookie.service';
+import { NoNeedLoginGuard } from '@auth/auth.guard';
+import { REFRESH_TOKEN } from '@src/constants';
+
+@Controller('auth/naver')
+class NaverAuthController {
+  constructor(
+    private readonly naverAuthService: NaverAuthService,
+    private readonly memberService: MemberService,
+    private readonly authService: AuthService,
+    private readonly cookieService: CookieService,
+  ) {}
+
+  @Post('/callback')
+  @UseGuards(NoNeedLoginGuard)
+  async getAccessToken(
+    @Body('code') code: string,
+    @Body('state') state: string,
+    @Res({ passthrough: true }) res: Response,
+  ) {
+    const naverAccessToken = await this.naverAuthService.getAccessToken(code, state);
+    const { id } = await this.naverAuthService.getUserInfo(naverAccessToken);
+    const member = await this.memberService.findOrRegisterMember(`Naver@${id}`);
+    const accessToken = this.authService.generateAccessToken(member.id);
+    const refreshToken = this.authService.generateRefreshToken(member.id);
+
+    this.authService.saveRefreshToken(member.id, refreshToken);
+    this.cookieService.setCookie(res, REFRESH_TOKEN, refreshToken);
+
+    return { accessToken, name: member.name, profile_image: member.profile_image, broadcast_id: member.broadcast_id };
+  }
+}
+
+export { NaverAuthController };

applicationServer/src/auth/naver/naver.module.ts

@@ -0,0 +1,14 @@
+import { Module } from '@nestjs/common';
+import { NaverAuthController } from '@naver/naver.controller';
+import { NaverAuthService } from '@naver/naver.service';
+import { DatabaseModule } from '@src/database/database.module';
+import { MemberModule } from '@src/member/member.module';
+import { AuthModule } from '@auth/auth.module';
+import { CookieModule } from '@cookie/cookie.module';
+
+@Module({
+  imports: [DatabaseModule, MemberModule, AuthModule, CookieModule],
+  controllers: [NaverAuthController],
+  providers: [NaverAuthService],
+})
+export class NaverAuthModule {}