From ec9cd56e27b914d51f679fe2be28bdd574e9dd2c Mon Sep 17 00:00:00 2001
From: Alaister Young <a@alaisteryoung.com>
Date: Tue, 22 Nov 2022 06:06:58 +0000
Subject: [PATCH] ensure other query params are included when there is an
 existing ?next=

---
 studio/hooks/misc/withAuth.tsx | 4 ++--
 studio/lib/gotrue.ts           | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/studio/hooks/misc/withAuth.tsx b/studio/hooks/misc/withAuth.tsx
index 15776ca1f05..05eb8a0ee9b 100644
--- a/studio/hooks/misc/withAuth.tsx
+++ b/studio/hooks/misc/withAuth.tsx
@@ -2,7 +2,7 @@ import { ComponentType, useEffect } from 'react'
 import Head from 'next/head'
 import { NextRouter, useRouter } from 'next/router'
 
-import { STORAGE_KEY } from 'lib/gotrue'
+import { getNextPath, STORAGE_KEY } from 'lib/gotrue'
 import { IS_PLATFORM } from 'lib/constants'
 import { useProfile, useStore, usePermissions } from 'hooks'
 import Error500 from '../../pages/500'
@@ -86,7 +86,7 @@ export function withAuth<T>(
           to the login page if they are guaranteed (no token at all) to not be logged in. */}
           <script
             dangerouslySetInnerHTML={{
-              __html: `if (!localStorage.getItem('${STORAGE_KEY}') && !location.hash) {location.replace('/sign-in?next=' + (new URLSearchParams(location.search).get('next') || encodeURIComponent(location.pathname + location.search + location.hash)))}`,
+              __html: `window._getNextPath = ${getNextPath.toString()};if (!localStorage.getItem('${STORAGE_KEY}') && !location.hash) {location.replace('/sign-in?next=' + window._getNextPath(location.pathname))}`,
             }}
           />
         </Head>
diff --git a/studio/lib/gotrue.ts b/studio/lib/gotrue.ts
index a06d1d936bb..8a3feb42cac 100644
--- a/studio/lib/gotrue.ts
+++ b/studio/lib/gotrue.ts
@@ -40,18 +40,13 @@ export const getIdentity = (gotrueUser: User) => {
 
 // NOTE: do not use any imports in this function,
 // as it is use standalone in the documents head
-export const getNextPath = () => {
-  if (typeof window === 'undefined') {
-    // make sure this method is SSR safe
-    return '/projects'
-  }
-
+export const getNextPath = (fallback = '/projects') => {
   const searchParams = new URLSearchParams(location.search)
   const returnTo = searchParams.get('next')
 
   searchParams.delete('next')
 
-  const next = returnTo ?? '/projects'
+  const next = returnTo ?? fallback
   const remainingSearchParams = searchParams.toString()
 
   if (next === 'new-project') {