Refresh Token 저장 방식 변경

src/lib/hooks/callAPI.ts

@@ -0,0 +1,47 @@
+import { accessToken } from "$lib/stores/auth";
+
+const refreshToken = async () => {
+  const res = await fetch("/api/auth/refreshtoken", {
+    method: "POST",
+    credentials: "same-origin",
+  });
+  if (!res.ok) {
+    accessToken.set(null);
+    throw new Error("Failed to refresh token");
+  }
+
+  const data = await res.json();
+  const token = data.accessToken as string;
+
+  accessToken.set(token);
+  return token;
+};
+
+const callAPIInternal = async (
+  input: RequestInfo,
+  init?: RequestInit,
+  token?: string | null,
+  retryIfUnauthorized = true,
+): Promise<Response> => {
+  if (token === null) {
+    token = await refreshToken();
+    retryIfUnauthorized = false;
+  }
+
+  const res = await fetch(input, {
+    ...init,
+    headers: {
+      ...init?.headers,
+      Authorization: `Bearer ${token}`,
+    },
+  });
+  if (res.status === 401 && retryIfUnauthorized) {
+    return await callAPIInternal(input, init, null, false);
+  }
+
+  return res;
+};
+
+export const callAPI = async (input: RequestInfo, init?: RequestInit, token?: string | null) => {
+  return await callAPIInternal(input, init, token);
+};

src/lib/stores/auth.ts

@@ -0,0 +1,3 @@
+import { writable } from "svelte/store";
+
+export const accessToken = writable<string | null>(null);

src/routes/api/auth/login/+server.ts

@@ -3,7 +3,7 @@ import { z } from "zod";
 import { login } from "$lib/server/services/auth";
 import type { RequestHandler } from "./$types";
 
-export const POST: RequestHandler = async ({ request }) => {
+export const POST: RequestHandler = async ({ request, cookies }) => {
   const zodRes = z
     .object({
       email: z.string().email().nonempty(),
@@ -14,5 +14,13 @@ export const POST: RequestHandler = async ({ request }) => {
   if (!zodRes.success) error(400, zodRes.error.message);
 
   const { email, password, pubKey } = zodRes.data;
-  return json(await login(email.trim(), password.trim(), pubKey?.trim()));
+  const { accessToken, refreshToken } = await login(email.trim(), password.trim(), pubKey?.trim());
+
+  cookies.set("refreshToken", refreshToken, {
+    path: "/api/auth",
+    httpOnly: true,
+    secure: true,
+    sameSite: "strict",
+  });
+  return json({ accessToken });
 };

src/routes/api/auth/logout/+server.ts

@@ -1,18 +1,11 @@
 import { error, text } from "@sveltejs/kit";
-import { z } from "zod";
 import { logout } from "$lib/server/services/auth";
 import type { RequestHandler } from "./$types";
 
-export const POST: RequestHandler = async ({ request }) => {
+export const POST: RequestHandler = async ({ cookies }) => {
-  const zodRes = z
+  const token = cookies.get("refreshToken");
-    .object({
+  if (!token) error(401, "Token not found");
-      refreshToken: z.string().nonempty(),
-    })
-    .safeParse(await request.json());
-  if (!zodRes.success) error(400, zodRes.error.message);
-
-  const { refreshToken } = zodRes.data;
-  await logout(refreshToken.trim());
 
+  await logout(token.trim());
   return text("Logged out");
 };

src/routes/api/auth/refreshToken/+server.ts

@@ -1,16 +1,18 @@
 import { error, json } from "@sveltejs/kit";
-import { z } from "zod";
 import { refreshToken } from "$lib/server/services/auth";
 import type { RequestHandler } from "./$types";
 
-export const POST: RequestHandler = async ({ request }) => {
+export const POST: RequestHandler = async ({ cookies }) => {
-  const zodRes = z
+  const token = cookies.get("refreshToken");
-    .object({
+  if (!token) error(401, "Token not found");
-      refreshToken: z.string().nonempty(),
-    })
-    .safeParse(await request.json());
-  if (!zodRes.success) error(400, zodRes.error.message);
 
-  const { refreshToken: token } = zodRes.data;
+  const { accessToken, refreshToken: newToken } = await refreshToken(token.trim());
-  return json(await refreshToken(token.trim()));
+
+  cookies.set("refreshToken", newToken, {
+    path: "/api/auth",
+    httpOnly: true,
+    secure: true,
+    sameSite: "strict",
+  });
+  return json({ accessToken });
 };