fix: prevent vendor redirect to /tenant on hard refresh
All checks were successful
CI / build (push) Successful in 1m6s
CI / docker (push) Successful in 42s

RequireScope and LandingRedirect now wait for scopesReady flag before
evaluating, preventing the race where org-scoped tokens load before
global tokens and the vendor gets incorrectly redirected.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
hsiegeln
2026-04-10 19:16:46 +02:00
parent 22752ffcb1
commit a3a6f99958
3 changed files with 10 additions and 6 deletions

View File

@@ -12,6 +12,7 @@ interface OrgState {
currentTenantId: string | null; // DB UUID — used for API calls like /api/tenants/{id}
organizations: OrgInfo[];
scopes: Set<string>;
scopesReady: boolean; // true once OrgResolver has finished loading scopes
username: string | null;
setCurrentOrg: (orgId: string | null) => void;
setOrganizations: (orgs: OrgInfo[]) => void;
@@ -24,6 +25,7 @@ export const useOrgStore = create<OrgState>((set, get) => ({
currentTenantId: null,
organizations: [],
scopes: new Set(),
scopesReady: false,
username: null,
setUsername: (name) => set({ username: name }),
setCurrentOrg: (orgId) => {
@@ -39,5 +41,5 @@ export const useOrgStore = create<OrgState>((set, get) => ({
currentTenantId: match?.tenantId ?? get().currentTenantId,
});
},
setScopes: (scopes) => set({ scopes }),
setScopes: (scopes) => set({ scopes, scopesReady: true }),
}));

View File

@@ -1,4 +1,5 @@
import { useScopes } from '../auth/useScopes';
import { useOrgStore } from '../auth/useOrganization';
interface Props {
scope: string;
@@ -8,6 +9,8 @@ interface Props {
export function RequireScope({ scope, children, fallback }: Props) {
const scopes = useScopes();
const scopesReady = useOrgStore((s) => s.scopesReady);
if (!scopesReady) return null; // Still loading — don't redirect yet
if (!scopes.has(scope)) return fallback ? <>{fallback}</> : null;
return <>{children}</>;
}

View File

@@ -22,13 +22,12 @@ import { TenantAuditPage } from './pages/tenant/TenantAuditPage';
function LandingRedirect() {
const scopes = useScopes();
const { organizations, currentOrgId } = useOrgStore();
const { organizations, currentOrgId, scopesReady } = useOrgStore();
const currentOrg = organizations.find((o) => o.id === currentOrgId);
// Wait for scopes to be resolved — they're loaded async by OrgResolver.
// An empty set means "not yet loaded" (even viewer gets observe:read).
if (scopes.size === 0) {
return null; // OrgResolver is still fetching tokens
// Wait for scopes to be fully resolved by OrgResolver before redirecting.
if (!scopesReady) {
return null;
}
// Vendor → vendor console