@jmruthers/pace-core 0.5.110 → 0.5.111

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

@@ -11,12 +11,12 @@ import { render, screen, waitFor } from '@testing-library/react';
 import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { ReactNode } from 'react';
 import { NavigationGuard } from '../NavigationGuard';
-import { useCan } from '../../hooks';
+import { useMultiplePermissions } from '../../hooks/usePermissions';
 import { useUnifiedAuth } from '../../../providers/UnifiedAuthProvider';
 
 // Mock the RBAC hooks
-vi.mock('../../hooks', () => ({
-  useCan: vi.fn()
+vi.mock('../../hooks/usePermissions', () => ({
+  useMultiplePermissions: vi.fn()
 }));
 
 // Mock the auth provider
@@ -68,7 +68,7 @@ const TestLoading = () => (
 );
 
 describe('NavigationGuard Component', () => {
-  const mockUseCan = vi.mocked(useCan);
+  const mockUseMultiplePermissions = vi.mocked(useMultiplePermissions);
   const mockUseUnifiedAuth = vi.mocked(useUnifiedAuth);
   const mockCreateScopeFromEvent = vi.mocked(createScopeFromEvent);
 
@@ -83,19 +83,21 @@ describe('NavigationGuard Component', () => {
       supabase: {} as any
     });
     
-    mockUseCan.mockReturnValue({
-      can: true,
+    mockUseMultiplePermissions.mockReturnValue({
+      results: { 'read:dashboard': true } as Record<string, boolean>,
       isLoading: false,
-      error: null
+      error: null,
+      refetch: vi.fn()
     });
   });
 
     describe('Rendering', () => {
     it('renders children when permission is granted', async () => {
-      mockUseCan.mockReturnValue({
-        can: true,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': true } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -111,10 +113,11 @@ describe('NavigationGuard Component', () => {
     });
 
     it('renders fallback when permission is denied', async () => {
-      mockUseCan.mockReturnValue({
-        can: false,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': false } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -133,10 +136,11 @@ describe('NavigationGuard Component', () => {
     });
 
     it('shows loading state during permission check', () => {
-      mockUseCan.mockReturnValue({
-        can: false,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: {} as Record<string, boolean>,
         isLoading: true,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -153,10 +157,11 @@ describe('NavigationGuard Component', () => {
     });
 
     it('uses default fallback when none provided', async () => {
-      mockUseCan.mockReturnValue({
-        can: false,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': false } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -171,10 +176,11 @@ describe('NavigationGuard Component', () => {
     });
 
     it('uses default loading when none provided', () => {
-      mockUseCan.mockReturnValue({
-        can: false,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: {} as Record<string, boolean>,
         isLoading: true,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -189,10 +195,11 @@ describe('NavigationGuard Component', () => {
 
   describe('Permission Checking', () => {
     it('enforces navigation permissions correctly', async () => {
-      mockUseCan.mockReturnValue({
-        can: true,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': true } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -205,14 +212,13 @@ describe('NavigationGuard Component', () => {
         expect(screen.getByTestId('test-component')).toBeInTheDocument();
       }, { interval: 10 });
 
-      expect(mockUseCan).toHaveBeenCalledWith(
+      expect(mockUseMultiplePermissions).toHaveBeenCalledWith(
         'user-123',
         expect.objectContaining({
           organisationId: 'org-123',
           eventId: 'event-123'
         }),
-        'read:dashboard',
-        'dashboard',
+        ['read:dashboard'],
         true
       );
     });
@@ -223,10 +229,11 @@ describe('NavigationGuard Component', () => {
         permissions: ['read:dashboard', 'write:dashboard'] as const
       };
 
-      mockUseCan.mockReturnValue({
-        can: true,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': true, 'write:dashboard': true } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -239,15 +246,14 @@ describe('NavigationGuard Component', () => {
         expect(screen.getByTestId('test-component')).toBeInTheDocument();
       }, { interval: 10 });
 
-      // Should check the first permission as representative
-      expect(mockUseCan).toHaveBeenCalledWith(
+      // Should check all permissions when multiple are provided
+      expect(mockUseMultiplePermissions).toHaveBeenCalledWith(
         'user-123',
         expect.objectContaining({
           organisationId: 'org-123',
           eventId: 'event-123'
         }),
-        'read:dashboard',
-        'dashboard',
+        ['read:dashboard', 'write:dashboard'],
         true
       );
     });
@@ -258,10 +264,11 @@ describe('NavigationGuard Component', () => {
         permissions: [] as const
       };
 
-      mockUseCan.mockReturnValue({
-        can: true,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': true } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -277,10 +284,11 @@ describe('NavigationGuard Component', () => {
 
     it('handles permission checking errors gracefully', async () => {
       const error = new Error('Permission check failed');
-      mockUseCan.mockReturnValue({
-        can: false,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': false } as Record<string, boolean>,
         isLoading: false,
-        error
+        error,
+        refetch: vi.fn()
       });
 
       render(
@@ -306,10 +314,11 @@ describe('NavigationGuard Component', () => {
         appId: 'custom-app'
       };
 
-      mockUseCan.mockReturnValue({
-        can: true,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': true } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -325,20 +334,20 @@ describe('NavigationGuard Component', () => {
         expect(screen.getByTestId('test-component')).toBeInTheDocument();
       }, { interval: 10 });
 
-      expect(mockUseCan).toHaveBeenCalledWith(
+      expect(mockUseMultiplePermissions).toHaveBeenCalledWith(
         'user-123',
         customScope,
-        'read:dashboard',
-        'dashboard',
+        ['read:dashboard'],
         true
       );
     });
 
     it('resolves scope from organisation and event context', async () => {
-      mockUseCan.mockReturnValue({
-        can: true,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': true } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -351,14 +360,13 @@ describe('NavigationGuard Component', () => {
         expect(screen.getByTestId('test-component')).toBeInTheDocument();
       }, { interval: 10 });
 
-      expect(mockUseCan).toHaveBeenCalledWith(
+      expect(mockUseMultiplePermissions).toHaveBeenCalledWith(
         'user-123',
         expect.objectContaining({
           organisationId: 'org-123',
           eventId: 'event-123'
         }),
-        'read:dashboard',
-        'dashboard',
+        ['read:dashboard'],
         true
       );
     });
@@ -371,10 +379,11 @@ describe('NavigationGuard Component', () => {
         supabase: {} as any
       });
 
-      mockUseCan.mockReturnValue({
-        can: true,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': true } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -387,14 +396,13 @@ describe('NavigationGuard Component', () => {
         expect(screen.getByTestId('test-component')).toBeInTheDocument();
       }, { interval: 10 });
 
-      expect(mockUseCan).toHaveBeenCalledWith(
+      expect(mockUseMultiplePermissions).toHaveBeenCalledWith(
         'user-123',
         expect.objectContaining({
           organisationId: 'org-123',
           eventId: undefined
         }),
-        'read:dashboard',
-        'dashboard',
+        ['read:dashboard'],
         true
       );
     });
@@ -413,10 +421,11 @@ describe('NavigationGuard Component', () => {
         appId: 'resolved-app'
       });
 
-      mockUseCan.mockReturnValue({
-        can: true,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': true } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -430,14 +439,13 @@ describe('NavigationGuard Component', () => {
       }, { interval: 10 });
 
       expect(mockCreateScopeFromEvent).toHaveBeenCalledWith({}, 'event-123');
-      expect(mockUseCan).toHaveBeenCalledWith(
+      expect(mockUseMultiplePermissions).toHaveBeenCalledWith(
         'user-123',
         expect.objectContaining({
           organisationId: 'resolved-org',
           eventId: 'event-123'
         }),
-        'read:dashboard',
-        'dashboard',
+        ['read:dashboard'],
         true
       );
     });
@@ -494,10 +502,11 @@ describe('NavigationGuard Component', () => {
     it('prevents bypassing in strict mode', async () => {
       const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
       
-      mockUseCan.mockReturnValue({
-        can: false,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': false } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -529,10 +538,11 @@ describe('NavigationGuard Component', () => {
     it('logs navigation access attempts for audit', async () => {
       const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
       
-      mockUseCan.mockReturnValue({
-        can: false,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': false } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -565,10 +575,11 @@ describe('NavigationGuard Component', () => {
     it('calls onDenied callback when access is denied', async () => {
       const onDeniedSpy = vi.fn();
       
-      mockUseCan.mockReturnValue({
-        can: false,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': false } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -591,10 +602,11 @@ describe('NavigationGuard Component', () => {
     it('does not call onDenied when access is granted', async () => {
       const onDeniedSpy = vi.fn();
       
-      mockUseCan.mockReturnValue({
-        can: true,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': true } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -618,10 +630,11 @@ describe('NavigationGuard Component', () => {
     it('respects strictMode setting', async () => {
       const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
       
-      mockUseCan.mockReturnValue({
-        can: false,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': false } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -648,10 +661,11 @@ describe('NavigationGuard Component', () => {
     it('respects auditLog setting', async () => {
       const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
       
-      mockUseCan.mockReturnValue({
-        can: false,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': false } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -676,10 +690,11 @@ describe('NavigationGuard Component', () => {
     });
 
     it('respects requireAll setting', async () => {
-      mockUseCan.mockReturnValue({
-        can: true,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': true } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -696,14 +711,13 @@ describe('NavigationGuard Component', () => {
       }, { interval: 10 });
 
       // Should still check the first permission as representative
-      expect(mockUseCan).toHaveBeenCalledWith(
+      expect(mockUseMultiplePermissions).toHaveBeenCalledWith(
         'user-123',
         expect.objectContaining({
           organisationId: 'org-123',
           eventId: 'event-123'
         }),
-        'read:dashboard',
-        'dashboard',
+        ['read:dashboard'],
         true
       );
     });
@@ -718,10 +732,11 @@ describe('NavigationGuard Component', () => {
         supabase: {} as any
       });
 
-      mockUseCan.mockReturnValue({
-        can: false,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': false } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -737,24 +752,24 @@ describe('NavigationGuard Component', () => {
         expect(screen.getByTestId('test-fallback')).toBeInTheDocument();
       }, { interval: 10 });
 
-      expect(mockUseCan).toHaveBeenCalledWith(
+      expect(mockUseMultiplePermissions).toHaveBeenCalledWith(
         '',
         expect.objectContaining({
           organisationId: 'org-123',
           eventId: 'event-123'
         }),
-        'read:dashboard',
-        'dashboard',
+        ['read:dashboard'],
         true
       );
     });
 
     it('handles permission check errors', async () => {
       const error = new Error('Database connection failed');
-      mockUseCan.mockReturnValue({
-        can: false,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': false } as Record<string, boolean>,
         isLoading: false,
-        error
+        error,
+        refetch: vi.fn()
       });
 
       render(
@@ -785,10 +800,11 @@ describe('NavigationGuard Component', () => {
         hidden: false
       };
 
-      mockUseCan.mockReturnValue({
-        can: true,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': true } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(
@@ -801,14 +817,13 @@ describe('NavigationGuard Component', () => {
         expect(screen.getByTestId('test-component')).toBeInTheDocument();
       }, { interval: 10 });
 
-      expect(mockUseCan).toHaveBeenCalledWith(
+      expect(mockUseMultiplePermissions).toHaveBeenCalledWith(
         'user-123',
         expect.objectContaining({
           organisationId: 'org-123',
           eventId: 'event-123'
         }),
-        'read:settings',
-        'settings',
+        ['read:settings'],
         true
       );
     });
@@ -819,10 +834,11 @@ describe('NavigationGuard Component', () => {
         hidden: true
       };
 
-      mockUseCan.mockReturnValue({
-        can: true,
+      mockUseMultiplePermissions.mockReturnValue({
+        results: { 'read:dashboard': true } as Record<string, boolean>,
         isLoading: false,
-        error: null
+        error: null,
+        refetch: vi.fn()
       });
 
       render(

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

@@ -947,7 +947,7 @@ describe('PagePermissionGuard Component', () => {
       expect(mockUseCan).toHaveBeenCalledWith(
         '',
         expect.objectContaining({
-          organisationId: '',
+          organisationId: undefined, // Changed from empty string - undefined is used when not resolved
           eventId: undefined,
           appId: undefined  // appId is optional and should be undefined when not resolved
         }),