session fixes

src/lib/tanstack-query/hooks/use-server-mutation.ts

@@ -1,8 +1,10 @@
 import { useMutation, UseMutationOptions } from "@tanstack/react-query";
 import { ServerResult } from "../types";
 import toast from '@/lib/sonner'
+import { logger } from '@/lib/supertokens'
 
-let isMutationRefreshingSession = false;
+
+let sessionRefreshRedirect: Promise<void> | null = null;
 
 export function useServerMutation<TData, TVariables = unknown>(
   options: Omit<UseMutationOptions<TData, Error, TVariables>, 'mutationFn'> & {
@@ -39,24 +41,39 @@ export function useServerMutation<TData, TVariables = unknown>(
       } catch (error: any) {
         if (error?.response?.status === 401) {
           try {
-            const errorData = typeof error.response.data === 'string' 
-              ? JSON.parse(error.response.data) 
+            const errorData = typeof error.response.data === 'string'
+              ? JSON.parse(error.response.data)
               : error.response.data;
-            
+
             if (errorData?.error === "SESSION_REFRESH_REQUIRED") {
-              if (!isMutationRefreshingSession) {
-                isMutationRefreshingSession = true;
+              logger.warn("Mutation detected SESSION_REFRESH_REQUIRED");
+
+              if (!sessionRefreshRedirect) {
                 const currentUrl = window.location.pathname + window.location.search;
-                setTimeout(() => {
-                  isMutationRefreshingSession = false;
-                }, 1000);
-                window.location.href = `/refresh-session?redirect=${encodeURIComponent(currentUrl)}`;
+                logger.info("Mutation initiating refresh redirect to:", currentUrl);
+
+                sessionRefreshRedirect = new Promise<void>((resolve) => {
+                  setTimeout(() => {
+                    window.location.href = `/refresh-session?redirect=${encodeURIComponent(currentUrl)}`;
+                    resolve();
+                  }, 100);
+                });
+
+                sessionRefreshRedirect.finally(() => {
+                  setTimeout(() => {
+                    sessionRefreshRedirect = null;
+                  }, 1000);
+                });
+              } else {
+                logger.info("Mutation: refresh redirect already in progress, waiting...");
+                await sessionRefreshRedirect;
               }
+
               throw new Error("SESSION_REFRESH_REQUIRED");
             }
           } catch (parseError) {}
         }
-        
+
         throw error;
       }
     },