From 4b3fed968947255d01ab6f6623a2b1096def4a42 Mon Sep 17 00:00:00 2001
From: Jennie Robinson Faber <jennie@jenniefaber.com>
Date: Sun, 1 Mar 2026 17:19:41 +0000
Subject: [PATCH] Move OIDC login page to /auth/wiki-login to avoid catch-all
 conflict

The /oidc/[...] server catch-all was intercepting /oidc/login before
the Nuxt page router could render it. Moving the page outside /oidc/
avoids the conflict entirely.
---
 app/pages/{oidc/login.vue => auth/wiki-login.vue} | 0
 server/routes/oidc/[...].ts                       | 6 ------
 server/routes/oidc/interaction/[uid].get.ts       | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)
 rename app/pages/{oidc/login.vue => auth/wiki-login.vue} (100%)

diff --git a/app/pages/oidc/login.vue b/app/pages/auth/wiki-login.vue
similarity index 100%
rename from app/pages/oidc/login.vue
rename to app/pages/auth/wiki-login.vue
diff --git a/server/routes/oidc/[...].ts b/server/routes/oidc/[...].ts
index 060348b..39528f0 100644
--- a/server/routes/oidc/[...].ts
+++ b/server/routes/oidc/[...].ts
@@ -11,12 +11,6 @@
 import { getOidcProvider } from "../../utils/oidc-provider.js";
 
 export default defineEventHandler(async (event) => {
-  // Let Nuxt handle the /oidc/login page (Vue SPA route)
-  const path = event.path || getRequestURL(event).pathname;
-  if (path === "/oidc/login" || path.startsWith("/oidc/login?")) {
-    return;
-  }
-
   const provider = await getOidcProvider();
   const { req, res } = event.node;
 
diff --git a/server/routes/oidc/interaction/[uid].get.ts b/server/routes/oidc/interaction/[uid].get.ts
index ad6ad5a..3af2841 100644
--- a/server/routes/oidc/interaction/[uid].get.ts
+++ b/server/routes/oidc/interaction/[uid].get.ts
@@ -61,7 +61,7 @@ export default defineEventHandler(async (event) => {
     }
 
     // No valid session — redirect to login page
-    return sendRedirect(event, `/oidc/login?uid=${uid}`, 302);
+    return sendRedirect(event, `/auth/wiki-login?uid=${uid}`, 302);
   }
 
   // ----- Consent prompt -----