@jmruthers/pace-core 0.5.181 → 0.5.183

package/src/rbac/__tests__/scenarios.user-role.test.tsx

@@ -3,8 +3,69 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { render, screen, waitFor, act } from '@testing-library/react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { createMemoryRouter, RouterProvider } from 'react-router-dom';
-import { UnifiedAuthProvider } from '../../providers/UnifiedAuthProvider';
-import { OrganisationProvider } from '../../providers/OrganisationProvider';
+import { UnifiedAuthProvider } from '../../providers/services/UnifiedAuthProvider';
+import { OrganisationServiceProvider } from '../../providers/services/OrganisationServiceProvider';
+import type { SupabaseClient } from '@supabase/supabase-js';
+
+// Hoist mockSupabaseClient before mocks that reference it
+const mockSupabaseClient = vi.hoisted(() => ({
+  auth: {
+    getUser: vi.fn(),
+  },
+  from: vi.fn(),
+  rpc: vi.fn(),
+} as unknown as SupabaseClient));
+
+// Mock all service hooks used by UnifiedAuthProvider
+vi.mock('../../hooks/services/useAuthService', () => ({
+  useAuthService: () => ({
+    getUser: vi.fn(() => ({ id: 'user-123', email: 'test@example.com' })),
+    getSession: vi.fn(() => ({ access_token: 'token' })),
+    isLoading: vi.fn(() => false),
+    getError: vi.fn(() => null),
+    getSupabaseClient: vi.fn(() => mockSupabaseClient),
+    signIn: vi.fn(),
+    signUp: vi.fn(),
+    signOut: vi.fn(),
+    resetPassword: vi.fn(),
+    updatePassword: vi.fn(),
+    refreshSession: vi.fn(),
+  }),
+}));
+
+vi.mock('../../hooks/services/useEventService', () => ({
+  useEventService: () => ({
+    getEvents: vi.fn(() => []),
+    getSelectedEvent: vi.fn(() => null),
+    isLoading: vi.fn(() => false),
+    getError: vi.fn(() => null),
+    setSelectedEvent: vi.fn(),
+    refreshEvents: vi.fn(),
+  }),
+}));
+
+vi.mock('../../hooks/services/useInactivityService', () => ({
+  useInactivityService: () => ({
+    getShowInactivityWarning: vi.fn(() => false),
+    getInactivityTimeRemaining: vi.fn(() => 0),
+    isIdle: vi.fn(() => false),
+    getTimeRemaining: vi.fn(() => 0),
+    isWarningShown: vi.fn(() => false),
+    isTracking: vi.fn(() => false),
+    resetActivity: vi.fn(),
+    startTracking: vi.fn(),
+    stopTracking: vi.fn(),
+    handleIdleLogout: vi.fn(),
+  }),
+}));
+
+vi.mock('../../hooks/useSessionRestoration', () => ({
+  useSessionRestoration: () => ({
+    isRestoring: false,
+    restorationError: null,
+  }),
+}));
+
 // Note: RBACProvider was removed as part of Phase 1 - use useRBAC() hook instead
 vi.mock('../hooks/useRBAC', () => ({
   useRBAC: () => ({
@@ -27,7 +88,7 @@ import { useCan, useAccessLevel, useHasAnyPermission, useHasAllPermissions } fro
 import { useCachedPermissions } from '../hooks';
 import { usePermissionCache } from '../../hooks/usePermissionCache';
 import { useOrganisationPermissions } from '../../hooks/useOrganisationPermissions';
-import type { SupabaseClient, User } from '@supabase/supabase-js';
+import type { User } from '@supabase/supabase-js';
 import type { Organisation } from '../../types/organisation';
 import type { AccessLevel } from '../types/access';
 
@@ -61,23 +122,46 @@ vi.mock('../../hooks/useOrganisationSecurity', () => ({
     isOrganisationLoaded: true,
   })
 }));
-vi.mock('../../providers/OrganisationProvider', () => ({
-  OrganisationProvider: ({ children }: any) => children,
-  useOrganisations: () => ({
-    selectedOrganisation: { id: 'org-123', name: 'Test Organisation' },
-    isOrganisationLoaded: true,
-    isLoading: false,
-    error: null,
-  })
+
+// Hoist mockOrganisationService before mocks that reference it
+const mockOrganisationService = vi.hoisted(() => ({
+  getSelectedOrganisation: vi.fn(() => ({ id: 'org-123', name: 'Test Organisation' })),
+  getOrganisations: vi.fn(() => [{ id: 'org-123', name: 'Test Organisation' }]),
+  getUserMemberships: vi.fn(() => []),
+  isLoading: vi.fn(() => false),
+  getError: vi.fn(() => null),
+  hasValidOrganisationContext: vi.fn(() => true),
+  isContextReady: vi.fn(() => true),
+  setSelectedOrganisation: vi.fn(),
+  switchOrganisation: vi.fn().mockResolvedValue(undefined),
+  getUserRole: vi.fn(() => 'member'),
+  validateOrganisationAccess: vi.fn(() => true),
+  ensureOrganisationContext: vi.fn(() => ({ id: 'org-123', name: 'Test Organisation' })),
+  refreshOrganisations: vi.fn().mockResolvedValue(undefined),
+  getPrimaryOrganisation: vi.fn(() => ({ id: 'org-123', name: 'Test Organisation' })),
+  isOrganisationSecure: vi.fn(() => true),
+  subscribe: vi.fn(() => () => {}),
+  initialize: vi.fn().mockResolvedValue(undefined),
+  cleanup: vi.fn(),
+  updateDependencies: vi.fn(),
 }));
 
-const mockSupabaseClient = {
-  auth: {
-    getUser: vi.fn(),
-  },
-  from: vi.fn(),
-  rpc: vi.fn(),
-} as unknown as SupabaseClient;
+vi.mock('../../hooks/services/useOrganisationService', () => ({
+  useOrganisationService: () => mockOrganisationService,
+}));
+
+// Mock OrganisationServiceProvider with context
+vi.mock('../../providers/services/OrganisationServiceProvider', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../providers/services/OrganisationServiceProvider')>();
+  return {
+    ...actual,
+    OrganisationServiceProvider: ({ children }: any) => (
+      <actual.OrganisationServiceContext.Provider value={{ organisationService: mockOrganisationService }}>
+        {children}
+      </actual.OrganisationServiceContext.Provider>
+    ),
+  };
+});
 
 const mockUser: User = {
   id: 'user-123',
@@ -142,10 +226,10 @@ const Wrapper = ({ children }: { children: React.ReactNode }) => {
   });
   return (
     <QueryClientProvider client={queryClient}>
-      <UnifiedAuthProvider supabase={mockSupabaseClient}>
-        <OrganisationProvider>
+      <UnifiedAuthProvider supabaseClient={mockSupabaseClient} appName="TEST_APP" idleTimeoutMs={30000} warnBeforeMs={5000} onIdleLogout={() => {}}>
+        <OrganisationServiceProvider supabaseClient={mockSupabaseClient} user={null} session={null}>
           {children}
-        </OrganisationProvider>
+        </OrganisationServiceProvider>
       </UnifiedAuthProvider>
     </QueryClientProvider>
   );

package/src/rbac/adapters.tsx

@@ -12,7 +12,7 @@ import { UUID, Permission } from './types';
 import { useCan } from './hooks';
 import { rbacCache, RBACCache } from './cache';
 import { getRBACLogger } from './config';
-import { useUnifiedAuth } from '../providers/UnifiedAuthProvider';
+import { useUnifiedAuth } from '../providers/services/UnifiedAuthProvider';
 
 // ============================================================================
 // REACT COMPONENTS

package/src/rbac/api.ts

@@ -43,18 +43,34 @@ export function setupRBAC(supabase: SupabaseClient<Database>, config?: Partial<R
   const logger = getRBACLogger();
   
   // Create full config
+  const isDevelopment = import.meta.env.MODE === 'development';
   const fullConfig: RBACConfig = {
     supabase,
-    debug: import.meta.env.MODE === 'development',
+    debug: isDevelopment,
     logLevel: 'warn',
-    developmentMode: import.meta.env.MODE === 'development',
+    developmentMode: isDevelopment,
     ...config,
   };
   
   createRBACConfig(fullConfig);
   
-  // Pass security config to engine if provided
-  globalEngine = createRBACEngine(supabase, config?.security);
+  // Automatically disable rate limiting in development mode unless explicitly overridden
+  // Apply default first, then let explicit config override it
+  // Pass undefined if no config provided and not in development, otherwise create security config
+  const securityConfig = 
+    config === undefined && !isDevelopment
+      ? undefined
+      : {
+          // Default: disable rate limiting in development
+          ...(isDevelopment && config?.security?.enableRateLimiting === undefined
+            ? { enableRateLimiting: false }
+            : {}),
+          // Explicit config overrides defaults
+          ...config?.security,
+        };
+  
+  // Pass security config to engine
+  globalEngine = createRBACEngine(supabase, securityConfig);
   
   // Setup audit manager
   const auditManager = createAuditManager(supabase);

package/src/rbac/audit-enhanced.ts

@@ -15,6 +15,7 @@ import {
   AuditEventSource, 
   RBACAuditEvent 
 } from './types';
+import type { AuditEventType } from './types/functions';
 import { logger } from '../utils/core/logger';
 
 /**
@@ -299,10 +300,32 @@ export class EnhancedRBACAuditManager {
       .limit(limit);
 
     if (error) {
+      // Detect CORS errors (they typically have null status or specific error codes)
+      const isCorsError = 
+        error.message?.toLowerCase().includes('cors') ||
+        error.message?.toLowerCase().includes('cross-origin') ||
+        error.code === null ||
+        (error as any).status === null;
+      
+      if (isCorsError) {
+        const corsError = new Error(
+          `CORS error when querying audit events. This is a Supabase configuration issue. ` +
+          `Please configure CORS in your Supabase Dashboard: Settings → API → CORS. ` +
+          `Add your app's origin (e.g., http://localhost:8087) to the allowed origins list. ` +
+          `Original error: ${error.message || 'CORS request did not succeed'}`
+        );
+        (corsError as any).isCorsError = true;
+        (corsError as any).originalError = error;
+        throw corsError;
+      }
+      
       throw new Error(`Failed to get audit events: ${error.message}`);
     }
 
-    return data || [];
+    return (data || []).map(event => ({
+      ...event,
+      event_type: event.event_type as AuditEventType
+    })) as RBACAuditEvent[];
   }
 
   /**
@@ -321,10 +344,32 @@ export class EnhancedRBACAuditManager {
       .limit(limit);
 
     if (error) {
+      // Detect CORS errors (they typically have null status or specific error codes)
+      const isCorsError = 
+        error.message?.toLowerCase().includes('cors') ||
+        error.message?.toLowerCase().includes('cross-origin') ||
+        error.code === null ||
+        (error as any).status === null;
+      
+      if (isCorsError) {
+        const corsError = new Error(
+          `CORS error when querying audit events. This is a Supabase configuration issue. ` +
+          `Please configure CORS in your Supabase Dashboard: Settings → API → CORS. ` +
+          `Add your app's origin (e.g., http://localhost:8087) to the allowed origins list. ` +
+          `Original error: ${error.message || 'CORS request did not succeed'}`
+        );
+        (corsError as any).isCorsError = true;
+        (corsError as any).originalError = error;
+        throw corsError;
+      }
+      
       throw new Error(`Failed to get audit events: ${error.message}`);
     }
 
-    return data || [];
+    return (data || []).map(event => ({
+      ...event,
+      event_type: event.event_type as AuditEventType
+    })) as RBACAuditEvent[];
   }
 }
 

package/src/rbac/audit.ts

@@ -14,6 +14,7 @@ import {
   AuditEventSource, 
   RBACAuditEvent 
 } from './types';
+import type { AuditEventType } from './types/functions';
 import { logger } from '../utils/core/logger';
 
 /**
@@ -337,10 +338,32 @@ export class RBACAuditManager {
       .limit(limit);
 
     if (error) {
+      // Detect CORS errors (they typically have null status or specific error codes)
+      const isCorsError = 
+        error.message?.toLowerCase().includes('cors') ||
+        error.message?.toLowerCase().includes('cross-origin') ||
+        error.code === null ||
+        (error as any).status === null;
+      
+      if (isCorsError) {
+        const corsError = new Error(
+          `CORS error when querying audit events. This is a Supabase configuration issue. ` +
+          `Please configure CORS in your Supabase Dashboard: Settings → API → CORS. ` +
+          `Add your app's origin (e.g., http://localhost:8087) to the allowed origins list. ` +
+          `Original error: ${error.message || 'CORS request did not succeed'}`
+        );
+        (corsError as any).isCorsError = true;
+        (corsError as any).originalError = error;
+        throw corsError;
+      }
+      
       throw new Error(`Failed to get audit events: ${error.message}`);
     }
 
-    return data || [];
+    return (data || []).map(event => ({
+      ...event,
+      event_type: event.event_type as AuditEventType
+    })) as RBACAuditEvent[];
   }
 
   /**
@@ -359,10 +382,32 @@ export class RBACAuditManager {
       .limit(limit);
 
     if (error) {
+      // Detect CORS errors (they typically have null status or specific error codes)
+      const isCorsError = 
+        error.message?.toLowerCase().includes('cors') ||
+        error.message?.toLowerCase().includes('cross-origin') ||
+        error.code === null ||
+        (error as any).status === null;
+      
+      if (isCorsError) {
+        const corsError = new Error(
+          `CORS error when querying audit events. This is a Supabase configuration issue. ` +
+          `Please configure CORS in your Supabase Dashboard: Settings → API → CORS. ` +
+          `Add your app's origin (e.g., http://localhost:8087) to the allowed origins list. ` +
+          `Original error: ${error.message || 'CORS request did not succeed'}`
+        );
+        (corsError as any).isCorsError = true;
+        (corsError as any).originalError = error;
+        throw corsError;
+      }
+      
       throw new Error(`Failed to get audit events: ${error.message}`);
     }
 
-    return data || [];
+    return (data || []).map(event => ({
+      ...event,
+      event_type: event.event_type as AuditEventType
+    })) as RBACAuditEvent[];
   }
 }
 

package/src/rbac/components/NavigationGuard.tsx

@@ -66,7 +66,7 @@
 
 import React, { useMemo, useCallback, useEffect, useState } from 'react';
 import { useMultiplePermissions } from '../hooks/usePermissions';
-import { useUnifiedAuth } from '../../providers/UnifiedAuthProvider';
+import { useUnifiedAuth } from '../../providers/services/UnifiedAuthProvider';
 import { UUID, Permission, Scope } from '../types';
 import { createScopeFromEvent } from '../utils/eventContext';
 import { NavigationItem } from './NavigationProvider';

package/src/rbac/components/NavigationProvider.test.tsx

@@ -11,12 +11,14 @@ import { render, screen, waitFor } from '@testing-library/react';
 import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import React, { ReactNode } from 'react';
 import { NavigationProvider, useNavigationPermissions, NavigationItem } from './NavigationProvider';
-import { useUnifiedAuth } from '../../providers/UnifiedAuthProvider';
+import { useUnifiedAuth } from '../../providers/services/UnifiedAuthProvider';
 import { UUID, Scope, Permission } from '../types';
 
 // Mock the auth provider
-vi.mock('../../providers/UnifiedAuthProvider', () => ({
-  useUnifiedAuth: vi.fn()
+const mockUseUnifiedAuthFn = vi.fn();
+vi.mock('../../providers/services/UnifiedAuthProvider', () => ({
+  useUnifiedAuth: () => mockUseUnifiedAuthFn(),
+  UnifiedAuthProvider: ({ children }: { children: React.ReactNode }) => <>{children}</>,
 }));
 
 // Mock the RBAC hooks
@@ -69,12 +71,11 @@ const TestComponent = ({ children }: { children: ReactNode }) => (
 );
 
 describe('NavigationProvider', () => {
-  const mockUseUnifiedAuth = vi.mocked(useUnifiedAuth);
   const mockUseCan = vi.mocked(useCan);
 
   beforeEach(() => {
     vi.clearAllMocks();
-    mockUseUnifiedAuth.mockReturnValue({
+    mockUseUnifiedAuthFn.mockReturnValue({
       user: mockUser,
       isAuthenticated: true,
       signOut: vi.fn(),
@@ -354,7 +355,7 @@ describe('NavigationProvider', () => {
     });
 
     it('handles missing user context gracefully', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: null,
         isAuthenticated: false,
         signOut: vi.fn(),

package/src/rbac/components/NavigationProvider.tsx

@@ -55,7 +55,7 @@
  */
 
 import React, { createContext, useContext, useState, useCallback, useMemo, useEffect } from 'react';
-import { useUnifiedAuth } from '../../providers/UnifiedAuthProvider';
+import { useUnifiedAuth } from '../../providers/services/UnifiedAuthProvider';
 import { useCan } from '../hooks';
 import { UUID, Scope, Permission } from '../types';
 import { getRBACLogger } from '../config';

package/src/rbac/components/PagePermissionGuard.tsx

@@ -69,7 +69,7 @@
 
 import React, { useMemo, useCallback, useEffect, useState, useRef } from 'react';
 import { useCan } from '../hooks';
-import { useUnifiedAuth } from '../../providers/UnifiedAuthProvider';
+import { useUnifiedAuth } from '../../providers/services/UnifiedAuthProvider';
 import { UUID, Permission, Scope } from '../types';
 import { createScopeFromEvent } from '../utils/eventContext';
 import { getCurrentAppName } from '../../utils/app/appNameResolver';

package/src/rbac/components/PagePermissionProvider.test.tsx

@@ -11,12 +11,14 @@ import { render, screen, waitFor } from '@testing-library/react';
 import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import React, { ReactNode } from 'react';
 import { PagePermissionProvider, usePagePermissions } from './PagePermissionProvider';
-import { useUnifiedAuth } from '../../providers/UnifiedAuthProvider';
+import { useUnifiedAuth } from '../../providers/services/UnifiedAuthProvider';
 import { UUID, Scope, Permission } from '../types';
 
 // Mock the auth provider
-vi.mock('../../providers/UnifiedAuthProvider', () => ({
-  useUnifiedAuth: vi.fn()
+const mockUseUnifiedAuthFn = vi.fn();
+vi.mock('../../providers/services/UnifiedAuthProvider', () => ({
+  useUnifiedAuth: () => mockUseUnifiedAuthFn(),
+  UnifiedAuthProvider: ({ children }: { children: React.ReactNode }) => <>{children}</>,
 }));
 
 // Mock the RBAC hooks
@@ -47,12 +49,11 @@ const TestComponent = ({ children }: { children: ReactNode }) => (
 );
 
 describe('PagePermissionProvider', () => {
-  const mockUseUnifiedAuth = vi.mocked(useUnifiedAuth);
   const mockUseCan = vi.mocked(useCan);
 
   beforeEach(() => {
     vi.clearAllMocks();
-    mockUseUnifiedAuth.mockReturnValue({
+    mockUseUnifiedAuthFn.mockReturnValue({
       user: mockUser,
       isAuthenticated: true,
       signOut: vi.fn(),
@@ -383,7 +384,7 @@ describe('PagePermissionProvider', () => {
     });
 
     it('handles missing user context gracefully', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: null,
         isAuthenticated: false,
         signOut: vi.fn(),

package/src/rbac/components/PagePermissionProvider.tsx

@@ -55,7 +55,7 @@
  */
 
 import React, { createContext, useContext, useState, useCallback, useMemo, useEffect } from 'react';
-import { useUnifiedAuth } from '../../providers/UnifiedAuthProvider';
+import { useUnifiedAuth } from '../../providers/services/UnifiedAuthProvider';
 import { UUID, Scope, Permission } from '../types';
 import { createLogger } from '../../utils/core/logger';
 

package/src/rbac/components/PermissionEnforcer.tsx

@@ -68,7 +68,7 @@
 
 import React, { useMemo, useCallback, useEffect, useState } from 'react';
 import { useMultiplePermissions } from '../hooks/usePermissions';
-import { useUnifiedAuth } from '../../providers/UnifiedAuthProvider';
+import { useUnifiedAuth } from '../../providers/services/UnifiedAuthProvider';
 import { UUID, Permission, Scope } from '../types';
 import { createScopeFromEvent } from '../utils/eventContext';
 import { getRBACLogger } from '../config';

package/src/rbac/components/RoleBasedRouter.tsx

@@ -66,7 +66,7 @@
 import React, { useMemo, useCallback, useEffect, useState, createContext, useContext } from 'react';
 import { useLocation, useNavigate, Outlet } from 'react-router-dom';
 import { useCan } from '../hooks';
-import { useUnifiedAuth } from '../../providers/UnifiedAuthProvider';
+import { useUnifiedAuth } from '../../providers/services/UnifiedAuthProvider';
 import { UUID, Permission, Scope, AccessLevel } from '../types';
 import { getRBACLogger } from '../config';
 

package/src/rbac/components/SecureDataProvider.test.tsx

@@ -11,13 +11,15 @@ import { render, screen, waitFor } from '@testing-library/react';
 import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import React, { ReactNode } from 'react';
 import { SecureDataProvider, useSecureData } from './SecureDataProvider';
-import { useUnifiedAuth } from '../../providers/UnifiedAuthProvider';
+import { useUnifiedAuth } from '../../providers/services/UnifiedAuthProvider';
 import { useSecureDataAccess } from '../../hooks/useSecureDataAccess';
 import { UUID, Scope, Permission } from '../types';
 
 // Mock the auth provider
-vi.mock('../../providers/UnifiedAuthProvider', () => ({
-  useUnifiedAuth: vi.fn()
+const mockUseUnifiedAuthFn = vi.fn();
+vi.mock('../../providers/services/UnifiedAuthProvider', () => ({
+  useUnifiedAuth: () => mockUseUnifiedAuthFn(),
+  UnifiedAuthProvider: ({ children }: { children: React.ReactNode }) => <>{children}</>,
 }));
 
 // Mock the secure data access hook
@@ -53,13 +55,12 @@ const TestComponent = ({ children }: { children: ReactNode }) => (
 );
 
 describe('SecureDataProvider', () => {
-  const mockUseUnifiedAuth = vi.mocked(useUnifiedAuth);
   const mockUseSecureDataAccess = vi.mocked(useSecureDataAccess);
   const mockUseCan = vi.mocked(useCan);
 
   beforeEach(() => {
     vi.clearAllMocks();
-    mockUseUnifiedAuth.mockReturnValue({
+    mockUseUnifiedAuthFn.mockReturnValue({
       user: mockUser,
       isAuthenticated: true,
       signOut: vi.fn(),
@@ -369,7 +370,7 @@ describe('SecureDataProvider', () => {
     });
 
     it('handles missing user context gracefully', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: null,
         isAuthenticated: false,
         signOut: vi.fn(),

package/src/rbac/components/SecureDataProvider.tsx

@@ -57,7 +57,7 @@
  */
 
 import React, { createContext, useContext, useState, useCallback, useMemo, useEffect } from 'react';
-import { useUnifiedAuth } from '../../providers/UnifiedAuthProvider';
+import { useUnifiedAuth } from '../../providers/services/UnifiedAuthProvider';
 import { useSecureDataAccess } from '../../hooks/useSecureDataAccess';
 import { UUID, Scope, Permission } from '../types';
 import { getRBACLogger } from '../config';

package/src/rbac/components/__tests__/EnhancedNavigationMenu.test.tsx

@@ -41,11 +41,13 @@ vi.mock('../../config', () => ({
 
 import { EnhancedNavigationMenu, EnhancedNavigationMenuProps } from '../EnhancedNavigationMenu';
 import { NavigationProvider, NavigationItem, useNavigationPermissions } from '../NavigationProvider';
-import { useUnifiedAuth } from '../../../providers/UnifiedAuthProvider';
+import { useUnifiedAuth } from '../../../providers/services/UnifiedAuthProvider';
 
 // Mock the UnifiedAuthProvider
-vi.mock('../../../providers/UnifiedAuthProvider', () => ({
-  useUnifiedAuth: vi.fn()
+const mockUseUnifiedAuthFn = vi.fn();
+vi.mock('../../../providers/services/UnifiedAuthProvider', () => ({
+  useUnifiedAuth: () => mockUseUnifiedAuthFn(),
+  UnifiedAuthProvider: ({ children }: { children: React.ReactNode }) => <>{children}</>,
 }));
 
 // Mock only the useNavigationPermissions hook, not the provider itself
@@ -76,8 +78,6 @@ vi.mock('../NavigationGuard', () => ({
     return children;
   }
 }));
-
-const mockUseUnifiedAuth = useUnifiedAuth as any;
 const mockUseNavigationPermissions = useNavigationPermissions as any;
 
 // Test data
@@ -147,7 +147,7 @@ describe('EnhancedNavigationMenu', () => {
   beforeEach(() => {
     vi.clearAllMocks();
     
-    mockUseUnifiedAuth.mockReturnValue(mockUser);
+    mockUseUnifiedAuthFn.mockReturnValue(mockUser);
     mockUseNavigationPermissions.mockReturnValue(defaultNavigationPermissions);
     
     // Reset mocks