diff --git a/error.vue b/error.vue index 24ecfda..d75c957 100644 --- a/error.vue +++ b/error.vue @@ -16,7 +16,7 @@ const showSignIn = statusCode ? statusCode == 403 || statusCode == 401 : false; async function signIn() { clearError({ - redirect: `/signin?redirect=${encodeURIComponent(route.fullPath)}`, + redirect: `/auth/signin?redirect=${encodeURIComponent(route.fullPath)}`, }); } diff --git a/middleware/require-user.global.ts b/middleware/require-user.global.ts index 8ec3fa3..dbe218c 100644 --- a/middleware/require-user.global.ts +++ b/middleware/require-user.global.ts @@ -1,4 +1,4 @@ -const whitelistedPrefixes = ["/signin", "/register", "/api", "/setup"]; +const whitelistedPrefixes = ["/auth/signin", "/register", "/api", "/setup"]; const requireAdmin = ["/admin"]; export default defineNuxtRouteMiddleware(async (to, from) => { @@ -13,7 +13,10 @@ export default defineNuxtRouteMiddleware(async (to, from) => { await updateUser(); } if (!user.value) { - return navigateTo({ path: "/signin", query: { redirect: to.fullPath } }); + return navigateTo({ + path: "/auth/signin", + query: { redirect: to.fullPath }, + }); } if ( requireAdmin.findIndex((e) => to.fullPath.startsWith(e)) != -1 && diff --git a/pages/signin.vue b/pages/auth/signin.vue similarity index 100% rename from pages/signin.vue rename to pages/auth/signin.vue diff --git a/pages/signout.vue b/pages/auth/signout.vue similarity index 97% rename from pages/signout.vue rename to pages/auth/signout.vue index ff947d3..2a438e1 100644 --- a/pages/signout.vue +++ b/pages/auth/signout.vue @@ -43,5 +43,5 @@ user.value = null; // Redirect to signin page after signout await $dropFetch("/signout"); -router.push("/signin"); +router.push("/auth/signin"); diff --git a/pages/register.vue b/pages/register.vue index c16390f..4a7b018 100644 --- a/pages/register.vue +++ b/pages/register.vue @@ -248,7 +248,7 @@ function register_wrapper() { loading.value = true; register() .then(() => { - router.push("/signin"); + router.push("/auth/signin"); }) .catch((response) => { const message = response.statusMessage || "An unknown error occurred"; diff --git a/server/plugins/redirect.ts b/server/plugins/redirect.ts index 9ef78e3..a875153 100644 --- a/server/plugins/redirect.ts +++ b/server/plugins/redirect.ts @@ -18,7 +18,7 @@ export default defineNitroPlugin((nitro) => { if (userId) break; return sendRedirect( event, - `/signin?redirect=${encodeURIComponent(event.path)}` + `/auth/signin?redirect=${encodeURIComponent(event.path)}` ); } }); diff --git a/server/routes/signout.get.ts b/server/routes/signout.get.ts index 9706df9..b1158df 100644 --- a/server/routes/signout.get.ts +++ b/server/routes/signout.get.ts @@ -3,5 +3,5 @@ import sessionHandler from "../internal/session"; export default defineEventHandler(async (h3) => { await sessionHandler.clearSession(h3); - return sendRedirect(h3, "/signin"); + return sendRedirect(h3, "/auth/signin"); });