From bf157687d4ae4c71ba4ceca3dcda8aaec62da9b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Faleiros?= <cauefaleiros@gmail.com>
Date: Wed, 11 Mar 2026 15:33:38 -0300
Subject: [PATCH] fix: resolve race conditions during impersonation handoff by
 reloading directly from dataService

---
 components/Layout.tsx   | 5 +----
 pages/SuperAdmin.tsx    | 3 ---
 services/dataService.ts | 7 +++++++
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/components/Layout.tsx b/components/Layout.tsx
index 5382c88..9aa626d 100644
--- a/components/Layout.tsx
+++ b/components/Layout.tsx
@@ -216,10 +216,7 @@ export const Layout: React.FC<{ children: React.ReactNode }> = ({ children }) =>
             {localStorage.getItem('ctms_super_admin_token') && (
               <button
                 onClick={() => {
-                  if (returnToSuperAdmin()) {
-                    window.location.hash = '#/super-admin';
-                    window.location.reload();
-                  }
+                  returnToSuperAdmin();
                 }}
                 className="w-full flex items-center justify-center gap-2 py-2 px-3 bg-zinc-900 dark:bg-brand-yellow text-white dark:text-zinc-950 rounded-lg text-xs font-bold hover:opacity-90 transition-colors"
               >
diff --git a/pages/SuperAdmin.tsx b/pages/SuperAdmin.tsx
index 19cb0da..4889a4c 100644
--- a/pages/SuperAdmin.tsx
+++ b/pages/SuperAdmin.tsx
@@ -100,9 +100,6 @@ export const SuperAdmin: React.FC = () => {
         return;
       }
       await impersonateTenant(tenantId);
-      // Force a full reload to clear any cached context/state in the React app
-      window.location.hash = '#/';
-      window.location.reload(); 
     } catch (err: any) {
       alert(err.message || 'Erro ao tentar entrar na organização.');
     }
diff --git a/services/dataService.ts b/services/dataService.ts
index 2686600..6da81c4 100644
--- a/services/dataService.ts
+++ b/services/dataService.ts
@@ -410,6 +410,10 @@ export const impersonateTenant = async (tenantId: string): Promise<any> => {
   localStorage.setItem('ctms_token', data.token);
   localStorage.setItem('ctms_user_id', data.user.id);
   localStorage.setItem('ctms_tenant_id', data.user.tenant_id || '');
+  
+  window.location.hash = '#/';
+  window.location.reload();
+  
   return data;
 };
 
@@ -434,6 +438,9 @@ export const returnToSuperAdmin = (): boolean => {
       localStorage.setItem('ctms_user_id', payload.id);
       localStorage.setItem('ctms_tenant_id', payload.tenant_id || 'system');
       localStorage.removeItem('ctms_super_admin_token');
+      
+      window.location.hash = '#/super-admin';
+      window.location.reload();
       return true;
     } catch (e) {
       console.error("Failed to restore super admin token", e);