diff --git a/app/libs/cookie.server.ts b/app/libs/cookie.server.ts index 557d52e..0870e2c 100644 --- a/app/libs/cookie.server.ts +++ b/app/libs/cookie.server.ts @@ -15,5 +15,5 @@ export const staffTokenCookieConfig = createCookie(STAFF_COOKIES.token, { sameSite: 'lax', secure: process.env.NODE_ENV === 'production', secrets: [process.env.VITE_SALT_KEY || 'default-secret'], - path: '/lg-admin', + path: '/', }) diff --git a/app/libs/logout-header.server.ts b/app/libs/logout-header.server.ts index 39563de..db19bd4 100644 --- a/app/libs/logout-header.server.ts +++ b/app/libs/logout-header.server.ts @@ -14,7 +14,7 @@ export const setStaffLogoutHeaders = () => { const responseHeaders = new Headers() responseHeaders.append( 'Set-Cookie', - `${STAFF_COOKIES.token}=; Path=/lg-admin; HttpOnly; SameSite=Strict; Max-Age=0`, + `${STAFF_COOKIES.token}=; Path=/; HttpOnly; SameSite=Strict; Max-Age=0`, ) return responseHeaders diff --git a/app/routes/_admin.lg-admin._auth.login.tsx b/app/routes/_admin.lg-admin._auth.login.tsx index 0113752..0ee9f17 100644 --- a/app/routes/_admin.lg-admin._auth.login.tsx +++ b/app/routes/_admin.lg-admin._auth.login.tsx @@ -1,4 +1,17 @@ +import { redirect } from 'react-router' + +import { handleCookie } from '~/libs/cookies' import { AdminLoginPage } from '~/pages/admin-login' +import type { Route } from './+types/_admin.lg-admin._auth.login' + +export const loader = async ({ request }: Route.LoaderArgs) => { + const { staffToken } = await handleCookie(request) + + if (staffToken) { + throw redirect('/lg-admin') + } +} + const AuthLayout = () => export default AuthLayout