Merge pull request #343 from kinde-oss/fix/router-return

Author: DanielRivers

.release-it.json

@@ -1,6 +1,6 @@
 {
   "git": {
-  	"requireBranch": "release/2.5",
+    "requireBranch": "release/2.5",
     "commitMessage": "chore: release v${version}"
   },
   "hooks": {

src/handlers/createOrg.ts

@@ -1,11 +1,18 @@
+import { getHeaders } from "../utils/getHeaders";
 import RouterClient from "../routerClients/RouterClient";
 import validateState from "../utils/validateState";
+import { isPreFetch } from "../utils/isPreFetch";
 
 /**
  *
  * @param {RouterClient} routerClient
  */
-export const createOrg = async (routerClient) => {
+export const createOrg = async (routerClient: RouterClient) => {
+  const headers = await getHeaders(routerClient.req);
+  if (isPreFetch(headers)) {
+    return routerClient.json({ message: "Prefetch skipped" }, { status: 200 });
+  }
+
   const org_name = routerClient.getSearchParam("org_name");
   const options = {
     org_name: org_name ?? undefined,

src/handlers/login.ts

@@ -10,7 +10,7 @@ import validateState from "../utils/validateState";
 export const login = async (routerClient: RouterClient) => {
   const headers = await getHeaders(routerClient.req);
   if (isPreFetch(headers)) {
-    return null;
+    return routerClient.json({ message: "Prefetch skipped" }, { status: 200 });
   }
 
   const passedState = routerClient.searchParams.get("state");

src/handlers/logout.ts

@@ -10,7 +10,7 @@ import { getHeaders } from "../utils/getHeaders";
 export const logout = async (routerClient: RouterClient) => {
   const headers = await getHeaders(routerClient.req);
   if (isPreFetch(headers)) {
-    return null;
+    return routerClient.json({ message: "Prefetch skipped" }, { status: 200 });
   }
 
   const authUrl = await routerClient.kindeClient.logout(

src/handlers/portal.ts

@@ -17,7 +17,7 @@ import { config, routes } from "../config";
 export const portal = async (routerClient: RouterClient) => {
   const headers = await getHeaders(routerClient.req);
   if (isPreFetch(headers)) {
-    return null;
+    return routerClient.json({ message: "Prefetch skipped" }, { status: 200 });
   }
 
   const storage = new MemoryStorage();

src/handlers/register.ts

@@ -10,7 +10,7 @@ import validateState from "../utils/validateState";
 export const register = async (routerClient: RouterClient) => {
   const headers = await getHeaders(routerClient.req);
   if (isPreFetch(headers)) {
-    return null;
+    return routerClient.json({ message: "Prefetch skipped" }, { status: 200 });
   }
 
   const authUrl = await routerClient.kindeClient.register(

src/utils/workQueue.ts

@@ -20,7 +20,7 @@ export class RequestQueueManager {
 
   async enqueue<T>(task: () => Promise<T>): Promise<T> {
     return new Promise((resolve, reject) => {
-        console.debug("enqueue: task added to queue");
+      console.debug("enqueue: task added to queue");
       this.queue.push({
         execute: task,
         resolve,
@@ -41,7 +41,7 @@ export class RequestQueueManager {
       console.debug("processQueue: task executed successfully");
       item.resolve(result);
     } catch (error) {
-        console.debug("processQueue: task execution failed", error);
+      console.debug("processQueue: task execution failed", error);
       item.reject(error);
     } finally {
       this.isProcessing = false;