feat: add support for redirect query parameter

Co-Authored-By: Baptiste Leproux <[email protected]>

Author: atinux

src/module/src/runtime/server/routes/admin.ts

@@ -1,6 +1,12 @@
-import { eventHandler, sendRedirect } from 'h3'
+import { eventHandler, getQuery, sendRedirect, setCookie } from 'h3'
 
 export default eventHandler((event) => {
+  const { redirect } = getQuery(event)
+  if (redirect) {
+    setCookie(event, 'studio-redirect', String(redirect), {
+      httpOnly: true,
+    })
+  }
   // Automatically redirect to the GitHub login page
   // TODO: once there is more than one auth provider, we need to add a selector for the auth provider
   return sendRedirect(event, '/__nuxt_studio/auth/github')

src/module/src/runtime/server/routes/auth/github.get.ts

@@ -209,6 +209,13 @@ export default eventHandler(async (event: H3Event) => {
     },
   }, session.data))
 
+  const redirect = decodeURIComponent(getCookie(event, 'studio-redirect') || '')
+  deleteCookie(event, 'studio-redirect')
+  // make sure the redirect is a valid relative path (avoid also // which is not a valid URL)
+  if (redirect && redirect.startsWith('/') && !redirect.startsWith('//')) {
+    return sendRedirect(event, redirect)
+  }
+
   return sendRedirect(event, '/')
 })
 

src/module/src/runtime/utils/activation.ts

@@ -25,7 +25,7 @@ export async function defineStudioActivationPlugin(onStudioActivation: (user: St
     // Listen to CMD + . to toggle the studio or redirect to the login page
     document.addEventListener('keydown', (event) => {
       if (event.metaKey && event.key === '.') {
-        window.location.href = config.route
+        window.location.href = config.route + '?redirect=' + encodeURIComponent(window.location.pathname)
       }
     })
   }