Preserve search params on return (#17)

Author: Paul Asjes

src/authkit-callback-route.ts

@@ -13,7 +13,7 @@ export function authLoader(options: HandleAuthOptions = {}) {
 
     const code = url.searchParams.get('code');
     const state = url.searchParams.get('state');
-    const returnPathname = state ? JSON.parse(atob(state)).returnPathname : null;
+    let returnPathname = state ? JSON.parse(atob(state)).returnPathname : null;
 
     if (code) {
       try {
@@ -27,7 +27,19 @@ export function authLoader(options: HandleAuthOptions = {}) {
         url.searchParams.delete('state');
 
         // Redirect to the requested path and store the session
-        url.pathname = returnPathname ?? returnPathnameOption;
+        returnPathname = returnPathname ?? returnPathnameOption;
+
+        // Extract the search params if they are present
+        if (returnPathname.includes('?')) {
+          const newUrl = new URL(returnPathname, 'https://example.com');
+          url.pathname = newUrl.pathname;
+
+          for (const [key, value] of newUrl.searchParams) {
+            url.searchParams.append(key, value);
+          }
+        } else {
+          url.pathname = returnPathname;
+        }
 
         // The refreshToken should never be accesible publicly, hence why we encrypt it in the cookie session
         // Alternatively you could persist the refresh token in a backend database

src/session.ts

@@ -115,7 +115,7 @@ async function authkitLoader<Data = unknown>(
 
   if (!session) {
     if (ensureSignedIn) {
-      const returnPathname = new URL(request.url).pathname;
+      const returnPathname = getReturnPathname(request.url);
       const cookieSession = await getSession(request.headers.get('Cookie'));
 
       throw redirect(await getAuthorizationUrl({ returnPathname }), {
@@ -253,4 +253,10 @@ async function verifyAccessToken(accessToken: string) {
   }
 }
 
+function getReturnPathname(url: string): string {
+  const newUrl = new URL(url);
+
+  return `${newUrl.pathname}${newUrl.searchParams.size > 0 ? '?' + newUrl.searchParams.toString() : ''}`;
+}
+
 export { encryptSession, terminateSession, authkitLoader };