From 5ffa7c1e07ea3d4962bb53c89831c42d472cbfbf Mon Sep 17 00:00:00 2001 From: Minkyu Lee Date: Wed, 27 Dec 2023 01:57:56 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=EB=B0=B0=ED=8F=AC=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A6=88=20=EB=B3=84=20=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +++ .env.production | 3 +++ src/apis/auth.ts | 6 +++--- src/apis/environment.ts | 20 +++++--------------- src/apis/utility.ts | 14 +++++++------- 5 files changed, 21 insertions(+), 25 deletions(-) create mode 100644 .env.development create mode 100644 .env.production diff --git a/.env.development b/.env.development new file mode 100644 index 0000000..e8033f6 --- /dev/null +++ b/.env.development @@ -0,0 +1,3 @@ +VITE_BASE_URL=https://wacruit-dev.wafflestudio.com/api/v1 +VITE_SSO_LOGIN_URL=https://sso-dev.wafflestudio.com +VITE_SSO_REDIRECT_URL=https://wacruit-dev.wafflestudio.com/sso \ No newline at end of file diff --git a/.env.production b/.env.production new file mode 100644 index 0000000..f579a98 --- /dev/null +++ b/.env.production @@ -0,0 +1,3 @@ +VITE_BASE_URL=https://wacruit.wafflestudio.com/api/v1 +VITE_SSO_LOGIN_URL=https://sso.wafflestudio.com +VITE_SSO_REDIRECT_URL=https://wacruit.wafflestudio.com/sso \ No newline at end of file diff --git a/src/apis/auth.ts b/src/apis/auth.ts index f7b515e..9252a31 100644 --- a/src/apis/auth.ts +++ b/src/apis/auth.ts @@ -1,5 +1,5 @@ import Cookies from "js-cookie"; -import { ssoLoginURL, ssoRedirectURI } from "./environment"; +import { SSO_LOGIN_URL, SSO_REDIRECT_URL } from "./environment"; import { getRequest } from "./utility"; const SSO_COOKIE_KEY = "waffle.access-token"; @@ -15,11 +15,11 @@ export const getSsoToken = (): string | null => { }; export const deleteSsoToken = () => { - Cookies.remove(SSO_COOKIE_KEY, { path:"/", domain:".wafflestudio.com" }); + Cookies.remove(SSO_COOKIE_KEY, { path: "/", domain: ".wafflestudio.com" }); }; export const tryLogin = (recruit_id: number | "home") => { - location.href = `${ssoLoginURL}${ssoRedirectURI(recruit_id)}`; + location.href = `${SSO_LOGIN_URL}/?redirect_uri=${SSO_REDIRECT_URL}/${recruit_id}`; }; export const checkAuth = (): Promise<"invalid" | "valid" | "need_register"> => diff --git a/src/apis/environment.ts b/src/apis/environment.ts index 6694944..c072a9d 100644 --- a/src/apis/environment.ts +++ b/src/apis/environment.ts @@ -1,19 +1,9 @@ -export const baseURL = - import.meta.env.VITE_API_TYPE === "MSW" - ? "" - : "https://wacruit-dev.wafflestudio.com/api/v1"; +export const BASE_URL = + import.meta.env.VITE_API_TYPE === "MSW" ? "" : import.meta.env.VITE_BASE_URL; -export const ssoLoginURL = +export const SSO_LOGIN_URL = import.meta.env.VITE_API_TYPE === "MSW" ? "" - : "https://sso-dev.wafflestudio.com/?redirect_uri="; - -export const ssoRedirectURI = (recruitId: number | "home") => - `https://wacruit-dev.wafflestudio.com/sso/${recruitId}`; - -// export const baseURL = "https://wacruit.wafflestudio.com/api/v1"; - -// export const ssoLoginURL = "https://sso.wafflestudio.com/?redirect_uri="; + : import.meta.env.VITE_SSO_LOGIN_URL; -// export const ssoRedirectURI = (recruitId: number | "home") => -// `https://wacruit.wafflestudio.com/sso/${recruitId}`; +export const SSO_REDIRECT_URL = import.meta.env.VITE_SSO_REDIRECT_URL; diff --git a/src/apis/utility.ts b/src/apis/utility.ts index 54d8708..a52dd3d 100644 --- a/src/apis/utility.ts +++ b/src/apis/utility.ts @@ -1,5 +1,5 @@ import { getSsoToken } from "./auth"; -import { baseURL } from "./environment"; +import { BASE_URL } from "./environment"; const defaultCommonHeader = {}; @@ -23,7 +23,7 @@ export const getRequest = ( header: HeadersInit = {}, authorized = true, ): Promise => - fetch(`${baseURL}${url}`, { + fetch(`${BASE_URL}${url}`, { headers: { ...defaultCommonHeader, ...header, @@ -37,7 +37,7 @@ export const postRequest = ( header: HeadersInit = {}, authorized = true, ): Promise => - fetch(`${baseURL}${url}`, { + fetch(`${BASE_URL}${url}`, { method: "POST", headers: { ...defaultCommonHeader, @@ -54,7 +54,7 @@ export const putRequest = ( header: HeadersInit = {}, authorized = true, ): Promise => - fetch(`${baseURL}${url}`, { + fetch(`${BASE_URL}${url}`, { method: "PUT", headers: { ...defaultCommonHeader, @@ -71,7 +71,7 @@ export const patchRequest = ( header: HeadersInit = {}, authorized = true, ): Promise => - fetch(`${baseURL}${url}`, { + fetch(`${BASE_URL}${url}`, { method: "PATCH", headers: { ...defaultCommonHeader, @@ -88,7 +88,7 @@ export const deleteRequest = ( header: HeadersInit = {}, authorized = true, ) => - fetch(`${baseURL}${url}`, { + fetch(`${BASE_URL}${url}`, { method: "DELETE", headers: { ...defaultCommonHeader, @@ -107,7 +107,7 @@ export const sseRequest = ( authorized = true, ): AsyncIterable => ({ async *[Symbol.asyncIterator]() { - const response = await fetch(`${baseURL}${url}`, { + const response = await fetch(`${BASE_URL}${url}`, { method: "POST", headers: { ...defaultCommonHeader, From 755586fc44a44b5440a275299fdfe88aa209aab8 Mon Sep 17 00:00:00 2001 From: Minkyu Lee Date: Wed, 27 Dec 2023 01:58:45 +0900 Subject: [PATCH 2/7] =?UTF-8?q?github=20actions=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EB=B9=8C=EB=93=9C=20=EC=8B=9C=20=EB=B0=B0=ED=8F=AC=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A6=88=20=EB=B3=84=20=EC=84=A4=EC=A0=95=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/{dev.yml => deploy-dev.yml} | 14 ++++++++++---- .../workflows/{release.yml => deploy-prod.yml} | 18 +++++++++++------- 2 files changed, 21 insertions(+), 11 deletions(-) rename .github/workflows/{dev.yml => deploy-dev.yml} (79%) rename .github/workflows/{release.yml => deploy-prod.yml} (78%) diff --git a/.github/workflows/dev.yml b/.github/workflows/deploy-dev.yml similarity index 79% rename from .github/workflows/dev.yml rename to .github/workflows/deploy-dev.yml index b40c5f2..d806ca9 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -2,9 +2,15 @@ name: Dev CICD on: push: branches: main + +concurrency: + group: deploy-dev + cancel-in-progress: true + jobs: - Build: + Deploy: runs-on: ubuntu-latest + environment: dev steps: - name: Checkout uses: actions/checkout@v3.3.0 @@ -16,13 +22,13 @@ jobs: - name: Install dependencies run: yarn - name: Build - run: yarn build + run: yarn build --mode development - name: Upload to S3 uses: jakejarvis/s3-sync-action@master with: args: --delete env: - AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET_DEV }} + AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_REGION: ${{secrets.AWS_REGION}} @@ -30,7 +36,7 @@ jobs: - name: Invalidate Cloudfront cache uses: chetan/invalidate-cloudfront-action@v2 env: - DISTRIBUTION: ${{ secrets.AWS_CLOUDFRONT_DISTRIBUTION_DEV }} + DISTRIBUTION: ${{ secrets.AWS_CLOUDFRONT_DISTRIBUTION }} PATHS: "/*" AWS_REGION: ${{secrets.AWS_REGION}} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} diff --git a/.github/workflows/release.yml b/.github/workflows/deploy-prod.yml similarity index 78% rename from .github/workflows/release.yml rename to .github/workflows/deploy-prod.yml index 46839f2..52096a5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/deploy-prod.yml @@ -1,12 +1,16 @@ -# Release 배포용 CI/CD workflow. - -name: Release CICD +name: Prod CICD on: push: branches: release + +concurrency: + group: deploy-prod + cancel-in-progress: true + jobs: - Build: + Deploy: runs-on: ubuntu-latest + environment: prod steps: - name: Checkout uses: actions/checkout@v3.3.0 @@ -18,13 +22,13 @@ jobs: - name: Install dependencies run: yarn - name: Build - run: yarn build + run: yarn build --mode production - name: Upload to S3 uses: jakejarvis/s3-sync-action@master with: args: --delete env: - AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET_RELEASE }} + AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_REGION: ${{secrets.AWS_REGION}} @@ -32,7 +36,7 @@ jobs: - name: Invalidate Cloudfront cache uses: chetan/invalidate-cloudfront-action@v2 env: - DISTRIBUTION: ${{ secrets.AWS_CLOUDFRONT_DISTRIBUTION_RELEASE }} + DISTRIBUTION: ${{ secrets.AWS_CLOUDFRONT_DISTRIBUTION }} PATHS: "/*" AWS_REGION: ${{secrets.AWS_REGION}} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} From 3a90030e1a0c001b8ffec895f210aa1fbf06cd44 Mon Sep 17 00:00:00 2001 From: Minkyu Lee Date: Wed, 27 Dec 2023 02:03:22 +0900 Subject: [PATCH 3/7] =?UTF-8?q?PR=20=ED=85=9C=ED=94=8C=EB=A6=BF=20?= =?UTF-8?q?=EA=B0=84=EC=86=8C=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/pull_request_template.md | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 1093438..7d6600b 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,22 +1,7 @@ ### 요약 -- 마감 기한: YY-MM-DD -- 상태: + -### 태스크 URL - -### 체크리스트 -__PR 전__ -- [ ] 칸반 생성 -- [ ] pre-commit 성공 -- [ ] type-label 추가 - -__머지 전__ -- [ ] 칸반 옮기기 -- [ ] 코멘트 리졸브 -- [ ] squash & merge - -### 작업 목록 - -### 테스트 방법 (Optional) +### 변경 내역 + ### 기타 질문 및 공유 사항 (Optional) From 86d77772c8653acc597cb37abfe41e9333c260f4 Mon Sep 17 00:00:00 2001 From: Minkyu Lee Date: Wed, 27 Dec 2023 02:07:51 +0900 Subject: [PATCH 4/7] =?UTF-8?q?PR=20=EC=B2=B4=ED=81=AC=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=B5=9C=EC=86=8C=ED=95=9C=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/pull_request_template.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 7d6600b..abe429a 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -4,4 +4,9 @@ ### 변경 내역 +### 체크리스트 +- [ ] pre-commit 통과 +- [ ] PR Assignees 추가 +- [ ] PR Labels 추가 + ### 기타 질문 및 공유 사항 (Optional) From f53a59ce251f7a4b56f41e037386d5c72841fd73 Mon Sep 17 00:00:00 2001 From: Minkyu Lee Date: Wed, 27 Dec 2023 02:09:19 +0900 Subject: [PATCH 5/7] =?UTF-8?q?PR=20=ED=85=9C=ED=94=8C=EB=A6=BF=20?= =?UTF-8?q?=ED=97=A4=EB=8D=94=20=EB=A0=88=EB=B2=A8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/pull_request_template.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index abe429a..dd86dfa 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,12 +1,12 @@ -### 요약 +## 요약 -### 변경 내역 +## 변경 내역 -### 체크리스트 +## 체크리스트 - [ ] pre-commit 통과 - [ ] PR Assignees 추가 - [ ] PR Labels 추가 -### 기타 질문 및 공유 사항 (Optional) +## 기타 질문 및 공유 사항 (Optional) From 0645e651b17f5925c8fe4d09f0913f1f4f133ebb Mon Sep 17 00:00:00 2001 From: Minkyu Lee Date: Wed, 27 Dec 2023 21:10:12 +0900 Subject: [PATCH 6/7] =?UTF-8?q?s3,=20cloudfront=EB=8A=94=20variable?= =?UTF-8?q?=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 --- .github/workflows/deploy-dev.yml | 4 ++-- .github/workflows/deploy-prod.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index d806ca9..aba12d5 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -28,7 +28,7 @@ jobs: with: args: --delete env: - AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }} + AWS_S3_BUCKET: ${{ vars.AWS_S3_BUCKET }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_REGION: ${{secrets.AWS_REGION}} @@ -36,7 +36,7 @@ jobs: - name: Invalidate Cloudfront cache uses: chetan/invalidate-cloudfront-action@v2 env: - DISTRIBUTION: ${{ secrets.AWS_CLOUDFRONT_DISTRIBUTION }} + DISTRIBUTION: ${{ vars.AWS_CLOUDFRONT_DISTRIBUTION }} PATHS: "/*" AWS_REGION: ${{secrets.AWS_REGION}} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 52096a5..d305e84 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -28,7 +28,7 @@ jobs: with: args: --delete env: - AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }} + AWS_S3_BUCKET: ${{ vars.AWS_S3_BUCKET }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_REGION: ${{secrets.AWS_REGION}} @@ -36,7 +36,7 @@ jobs: - name: Invalidate Cloudfront cache uses: chetan/invalidate-cloudfront-action@v2 env: - DISTRIBUTION: ${{ secrets.AWS_CLOUDFRONT_DISTRIBUTION }} + DISTRIBUTION: ${{ vars.AWS_CLOUDFRONT_DISTRIBUTION }} PATHS: "/*" AWS_REGION: ${{secrets.AWS_REGION}} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} From b3960166883d1e1f5986b5a9049b680b5b756ba6 Mon Sep 17 00:00:00 2001 From: Minkyu Lee Date: Wed, 27 Dec 2023 21:15:47 +0900 Subject: [PATCH 7/7] =?UTF-8?q?AWS=20REGION=EB=8F=84=20variable=EB=A1=9C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-dev.yml | 4 ++-- .github/workflows/deploy-prod.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index aba12d5..0f00a8f 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -31,13 +31,13 @@ jobs: AWS_S3_BUCKET: ${{ vars.AWS_S3_BUCKET }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_REGION: ${{secrets.AWS_REGION}} + AWS_REGION: ${{vars.AWS_REGION}} SOURCE_DIR: "dist" - name: Invalidate Cloudfront cache uses: chetan/invalidate-cloudfront-action@v2 env: DISTRIBUTION: ${{ vars.AWS_CLOUDFRONT_DISTRIBUTION }} PATHS: "/*" - AWS_REGION: ${{secrets.AWS_REGION}} + AWS_REGION: ${{vars.AWS_REGION}} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index d305e84..a87c48a 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -31,13 +31,13 @@ jobs: AWS_S3_BUCKET: ${{ vars.AWS_S3_BUCKET }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_REGION: ${{secrets.AWS_REGION}} + AWS_REGION: ${{vars.AWS_REGION}} SOURCE_DIR: "dist" - name: Invalidate Cloudfront cache uses: chetan/invalidate-cloudfront-action@v2 env: DISTRIBUTION: ${{ vars.AWS_CLOUDFRONT_DISTRIBUTION }} PATHS: "/*" - AWS_REGION: ${{secrets.AWS_REGION}} + AWS_REGION: ${{vars.AWS_REGION}} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}