diff --git a/backend/src/api/auth.ts b/backend/src/api/auth.ts index bfdcd868..7ac32818 100644 --- a/backend/src/api/auth.ts +++ b/backend/src/api/auth.ts @@ -114,7 +114,7 @@ export function initAuth(router: express.Router) { router.get( "/auth/new-login", (req: Request, res: Response, next: NextFunction) => { - res.cookie("redir", `/new/login-callback/`, { httpOnly: true }); + res.cookie("redir", `/new/auth/login-callback/`, { httpOnly: true }); next(); }, diff --git a/revampdashboard/src/routes/+page.svelte b/revampdashboard/src/routes/+page.svelte index d06721df..08b944cc 100644 --- a/revampdashboard/src/routes/+page.svelte +++ b/revampdashboard/src/routes/+page.svelte @@ -7,7 +7,11 @@
- {data.error} + {#if data.error} +
+ {data.error} +
+ {/if}
diff --git a/revampdashboard/src/routes/login-callback/+server.ts b/revampdashboard/src/routes/auth/login-callback/+server.ts similarity index 100% rename from revampdashboard/src/routes/login-callback/+server.ts rename to revampdashboard/src/routes/auth/login-callback/+server.ts diff --git a/revampdashboard/src/routes/dashboard/+page.server.ts b/revampdashboard/src/routes/auth/login/+server.ts similarity index 51% rename from revampdashboard/src/routes/dashboard/+page.server.ts rename to revampdashboard/src/routes/auth/login/+server.ts index bda82d58..d59253a9 100644 --- a/revampdashboard/src/routes/dashboard/+page.server.ts +++ b/revampdashboard/src/routes/auth/login/+server.ts @@ -1,10 +1,12 @@ import { redirect } from '@sveltejs/kit'; -import type { PageServerLoad } from './$types'; +import type { RequestHandler } from './$types'; -export const load: PageServerLoad = ({ cookies }) => { +export const GET: RequestHandler = ({ cookies }) => { const apiKey = String(cookies.get('apiKey') ?? ''); if (!apiKey) { return redirect(307, `${process.env.API_URL}/auth/new-login`); } + + return redirect(302, `${process.env.DASHBOARD_URL}/new/dashboard`); };