fix(settings): harden loading and session boundaries

Author: waleedlatif1

apps/sim/app/api/organizations/[id]/billing-summary/route.test.ts

@@ -0,0 +1,98 @@
+/**
+ * @vitest-environment node
+ */
+import { authMockFns, createMockRequest } from '@sim/testing'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ForbiddenOperationError } from '@/lib/core/application'
+
+const { mockReadBillingSummary } = vi.hoisted(() => ({
+  mockReadBillingSummary: vi.fn(),
+}))
+
+vi.mock(
+  '@/lib/billing/application/organization-billing-summary/get-organization-billing-summary',
+  () => ({
+    getOrganizationBillingSummary: {
+      operation: { id: 'organization_billing.summary.read' },
+      execute: mockReadBillingSummary,
+    },
+  })
+)
+
+import { GET } from '@/app/api/organizations/[id]/billing-summary/route'
+
+const routeContext = { params: Promise.resolve({ id: 'organization-1' }) }
+const summary = {
+  organizationId: 'organization-1',
+  subscriptionState: 'active' as const,
+  subscriptionPlan: 'team',
+  subscriptionStatus: 'active',
+  creditBalance: 10,
+  billingInterval: 'month' as const,
+  cancelAtPeriodEnd: false,
+  totalSeats: 3,
+  totalCurrentUsage: 25,
+  totalUsageLimit: 100,
+  minimumBillingAmount: 60,
+  billingPeriodEnd: '2026-09-30T00:00:00.000Z',
+  billingBlocked: false,
+  billingBlockedReason: null,
+  blockedByOrgOwner: false,
+  upgradeWorkspaceId: 'workspace-1',
+  userRole: 'admin' as const,
+}
+
+describe('GET /api/organizations/[id]/billing-summary', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    authMockFns.mockGetSession.mockResolvedValue({
+      user: { id: 'user-1' },
+      session: { id: 'session-1' },
+    })
+    mockReadBillingSummary.mockResolvedValue(summary)
+  })
+
+  it('rejects an unauthenticated request before the protected read runs', async () => {
+    authMockFns.mockGetSession.mockResolvedValue(null)
+
+    const response = await GET(createMockRequest('GET'), routeContext)
+
+    expect(response.status).toBe(401)
+    expect(mockReadBillingSummary).not.toHaveBeenCalled()
+  })
+
+  it('projects an authorization refusal without exposing billing data', async () => {
+    mockReadBillingSummary.mockRejectedValue(
+      new ForbiddenOperationError(
+        'ORGANIZATION_ADMIN_REQUIRED',
+        'Organization admin or owner authority is required to read billing information'
+      )
+    )
+
+    const response = await GET(createMockRequest('GET'), routeContext)
+
+    expect(response.status).toBe(403)
+    const body = await response.json()
+    expect(body).toEqual({
+      error: 'Organization admin or owner authority is required to read billing information',
+    })
+    expect(body).not.toHaveProperty('data')
+  })
+
+  it('maps the authenticated viewer and route organization into the semantic read', async () => {
+    const response = await GET(createMockRequest('GET'), routeContext)
+
+    expect(response.status).toBe(200)
+    await expect(response.json()).resolves.toEqual({ success: true, data: summary })
+    expect(mockReadBillingSummary).toHaveBeenCalledWith(
+      expect.objectContaining({
+        principal: {
+          kind: 'session',
+          userId: 'user-1',
+          sessionId: 'session-1',
+        },
+        input: { organizationId: 'organization-1' },
+      })
+    )
+  })
+})

apps/sim/app/workspace/[workspaceId]/components/impersonation-banner/impersonation-banner.tsx

@@ -38,7 +38,7 @@ export function ImpersonationBanner() {
           },
           onSuccess: async () => {
             setIsRedirecting(true)
-            await clearUserData()
+            await clearUserData({ preserveRecentImpersonations: true })
             window.location.assign('/workspace')
           },
         })

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/tool-permission-card.tsx

@@ -16,7 +16,7 @@ import { createLogger } from '@sim/logger'
 import { useQueryClient } from '@tanstack/react-query'
 import { requestJson } from '@/lib/api/client/request'
 import { copilotToolPermissionContract } from '@/lib/api/contracts/copilot'
-import { generalSettingsKeys } from '@/hooks/queries/general-settings'
+import { generalSettingsKeys } from '@/hooks/queries/general-settings-data'
 import { useToolPermissionStore } from '@/stores/tool-permission/store'
 
 const logger = createLogger('ToolPermissionCard')

apps/sim/app/workspace/[workspaceId]/prefetch.ts

@@ -19,7 +19,7 @@ import {
   mapUserProfileResponse,
   USER_PROFILE_STALE_TIME,
   userProfileKeys,
-} from '@/hooks/queries/user-profile'
+} from '@/hooks/queries/user-profile-data'
 import { workflowKeys } from '@/hooks/queries/utils/workflow-keys'
 import { mapWorkflow, WORKFLOW_LIST_STALE_TIME } from '@/hooks/queries/utils/workflow-list-query'
 import { normalizeWorkspacesResponse } from '@/hooks/queries/utils/workspace-list-query'

apps/sim/app/workspace/[workspaceId]/settings/[section]/page.tsx

@@ -58,7 +58,6 @@ export default async function WorkspaceSettingsSectionPage({
   const sectionPrefetch =
     SECTION_PREFETCHERS[parsed]?.(queryClient, {
       workspaceId,
-      userId: session.user.id,
     }) ?? Promise.resolve()
 
   await sectionPrefetch

apps/sim/app/workspace/[workspaceId]/settings/[section]/prefetch.test.ts

@@ -4,14 +4,14 @@
 import { QueryClient } from '@tanstack/react-query'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-const { mockGetUserSettings, mockExecute, mockAuthenticate } = vi.hoisted(() => ({
-  mockGetUserSettings: vi.fn(),
+const { mockGetCurrentUserSettings, mockExecute, mockAuthenticate } = vi.hoisted(() => ({
+  mockGetCurrentUserSettings: vi.fn(),
   mockExecute: vi.fn(),
   mockAuthenticate: vi.fn(),
 }))
 
-vi.mock('@/lib/users/queries', () => ({
-  getUserSettings: mockGetUserSettings,
+vi.mock('@/lib/users/application/read-current-user', () => ({
+  getCurrentUserSettingsUseCase: { execute: mockGetCurrentUserSettings },
 }))
 
 vi.mock('@/lib/credential-groups/application/manage-groups', () => ({
@@ -21,17 +21,22 @@ vi.mock('@/lib/credential-groups/application/manage-groups', () => ({
 vi.mock('@/lib/api/server/routes/internal-json-route', () => ({
   internalSessionAuth: { authenticate: mockAuthenticate },
 }))
+vi.mock('@/lib/api/server/routes', () => ({
+  internalSessionAuth: { authenticate: mockAuthenticate },
+}))
 
-import {
-  prefetchGeneralSettings,
-  SECTION_PREFETCHERS,
-} from '@/app/workspace/[workspaceId]/settings/[section]/prefetch'
-import { generalSettingsKeys } from '@/hooks/queries/general-settings'
+import { SECTION_PREFETCHERS } from '@/app/workspace/[workspaceId]/settings/[section]/prefetch'
+import { generalSettingsKeys } from '@/hooks/queries/general-settings-data'
 import { credentialGroupKeys } from '@/hooks/queries/utils/credential-group-queries'
 
-describe('prefetchGeneralSettings', () => {
-  it('uses the authenticated viewer id supplied by the route', async () => {
-    mockGetUserSettings.mockResolvedValue({
+describe('general settings prefetch', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockAuthenticate.mockResolvedValue({ kind: 'session', userId: 'viewer-a', sessionId: 's1' })
+  })
+
+  it('hydrates through the current-user application operation and response contract', async () => {
+    mockGetCurrentUserSettings.mockResolvedValue({
       autoConnect: true,
       superUserModeEnabled: false,
       mothershipEnvironment: 'prod',
@@ -47,9 +52,12 @@ describe('prefetchGeneralSettings', () => {
     })
     const queryClient = new QueryClient()
 
-    await prefetchGeneralSettings(queryClient, 'viewer-a')
+    await SECTION_PREFETCHERS.general?.(queryClient, { workspaceId: 'workspace-a' })
 
-    expect(mockGetUserSettings).toHaveBeenCalledWith('viewer-a')
+    expect(mockGetCurrentUserSettings).toHaveBeenCalledWith({
+      principal: { kind: 'session', userId: 'viewer-a', sessionId: 's1' },
+      input: {},
+    })
     expect(queryClient.getQueryData(generalSettingsKeys.settings())).toMatchObject({
       theme: 'system',
       telemetryEnabled: true,
@@ -82,7 +90,6 @@ describe('credential-groups prefetch', () => {
 
     await SECTION_PREFETCHERS['credential-groups']?.(queryClient, {
       workspaceId: 'w1',
-      userId: 'u1',
     })
 
     expect(mockExecute).toHaveBeenCalledWith({
@@ -106,7 +113,6 @@ describe('credential-groups prefetch', () => {
 
     await SECTION_PREFETCHERS['credential-groups']?.(queryClient, {
       workspaceId: 'w1',
-      userId: 'u1',
     })
 
     expect(queryClient.getQueryData(credentialGroupKeys.list('w1'))).toBeUndefined()
@@ -118,7 +124,6 @@ describe('credential-groups prefetch', () => {
 
     await SECTION_PREFETCHERS['credential-groups']?.(queryClient, {
       workspaceId: 'w1',
-      userId: 'u1',
     })
 
     expect(mockExecute).not.toHaveBeenCalled()

apps/sim/app/workspace/[workspaceId]/settings/[section]/prefetch.ts

@@ -2,30 +2,13 @@ import type { QueryClient } from '@tanstack/react-query'
 import { listCredentialGroupsContract } from '@/lib/api/contracts/credential-groups'
 import { internalSessionAuth } from '@/lib/api/server/routes/internal-json-route'
 import { listCredentialGroupSettings } from '@/lib/credential-groups/application/manage-groups'
-import { getUserSettings } from '@/lib/users/queries'
+import { prefetchCurrentUserSettings } from '@/lib/settings/prefetch-current-user-settings'
 import type { SettingsSection } from '@/app/workspace/[workspaceId]/settings/navigation'
-import {
-  GENERAL_SETTINGS_STALE_TIME,
-  generalSettingsKeys,
-  mapGeneralSettingsResponse,
-} from '@/hooks/queries/general-settings'
 import {
   CREDENTIAL_GROUP_LIST_STALE_TIME,
   credentialGroupKeys,
 } from '@/hooks/queries/utils/credential-group-queries'
 
-/** Prefetches the same key and mapped value as `useGeneralSettings`. */
-export function prefetchGeneralSettings(queryClient: QueryClient, userId: string) {
-  return queryClient.prefetchQuery({
-    queryKey: generalSettingsKeys.settings(),
-    queryFn: async () => {
-      const data = await getUserSettings(userId)
-      return mapGeneralSettingsResponse(data)
-    },
-    staleTime: GENERAL_SETTINGS_STALE_TIME,
-  })
-}
-
 /** Prefetches credential groups through the route's authorization and response boundaries. */
 async function prefetchCredentialGroups(
   queryClient: QueryClient,
@@ -53,7 +36,6 @@ async function prefetchCredentialGroups(
 
 export interface SettingsSectionPrefetchContext {
   workspaceId: string
-  userId: string
 }
 
 /**
@@ -67,8 +49,8 @@ export const SECTION_PREFETCHERS: Partial<
     (queryClient: QueryClient, context: SettingsSectionPrefetchContext) => Promise<unknown>
   >
 > = {
-  general: (queryClient, { userId }) => prefetchGeneralSettings(queryClient, userId),
-  billing: (queryClient, { userId }) => prefetchGeneralSettings(queryClient, userId),
-  admin: (queryClient, { userId }) => prefetchGeneralSettings(queryClient, userId),
+  general: (queryClient) => prefetchCurrentUserSettings(queryClient),
+  billing: (queryClient) => prefetchCurrentUserSettings(queryClient),
+  admin: (queryClient) => prefetchCurrentUserSettings(queryClient),
   'credential-groups': prefetchCredentialGroups,
 }

apps/sim/app/workspace/[workspaceId]/settings/components/admin/admin.tsx

@@ -157,7 +157,7 @@ export function Admin() {
         },
         onSuccess: async () => {
           recordImpersonation(email)
-          await clearUserData()
+          await clearUserData({ preserveRecentImpersonations: true })
           window.location.assign('/workspace')
         },
       }

apps/sim/app/workspace/[workspaceId]/settings/components/billing/billing.test.tsx

@@ -2,6 +2,7 @@
  * @vitest-environment jsdom
  */
 import { act, type ReactNode } from 'react'
+import { getErrorMessage } from '@sim/utils/errors'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
@@ -186,6 +187,24 @@ vi.mock('@/app/workspace/[workspaceId]/settings/components/settings-empty-state'
       {children}
     </div>
   ),
+  SettingsQueryErrorState: ({
+    error,
+    fallback,
+    isRetrying,
+    onRetry,
+  }: {
+    error: unknown
+    fallback: string
+    isRetrying: boolean
+    onRetry: () => void
+  }) => (
+    <div data-testid='settings-empty-state' data-tone='error'>
+      {getErrorMessage(error, fallback)}
+      <button type='button' disabled={isRetrying} onClick={onRetry}>
+        {isRetrying ? 'Retrying…' : 'Try again'}
+      </button>
+    </div>
+  ),
 }))
 
 vi.mock(
@@ -432,11 +451,14 @@ describe('Billing payer scope', () => {
   })
 
   it('renders the canonical error state when the active billing query fails', async () => {
+    const refetch = vi.fn().mockResolvedValue(undefined)
     mockPersonalQuery.current = {
       data: undefined,
       error: new Error('Billing temporarily unavailable'),
+      isFetchedAfterMount: true,
+      isFetching: false,
       isLoading: false,
-      refetch: vi.fn(),
+      refetch,
     }
 
     await act(async () => {
@@ -445,7 +467,26 @@ describe('Billing payer scope', () => {
 
     const errorState = container.querySelector('[data-testid="settings-empty-state"]')
     expect(errorState).toHaveAttribute('data-tone', 'error')
-    expect(errorState?.textContent).toBe('Billing temporarily unavailable')
+    expect(errorState?.textContent).toContain('Billing temporarily unavailable')
+    expect(errorState?.textContent).toContain('Try again')
+
+    act(() => {
+      errorState?.querySelector('button')?.click()
+    })
+    expect(refetch).toHaveBeenCalledOnce()
+
+    mockPersonalQuery.current = {
+      data: undefined,
+      error: null,
+      isFetchedAfterMount: true,
+      isFetching: true,
+      isLoading: true,
+      refetch,
+    }
+    await act(async () => root.render(<Billing scope='account' />))
+    expect(container.textContent).toContain('Failed to load billing information')
+    expect(container.textContent).toContain('Retrying…')
+    expect(container.querySelector('button')).toBeDisabled()
   })
 
   it('keeps cached billing content visible when a background refresh fails', async () => {
@@ -478,6 +519,7 @@ describe('Billing payer scope', () => {
 
     const errorState = container.querySelector('[data-testid="settings-empty-state"]')
     expect(errorState).toHaveAttribute('data-tone', 'error')
-    expect(errorState?.textContent).toBe('Failed to load billing information')
+    expect(errorState?.textContent).toContain('Failed to load billing information')
+    expect(errorState?.textContent).toContain('Try again')
   })
 })