Merge branch 'dev' of https://github.com/boostcampwm2023/web09-MagicC…

…onch into release
boostcampwm2023 · Mar 11, 2024 · 69e00a2 · 69e00a2
2 parents 368d56e + 7ddc272
commit 69e00a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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 }}

diff --git 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) {