portalLink fix

Author: KeeganBeuthin

package.json

@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@kinde-oss/kinde-typescript-sdk": "^2.7.2",
-    "@kinde/js-utils": "^0.18.3",
+    "@kinde/js-utils": "^0.20.1",
     "@testing-library/svelte": "^5.2.8"
   },
   "devDependencies": {

src/lib/components/PortalLink.svelte

@@ -2,13 +2,16 @@
   import { type GeneratePortalUrlParams } from "@kinde/js-utils";
   import { browser } from "$app/environment";
 
-  export let options: Omit<GeneratePortalUrlParams, "domain" | "returnUrl"> =
-    {};
+  export let options: Partial <Omit<GeneratePortalUrlParams, "domain">> = {};
 
   function portal() {
     if (!browser) return;
     const path = "/api/auth/portal";
 
+    if(!options.returnUrl) {
+    options.returnUrl = window.location
+  }
+
     const params = new URLSearchParams(
       options as Record<string, string>,
     ).toString();

src/lib/handleAuth/handleAuth.ts

@@ -75,7 +75,7 @@ export async function handleAuth({
       );
       break;
     case "portal":
-      await openPortal(options);
+      await openPortal(request, options);
       break;
     case "kinde_callback":
       await kindeAuthClient.handleRedirectToApp(
@@ -93,22 +93,25 @@ export async function handleAuth({
   redirect(302, url.toString());
 }
 
-const openPortal = async (options: Record<string, string | number>) => {
-  const accessToken = await sessionStorage.getSessionItem("access_token");
+const openPortal = async (request: SessionManager, options: Record<string, string | number>) => {
+  const accessToken = await request.getSessionItem("access_token");
   if (!accessToken) {
     throw error(401, "User not authenticated");
   }
 
   const storage = new MemoryStorage();
   setActiveStorage(storage);
   await storage.setSessionItem(StorageKeys.accessToken, accessToken);
-
+let portalUrl
   try {
-    const portalUrl = await generatePortalUrl(options);
-    redirect(302, portalUrl.url.toString());
+     portalUrl = await generatePortalUrl({...options, domain: kindeConfiguration.authDomain});
+    console.log('portalUrl:', portalUrl);
+    console.log('options:', options);
   } catch (err) {
-    throw error(500, "Failed to generate portal URL");
+    console.log('err:', err);
+    throw error(500, "Failed to generate portal URL",);
   }
+  redirect(302, portalUrl.url.toString());
 };
 
 const storePostLoginRedirectUrl = (
@@ -144,4 +147,4 @@ const redirectToPostLoginUrl = async () => {
       );
     }
   }
-};
+};

src/lib/utils/index.ts

@@ -32,6 +32,9 @@ const rootParams = [
   "post_login_redirect_url",
   "authUrlParams",
   "redirect_url",
+  "returnUrl",
+  "domain",
+  "subNav",
 ];
 
 export const parseSearchParamsToObject = (search: string) => {