From f312cff47739d37f6a8a685025b88aff37c0801e Mon Sep 17 00:00:00 2001
From: Towsty <ianjmcarr@gmail.com>
Date: Thu, 10 Sep 2026 21:33:41 -0500
Subject: [PATCH] Return preview users to Studio 2 after login

---
 pages/login.vue           | 3 ++-
 server/middleware/auth.ts | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pages/login.vue b/pages/login.vue
index 359da9c..188b550 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -39,6 +39,7 @@
 
 <script setup lang="ts">
 const config = useRuntimeConfig()
+const route = useRoute()
 const instanceName = ref(String(config.public.instanceName || 'AIGen'))
 const authMode = ref(String(config.public.authMode || ''))
 const username = ref('')
@@ -57,7 +58,7 @@ async function submit() {
   error.value = ''
   try {
     await $fetch('/api/auth/login', { method: 'POST', body: { username: username.value, password: password.value } })
-    await navigateTo('/')
+    await navigateTo(route.query.next === '/studio-2' ? '/studio-2' : '/')
   } catch (err: any) {
     error.value = err?.data?.statusMessage || err?.statusMessage || 'Sign in failed'
   } finally {
diff --git a/server/middleware/auth.ts b/server/middleware/auth.ts
index 68d3a69..7a2eb4c 100644
--- a/server/middleware/auth.ts
+++ b/server/middleware/auth.ts
@@ -1,6 +1,6 @@
 export default defineEventHandler((event) => {
   if (!authEnabled()) return
-  const path = event.path || getRequestURL(event).pathname
+  const path = getRequestURL(event).pathname
   if (
     path.startsWith('/api/auth/login') ||
     path.startsWith('/api/auth/callback') ||
@@ -20,5 +20,5 @@ export default defineEventHandler((event) => {
   if (path.startsWith('/api/')) {
     throw createError({ statusCode: 401, statusMessage: 'Authentication required' })
   }
-  return sendRedirect(event, '/login', 302)
+  return sendRedirect(event, path === '/studio-2' ? '/login?next=/studio-2' : '/login', 302)
 })