blyzer/fasto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve race conditions during impersonation handoff by reloading directly from dataService

Browse Source
This commit is contained in:
Cauê Faleiros
2026-03-11 15:33:38 -03:00
parent 7cb78f13c0
commit bf157687d4
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/Layout.tsx
View File

@@ -216,10 +216,7 @@ export const Layout: React.FC<{ children: React.ReactNode }> = ({ children }) =>
{localStorage.getItem('ctms_super_admin_token') && ( {localStorage.getItem('ctms_super_admin_token') && (
<button <button
onClick={() => { onClick={() => {
if (returnToSuperAdmin()) { returnToSuperAdmin();
window.location.hash = '#/super-admin';
window.location.reload();
}
}} }}
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" 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"
> >

3
pages/SuperAdmin.tsx
View File

@@ -100,9 +100,6 @@ export const SuperAdmin: React.FC = () => {
return; return;
} }
await impersonateTenant(tenantId); 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) { } catch (err: any) {
alert(err.message || 'Erro ao tentar entrar na organização.'); alert(err.message || 'Erro ao tentar entrar na organização.');
} }

7
services/dataService.ts
View File

@@ -410,6 +410,10 @@ export const impersonateTenant = async (tenantId: string): Promise<any> => {
localStorage.setItem('ctms_token', data.token); localStorage.setItem('ctms_token', data.token);
localStorage.setItem('ctms_user_id', data.user.id); localStorage.setItem('ctms_user_id', data.user.id);
localStorage.setItem('ctms_tenant_id', data.user.tenant_id || ''); localStorage.setItem('ctms_tenant_id', data.user.tenant_id || '');
window.location.hash = '#/';
window.location.reload();
return data; return data;
}; };
@@ -434,6 +438,9 @@ export const returnToSuperAdmin = (): boolean => {
localStorage.setItem('ctms_user_id', payload.id); localStorage.setItem('ctms_user_id', payload.id);
localStorage.setItem('ctms_tenant_id', payload.tenant_id || 'system'); localStorage.setItem('ctms_tenant_id', payload.tenant_id || 'system');
localStorage.removeItem('ctms_super_admin_token'); localStorage.removeItem('ctms_super_admin_token');
window.location.hash = '#/super-admin';
window.location.reload();
return true; return true;
} catch (e) { } catch (e) {
console.error("Failed to restore super admin token", e); console.error("Failed to restore super admin token", e);