diff --git a/apps/as/app/api/auth/logout/route.ts b/apps/as/app/api/auth/logout/route.ts deleted file mode 100644 index d040a8f49..000000000 --- a/apps/as/app/api/auth/logout/route.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { cookies } from "next/headers"; -import { NextResponse } from "next/server"; - -import { - ACCESS_TOKEN, - AUTH_USER_ID, - CLAIM_NAME, - REFRESH_TOKEN, -} from "@/shared/config"; - -export async function POST() { - const cookieStore = await cookies(); - cookieStore.delete(ACCESS_TOKEN); - cookieStore.delete(REFRESH_TOKEN); - cookieStore.delete(AUTH_USER_ID); - cookieStore.delete(CLAIM_NAME); - return NextResponse.json({ message: "Logged out" }, { status: 200 }); -} diff --git a/apps/as/src/entities/auth/api/auth-service.ts b/apps/as/src/entities/auth/api/auth-service.ts index 80090f82f..97b664d6f 100644 --- a/apps/as/src/entities/auth/api/auth-service.ts +++ b/apps/as/src/entities/auth/api/auth-service.ts @@ -1,18 +1,12 @@ -import { - ACCESS_TOKEN, - AUTH_LOGIN_REDIRECT_URL, - AUTH_USER_ID, - CLAIM_NAME, - ENDPOINT, -} from "@/shared/config"; +import { ACCESS_TOKEN, AUTH_USER_ID, CLAIM_NAME, ENDPOINT } from "@/shared/config"; import { type AuthPayload, type AuthService, getRemainingMs } from "@common/auth"; import { - clearAuthToken, clearRefreshTimer, removeToken, setToken, setupRefreshTimer, + tokenManager, } from "../lib/token-manager"; async function login(payload: AuthPayload): Promise { @@ -69,7 +63,7 @@ async function silentRefresh(): Promise { } } catch (error) { console.error(`[silentRefresh] Failed at ${new Date().toISOString()}`, error); - clearAuthToken(); + tokenManager.clearAuthToken(); if (typeof window !== "undefined") { window.dispatchEvent(new CustomEvent("auth:logout")); } @@ -77,22 +71,12 @@ async function silentRefresh(): Promise { } async function logout(): Promise { - try { - await fetch("/api/auth/logout", { - method: "POST", - credentials: "include", - }); - } catch (error) { - console.error("Logout API failed:", error); - } - - clearAuthToken(); + tokenManager.clearAuthToken(); removeToken("site-id-key"); removeToken("site-theme-key"); if (typeof window !== "undefined") { window.dispatchEvent(new CustomEvent("auth:logout")); - window.location.href = AUTH_LOGIN_REDIRECT_URL; } } diff --git a/apps/as/src/entities/auth/lib/token-manager.ts b/apps/as/src/entities/auth/lib/token-manager.ts index cd468f1aa..78d24bd5e 100644 --- a/apps/as/src/entities/auth/lib/token-manager.ts +++ b/apps/as/src/entities/auth/lib/token-manager.ts @@ -9,7 +9,6 @@ export const { removeToken, setupRefreshTimer, clearRefreshTimer, - clearAuthToken, getAccessToken, getRefreshToken, getUserId,