From 52938a596666da6196b192719080f91a1c416eb2 Mon Sep 17 00:00:00 2001 From: kimyu0218 Date: Fri, 8 Mar 2024 20:52:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20cd=20=EB=AA=85=EB=A0=B9=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 리팩토링 과정에서 backend 디렉토리로 이동하는 것 누락 --- .github/workflows/blue-green-cd.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/blue-green-cd.yml b/.github/workflows/blue-green-cd.yml index 8058f76f..4497b2d8 100644 --- a/.github/workflows/blue-green-cd.yml +++ b/.github/workflows/blue-green-cd.yml @@ -2,8 +2,8 @@ name: Blue/Green CD for Backend on: push: - paths: ["backend/**"] - branches: ["release", "*hotfix*"] + #paths: ["backend/**"] + #branches: ["release", "*hotfix*"] env: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} @@ -19,6 +19,7 @@ jobs: - name: Generate .env file and SSL files run: | + cd backend echo "${{ secrets.ENV_FILE }}" > .env echo "DOCKER_USERNAME=${{ secrets.DOCKER_USERNAME }}" >> .env echo "GITHUB_SHA=${{ github.sha }}" >> .env From 7ddc272b6d267dde42e6232eda25fb9ec3719d2e Mon Sep 17 00:00:00 2001 From: HeoJiye Date: Mon, 11 Mar 2024 17:16:57 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20secure=20=EC=9A=94=EC=B2=AD=20?= =?UTF-8?q?=ED=97=A4=EB=8D=94=20=EC=86=8D=EC=84=B1=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/business/hooks/auth/useKakaoOAuthRedirect.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frontend/src/business/hooks/auth/useKakaoOAuthRedirect.ts b/frontend/src/business/hooks/auth/useKakaoOAuthRedirect.ts index cd0452b8..42d51cff 100644 --- a/frontend/src/business/hooks/auth/useKakaoOAuthRedirect.ts +++ b/frontend/src/business/hooks/auth/useKakaoOAuthRedirect.ts @@ -9,13 +9,11 @@ export function useKakaoOAuthRedirect() { const navigate = useNavigate(); const code = new URLSearchParams(window.location.search).get('code'); - const headerOptions = isProdctionMode() ? { SameSite: 'None', Secure: true } : {}; - const login = async () => { const res = await axios.get(KAKAO_LOGIN_URL, { params: { code }, withCredentials: true, - headers: headerOptions, + headers: isProdctionMode() ? { SameSite: 'None' } : {}, }); if (!res || res.status !== 200) {