@jmruthers/pace-core 0.5.181 → 0.5.183

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

@@ -12,7 +12,7 @@ import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { ReactNode } from 'react';
 import { NavigationGuard } from '../NavigationGuard';
 import { useMultiplePermissions } from '../../hooks/usePermissions';
-import { useUnifiedAuth } from '../../../providers/UnifiedAuthProvider';
+import { useUnifiedAuth } from '../../../providers/services/UnifiedAuthProvider';
 import { getRBACLogger } from '../../config';
 
 // Mock the RBAC logger - create shared mock
@@ -44,8 +44,10 @@ vi.mock('../../hooks/usePermissions', () => ({
 }));
 
 // 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 event context utility
@@ -93,14 +95,13 @@ const TestLoading = () => (
 
 describe('NavigationGuard Component', () => {
   const mockUseMultiplePermissions = vi.mocked(useMultiplePermissions);
-  const mockUseUnifiedAuth = vi.mocked(useUnifiedAuth);
   const mockCreateScopeFromEvent = vi.mocked(createScopeFromEvent);
 
   beforeEach(() => {
     vi.clearAllMocks();
     
     // Default mock implementations
-    mockUseUnifiedAuth.mockReturnValue({
+    mockUseUnifiedAuthFn.mockReturnValue({
       user: mockUser,
       selectedOrganisation: { id: 'org-123' },
       selectedEvent: { event_id: 'event-123' },
@@ -396,7 +397,7 @@ describe('NavigationGuard Component', () => {
     });
 
     it('resolves scope from organisation only', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: mockUser,
         selectedOrganisation: { id: 'org-123' },
         selectedEvent: null,
@@ -432,7 +433,7 @@ describe('NavigationGuard Component', () => {
     });
 
     it('resolves scope from event context when organisation not available', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: mockUser,
         selectedOrganisation: null,
         selectedEvent: { event_id: 'event-123' },
@@ -475,7 +476,7 @@ describe('NavigationGuard Component', () => {
     });
 
     it('handles scope resolution errors', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: mockUser,
         selectedOrganisationId: null,
         selectedEventId: 'event-123',
@@ -500,7 +501,7 @@ describe('NavigationGuard Component', () => {
     });
 
     it('handles missing context gracefully', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: mockUser,
         selectedOrganisationId: null,
         selectedEventId: null,
@@ -775,7 +776,7 @@ describe('NavigationGuard Component', () => {
 
   describe('Error Handling', () => {
     it('handles missing user gracefully', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: null,
         selectedOrganisation: { id: 'org-123' },
         selectedEvent: { event_id: 'event-123' },

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

@@ -45,16 +45,15 @@ import {
   NavigationItem,
   NavigationAccessRecord 
 } 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 }) => <div data-testid="unified-auth-provider">{children}</div>
 }));
 
-const mockUseUnifiedAuth = useUnifiedAuth as any;
-
 // Test data
 const mockUser = {
   id: 'user-123',
@@ -144,7 +143,7 @@ describe('NavigationProvider', () => {
     vi.clearAllMocks();
     
     // Set up default mock with organisation context
-    mockUseUnifiedAuth.mockReturnValue({
+    mockUseUnifiedAuthFn.mockReturnValue({
       ...mockUser,
       selectedOrganisationId: 'org-456',
       selectedEventId: 'event-789'
@@ -274,7 +273,7 @@ describe('NavigationProvider', () => {
     });
 
     it('should deny navigation permission when user is not authenticated', () => {
-      mockUseUnifiedAuth.mockReturnValue({ ...mockUser, id: null });
+      mockUseUnifiedAuthFn.mockReturnValue({ ...mockUser, id: null });
 
       renderWithProviders(
         <TestWrapper>
@@ -286,7 +285,7 @@ describe('NavigationProvider', () => {
     });
 
     it('should deny navigation permission when organisation context is missing', () => {
-      mockUseUnifiedAuth.mockReturnValue({ 
+      mockUseUnifiedAuthFn.mockReturnValue({ 
         ...mockUser, 
         selectedOrganisationId: null 
       });
@@ -458,7 +457,7 @@ describe('NavigationProvider', () => {
 
   describe('Error Handling', () => {
     it('should handle missing user gracefully', () => {
-      mockUseUnifiedAuth.mockReturnValue({});
+      mockUseUnifiedAuthFn.mockReturnValue({});
 
       expect(() => {
         renderWithProviders(
@@ -470,7 +469,7 @@ describe('NavigationProvider', () => {
     });
 
     it('should handle missing organisation context gracefully', () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUser,
         selectedOrganisationId: null,
         selectedEventId: null
@@ -550,7 +549,7 @@ describe('NavigationProvider', () => {
     });
 
     it('should handle missing event ID in scope', () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUser,
         selectedEventId: null
       });

package/src/rbac/components/__tests__/PagePermissionGuard.race-condition.test.tsx

@@ -14,23 +14,27 @@ import { PagePermissionGuard } from '../PagePermissionGuard';
 import { useCan } from '../../hooks';
 
 // Mock the hooks with simple implementations
-vi.mock('../../../providers/UnifiedAuthProvider', () => ({
-  useUnifiedAuth: () => ({
-    user: { id: 'user-123', email: 'test@example.com' },
-    isAuthenticated: true,
-    isLoading: false,
-    selectedOrganisationId: 'org-123',
-    selectedEventId: undefined,
-    supabase: {
-      from: vi.fn(() => ({
-        select: vi.fn(() => ({
-          eq: vi.fn(() => ({
-            single: vi.fn(() => Promise.resolve({ data: { id: 'app-123', name: 'test-app', is_active: true }, error: null }))
-          }))
+const mockUseUnifiedAuthFn = vi.fn(() => ({
+  user: { id: 'user-123', email: 'test@example.com' },
+  isAuthenticated: true,
+  isLoading: false,
+  selectedOrganisation: { id: 'org-123' },
+  selectedEvent: null,
+  selectedOrganisationId: 'org-123',
+  selectedEventId: undefined,
+  supabase: {
+    from: vi.fn(() => ({
+      select: vi.fn(() => ({
+        eq: vi.fn(() => ({
+          single: vi.fn(() => Promise.resolve({ data: { id: 'app-123', name: 'test-app', is_active: true }, error: null }))
         }))
       }))
-    }
-  })
+    }))
+  }
+}));
+vi.mock('../../../providers/services/UnifiedAuthProvider', () => ({
+  useUnifiedAuth: () => mockUseUnifiedAuthFn(),
+  UnifiedAuthProvider: ({ children }: { children: React.ReactNode }) => <>{children}</>,
 }));
 
 vi.mock('../../hooks', () => ({

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

@@ -12,7 +12,7 @@ import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { ReactNode } from 'react';
 import { PagePermissionGuard } from '../PagePermissionGuard';
 import { useCan } from '../../hooks';
-import { useUnifiedAuth } from '../../../providers/UnifiedAuthProvider';
+import { useUnifiedAuth } from '../../../providers/services/UnifiedAuthProvider';
 
 // Mock the RBAC hooks
 vi.mock('../../hooks', () => ({
@@ -20,8 +20,10 @@ vi.mock('../../hooks', () => ({
 }));
 
 // 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 event context utility
@@ -67,7 +69,6 @@ const TestLoading = () => (
 
 describe('PagePermissionGuard Component', () => {
   const mockUseCan = vi.mocked(useCan);
-  const mockUseUnifiedAuth = vi.mocked(useUnifiedAuth);
   const mockCreateScopeFromEvent = vi.mocked(createScopeFromEvent);
   const mockGetCurrentAppName = vi.mocked(getCurrentAppName);
 
@@ -75,7 +76,7 @@ describe('PagePermissionGuard Component', () => {
     vi.clearAllMocks();
     
     // Default mock implementations
-    mockUseUnifiedAuth.mockReturnValue({
+    mockUseUnifiedAuthFn.mockReturnValue({
       user: mockUser,
       selectedOrganisation: { id: 'org-123' },
       selectedEvent: { event_id: 'event-123' },
@@ -431,7 +432,7 @@ describe('PagePermissionGuard Component', () => {
       mockGetCurrentAppName.mockReturnValue('test-app');
       
       // Mock database returning invalid app ID
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: mockUser,
         selectedOrganisation: { id: 'org-123' },
         selectedEvent: { event_id: 'event-123' },
@@ -545,7 +546,7 @@ describe('PagePermissionGuard Component', () => {
     });
 
     it('resolves scope from organisation only', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: mockUser,
         selectedOrganisation: { id: 'org-123' },
         selectedEvent: null,
@@ -598,7 +599,7 @@ describe('PagePermissionGuard Component', () => {
     });
 
     it('resolves scope from event context when organisation not available', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: mockUser,
         selectedOrganisation: null,
         selectedEvent: { event_id: 'event-123' },
@@ -661,7 +662,7 @@ describe('PagePermissionGuard Component', () => {
     });
 
     it('handles scope resolution errors', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: mockUser,
         selectedOrganisation: null,
         selectedEvent: { event_id: 'event-123' },
@@ -687,7 +688,7 @@ describe('PagePermissionGuard Component', () => {
     });
 
     it('handles missing context gracefully', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: mockUser,
         selectedOrganisation: null,
         selectedEvent: null,
@@ -907,7 +908,7 @@ describe('PagePermissionGuard Component', () => {
 
   describe('Error Handling', () => {
     it('handles missing user gracefully', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: null,
         selectedOrganisationId: 'org-123',
         selectedEventId: 'event-123',
@@ -961,7 +962,7 @@ describe('PagePermissionGuard Component', () => {
     });
 
     it('handles database errors during app resolution', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: mockUser,
         selectedOrganisation: { id: 'org-123' },
         selectedEvent: { event_id: 'event-123' },

package/src/rbac/components/__tests__/PagePermissionGuard.verification.test.tsx

@@ -14,23 +14,27 @@ import { PagePermissionGuard } from '../PagePermissionGuard';
 import { useCan } from '../../hooks';
 
 // Mock the hooks with simple implementations
-vi.mock('../../../providers/UnifiedAuthProvider', () => ({
-  useUnifiedAuth: () => ({
-    user: { id: 'user-123', email: 'test@example.com' },
-    isAuthenticated: true,
-    isLoading: false,
-    selectedOrganisationId: 'org-123',
-    selectedEventId: undefined,
-    supabase: {
-      from: vi.fn(() => ({
-        select: vi.fn(() => ({
-          eq: vi.fn(() => ({
-            single: vi.fn(() => Promise.resolve({ data: { id: 'app-123', name: 'test-app', is_active: true }, error: null }))
-          }))
+const mockUseUnifiedAuthFn = vi.fn(() => ({
+  user: { id: 'user-123', email: 'test@example.com' },
+  isAuthenticated: true,
+  isLoading: false,
+  selectedOrganisation: { id: 'org-123' },
+  selectedEvent: null,
+  selectedOrganisationId: 'org-123',
+  selectedEventId: undefined,
+  supabase: {
+    from: vi.fn(() => ({
+      select: vi.fn(() => ({
+        eq: vi.fn(() => ({
+          single: vi.fn(() => Promise.resolve({ data: { id: 'app-123', name: 'test-app', is_active: true }, error: null }))
         }))
       }))
-    }
-  })
+    }))
+  }
+}));
+vi.mock('../../../providers/services/UnifiedAuthProvider', () => ({
+  useUnifiedAuth: () => mockUseUnifiedAuthFn(),
+  UnifiedAuthProvider: ({ children }: { children: React.ReactNode }) => <>{children}</>,
 }));
 
 vi.mock('../../hooks', () => ({

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

@@ -21,7 +21,7 @@ import {
   usePagePermissions,
   PageAccessRecord 
 } from '../PagePermissionProvider';
-import { useUnifiedAuth } from '../../../providers/UnifiedAuthProvider';
+import { useUnifiedAuth } from '../../../providers/services/UnifiedAuthProvider';
 
 // Mock the Logger module
 vi.mock('../../../utils/core/logger', () => {
@@ -40,13 +40,13 @@ import { createLogger } from '../../../utils/core/logger';
 const getMockLogger = () => createLogger('test');
 
 // 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 }) => <div data-testid="unified-auth-provider">{children}</div>
 }));
 
-const mockUseUnifiedAuth = useUnifiedAuth as any;
-
 // Test data
 const mockUser = {
   id: 'user-123',
@@ -109,7 +109,7 @@ describe('PagePermissionProvider', () => {
     vi.spyOn(console, 'error').mockImplementation(() => {});
     
     // Set up default mock with organisation context
-    mockUseUnifiedAuth.mockReturnValue({
+    mockUseUnifiedAuthFn.mockReturnValue({
       ...mockUser,
       selectedOrganisationId: 'org-456',
       selectedEventId: 'event-789'
@@ -223,7 +223,7 @@ describe('PagePermissionProvider', () => {
   describe('Page Permission Checking', () => {
     it('should allow page access when user is authenticated', () => {
       // Ensure user has organisation context
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUser,
         selectedOrganisationId: 'org-456',
         selectedEventId: 'event-789'
@@ -239,7 +239,7 @@ describe('PagePermissionProvider', () => {
     });
 
     it('should deny page access when user is not authenticated', () => {
-      mockUseUnifiedAuth.mockReturnValue({ ...mockUser, id: null });
+      mockUseUnifiedAuthFn.mockReturnValue({ ...mockUser, id: null });
 
       renderWithProviders(
         <TestWrapper>
@@ -251,7 +251,7 @@ describe('PagePermissionProvider', () => {
     });
 
     it('should deny page access when organisation context is missing', () => {
-      mockUseUnifiedAuth.mockReturnValue({ 
+      mockUseUnifiedAuthFn.mockReturnValue({ 
         ...mockUser, 
         selectedOrganisationId: null 
       });
@@ -277,7 +277,7 @@ describe('PagePermissionProvider', () => {
       };
 
       // Ensure user has organisation context
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUser,
         selectedOrganisationId: 'org-456',
         selectedEventId: 'event-789'
@@ -303,7 +303,7 @@ describe('PagePermissionProvider', () => {
       };
 
       // Ensure user has organisation context
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUser,
         selectedOrganisationId: 'org-456',
         selectedEventId: 'event-789'
@@ -326,7 +326,7 @@ describe('PagePermissionProvider', () => {
       };
 
       // Ensure user has organisation context
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUser,
         selectedOrganisationId: 'org-456',
         selectedEventId: 'event-789'
@@ -422,7 +422,7 @@ describe('PagePermissionProvider', () => {
 
   describe('Error Handling', () => {
     it('should handle missing user gracefully', () => {
-      mockUseUnifiedAuth.mockReturnValue({});
+      mockUseUnifiedAuthFn.mockReturnValue({});
 
       expect(() => {
         renderWithProviders(
@@ -434,7 +434,7 @@ describe('PagePermissionProvider', () => {
     });
 
     it('should handle missing organisation context gracefully', () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUser,
         selectedOrganisationId: null,
         selectedEventId: null
@@ -514,7 +514,7 @@ describe('PagePermissionProvider', () => {
     });
 
     it('should handle missing event ID in scope', () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUser,
         selectedEventId: null
       });
@@ -597,7 +597,7 @@ describe('PagePermissionProvider', () => {
       };
 
       // Ensure user has organisation context
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUser,
         selectedOrganisationId: 'org-456',
         selectedEventId: 'event-789'
@@ -620,7 +620,7 @@ describe('PagePermissionProvider', () => {
       };
 
       // Ensure user has organisation context
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUser,
         selectedOrganisationId: 'org-456',
         selectedEventId: 'event-789'
@@ -643,7 +643,7 @@ describe('PagePermissionProvider', () => {
       };
 
       // Ensure user has organisation context
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUser,
         selectedOrganisationId: 'org-456',
         selectedEventId: 'event-789'

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

@@ -12,7 +12,7 @@ import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { ReactNode } from 'react';
 import { PermissionEnforcer } from '../PermissionEnforcer';
 import { useMultiplePermissions } from '../../hooks/usePermissions';
-import { useUnifiedAuth } from '../../../providers/UnifiedAuthProvider';
+import { useUnifiedAuth } from '../../../providers/services/UnifiedAuthProvider';
 
 // Mock the RBAC hooks
 vi.mock('../../hooks/usePermissions', () => ({
@@ -20,8 +20,10 @@ vi.mock('../../hooks/usePermissions', () => ({
 }));
 
 // 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 event context utility
@@ -77,14 +79,13 @@ const TestLoading = () => (
 
 describe('PermissionEnforcer Component', () => {
   const mockUseMultiplePermissions = vi.mocked(useMultiplePermissions);
-  const mockUseUnifiedAuth = vi.mocked(useUnifiedAuth);
   const mockCreateScopeFromEvent = vi.mocked(createScopeFromEvent);
 
   beforeEach(() => {
     vi.clearAllMocks();
     
     // Default mock implementations
-    mockUseUnifiedAuth.mockReturnValue({
+    mockUseUnifiedAuthFn.mockReturnValue({
       user: mockUser,
       selectedOrganisation: { id: 'org-123' },
       selectedEvent: { event_id: 'event-123' },
@@ -402,7 +403,7 @@ describe('PermissionEnforcer Component', () => {
     });
 
     it('resolves scope from organisation only', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: mockUser,
         selectedOrganisation: { id: 'org-123' },
         selectedEvent: null,
@@ -441,7 +442,7 @@ describe('PermissionEnforcer Component', () => {
     });
 
     it('resolves scope from event context when organisation not available', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: mockUser,
         selectedOrganisation: null,
         selectedEvent: { event_id: 'event-123' },
@@ -487,7 +488,7 @@ describe('PermissionEnforcer Component', () => {
     });
 
     it('handles scope resolution errors', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: mockUser,
         selectedOrganisation: null,
         selectedEvent: { event_id: 'event-123' },
@@ -513,7 +514,7 @@ describe('PermissionEnforcer Component', () => {
     });
 
     it('handles missing context gracefully', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: mockUser,
         selectedOrganisation: null,
         selectedEvent: null,
@@ -767,7 +768,7 @@ describe('PermissionEnforcer Component', () => {
 
   describe('Error Handling', () => {
     it('handles missing user gracefully', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: null,
         selectedOrganisation: { id: 'org-123' },
         selectedEvent: { event_id: 'event-123' },

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

@@ -13,7 +13,7 @@ import { ReactNode } from 'react';
 import { MemoryRouter, Routes, Route } from 'react-router-dom';
 import { RoleBasedRouter, useRoleBasedRouter } from '../RoleBasedRouter';
 import { useCan } from '../../hooks';
-import { useUnifiedAuth } from '../../../providers/UnifiedAuthProvider';
+import { useUnifiedAuth } from '../../../providers/services/UnifiedAuthProvider';
 
 // Mock the RBAC hooks
 vi.mock('../../hooks', () => ({
@@ -21,8 +21,10 @@ vi.mock('../../hooks', () => ({
 }));
 
 // 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 React Router
@@ -89,7 +91,6 @@ vi.mocked(Outlet).mockImplementation(TestOutlet);
 
 describe('RoleBasedRouter Component', () => {
   const mockUseCan = vi.mocked(useCan);
-  const mockUseUnifiedAuth = vi.mocked(useUnifiedAuth);
   const mockUseLocation = vi.mocked(useLocation);
   const mockUseNavigate = vi.mocked(useNavigate);
 
@@ -97,7 +98,7 @@ describe('RoleBasedRouter Component', () => {
     vi.clearAllMocks();
     
     // Default mock implementations
-    mockUseUnifiedAuth.mockReturnValue({
+    mockUseUnifiedAuthFn.mockReturnValue({
       user: mockUser,
       selectedOrganisation: { id: 'org-123' },
       selectedEvent: { event_id: 'event-123' }
@@ -609,7 +610,7 @@ describe('RoleBasedRouter Component', () => {
 
   describe('Error Handling', () => {
     it('handles missing user gracefully', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: null,
         selectedOrganisation: { id: 'org-123' },
         selectedEvent: { event_id: 'event-123' }
@@ -646,7 +647,7 @@ describe('RoleBasedRouter Component', () => {
     });
 
     it('handles missing organisation context', async () => {
-      mockUseUnifiedAuth.mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         user: mockUser,
         selectedOrganisation: null,
         selectedEvent: null