Merge pull request #190 from sullog-official/fix/handle-token-undefined

fix: token이 undefined인 경우 쿠키 설정하지 않도록 수정
sullog-official · Jul 29, 2023 · af01d5f · af01d5f
2 parents 2c67eaf + 9de44bb
commit af01d5f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/pages/api/redirect/kakao.ts b/src/pages/api/redirect/kakao.ts
@@ -28,13 +28,22 @@ export default async function handler(
 
   try {
     const response = await kakaoLoginCallback(code);
-    setAccessToken(response.headers[ACCESS_TOKEN_KEY]);
-    setRefreshToken(response.headers[REFRESH_TOKEN_KEY], { req, res });
 
-    res.setHeader(
-      'Set-Cookie',
-      `${REFRESH_TOKEN_KEY}=${response.headers[REFRESH_TOKEN_KEY]}; path=/; samesite=lax; httponly;`
-    );
+    const {
+      [ACCESS_TOKEN_KEY]: accessToken,
+      [REFRESH_TOKEN_KEY]: refreshToken,
+    } = response.headers;
+
+    setAccessToken(accessToken);
+    setRefreshToken(refreshToken, { req, res });
+
+    if (refreshToken) {
+      res.setHeader(
+        'Set-Cookie',
+        `${REFRESH_TOKEN_KEY}=${refreshToken}; path=/; samesite=lax; httponly;`
+      );
+    }
+
     res.redirect(307, '/');
   } catch (err) {
     console.error(err);

diff --git a/src/shared/utils/auth.ts b/src/shared/utils/auth.ts
@@ -37,6 +37,10 @@ export const setRefreshToken = (
     throw new Error("'context' is required for server side cookies");
   }
 
+  if (!refreshToken) {
+    throw new Error("'refreshToken' is undefined");
+  }
+
   setCookie(REFRESH_TOKEN_KEY, refreshToken, {
     ...(context || {}),
     httpOnly: true,