@jmruthers/pace-core 0.5.76 → 0.5.78

package/src/providers/services/UnifiedAuthProvider.tsx

@@ -4,76 +4,61 @@
  * @module Providers/Services
  * @since 0.1.0
  *
- * Unified authentication provider using service architecture.
- * Combines all services in a single provider for backward compatibility.
+ * Unified authentication provider for authentication, organisations, events, and inactivity tracking.
+ * Note: RBAC functionality is available via useRBAC() hook from '@jmruthers/pace-core/rbac'
  */
 
 import React, { createContext, useContext, useMemo } from 'react';
-import { type SupabaseClient } from '@supabase/supabase-js';
+import { type SupabaseClient, type User, type Session } from '@supabase/supabase-js';
 import { AuthServiceProvider } from './AuthServiceProvider';
-import { RBACServiceProvider } from './RBACServiceProvider';
 import { OrganisationServiceProvider } from './OrganisationServiceProvider';
 import { EventServiceProvider } from './EventServiceProvider';
 import { InactivityServiceProvider } from './InactivityServiceProvider';
 import { useAuthService } from '../../hooks/services/useAuthService';
-import { useRBACService } from '../../hooks/services/useRBACService';
 import { useOrganisationService } from '../../hooks/services/useOrganisationService';
 import { useEventService } from '../../hooks/services/useEventService';
 import { useInactivityService } from '../../hooks/services/useInactivityService';
+import type { Organisation, OrganisationMembership } from '../../types/organisation';
+import type { Event } from '../../types/unified';
+import type { AuthError } from '@supabase/supabase-js';
 
-// Re-export UserEventAccess type from IRBACService
-export type { UserEventAccess } from '../../services/interfaces/IRBACService';
+// Re-export UserEventAccess type
+export interface UserEventAccess {
+  event_id: string;
+  event_name: string;
+  event_description?: string | null;
+  start_date: string;
+  end_date: string;
+  event_status: string;
+  app_id: string;
+  access_level: string;
+  granted_at: string;
+  organisation_id: string;
+}
 
-// Combined context type - now service-aware and secure
+// Combined context type - focuses on auth, organisations, events, and inactivity
 export interface UnifiedAuthContextType {
   // Auth state
-  user: any | null;
-  session: any | null;
+  user: User | null;
+  session: Session | null;
   isAuthenticated: boolean;
   authLoading: boolean;
-  authError: any | null;
-  error: any | null; // Alias for authError for backward compatibility
+  authError: AuthError | null;
+  error: AuthError | null; // Alias for authError for backward compatibility
   supabase: SupabaseClient | null;
   
   // Auth methods
-  signIn: (email: string, password?: string) => Promise<{ error: any | null }>;
-  signUp: (email: string, password: string) => Promise<{ error: any | null }>;
-  signOut: () => Promise<{ error: any | null }>;
-  resetPassword: (email: string) => Promise<{ error: any | null }>;
-  updatePassword: (password: string) => Promise<{ error: any | null }>;
-  refreshSession: () => Promise<{ error: any | null }>;
-
-  // RBAC state
-  permissions: Record<string, boolean>;
-  roles: string[];
-  accessLevel: any;
-  rbacLoading: boolean;
-  rbacError: Error | null;
-  selectedEventId: string | null;
-  appConfig: any | null;
-  userEventAccess: any[];
-  eventAccessLoading: boolean;
-  selectedOrganisationId: string | null;
-  
-  // RBAC methods
-  hasPermission: (permission: string, orgId?: string) => boolean;
-  hasAnyPermission: (permissions: string[], orgId?: string) => boolean;
-  hasAllPermissions: (permissions: string[], orgId?: string) => boolean;
-  hasRole: (role: string) => boolean;
-  hasAccessLevel: (level: any) => boolean;
-  canAccess: (resource: string, action: string, orgId?: string) => boolean;
-  validatePermission: (permission: string, orgId?: string) => Promise<boolean>;
-  validateAccess: (resource: string, action: string, orgId?: string) => Promise<boolean>;
-  refreshPermissions: (eventId?: string, orgId?: string) => Promise<void>;
-  setSelectedEventId: (eventId: string | null) => void;
-  loadUserEventAccess: (orgId?: string) => Promise<void>;
-  getUserEventAccess: (eventId: string) => any | undefined;
-  requireOrganisationContext: () => string;
+  signIn: (email: string, password?: string) => Promise<{ error: AuthError | null }>;
+  signUp: (email: string, password: string) => Promise<{ error: AuthError | null }>;
+  signOut: () => Promise<{ error: AuthError | null }>;
+  resetPassword: (email: string) => Promise<{ error: AuthError | null }>;
+  updatePassword: (password: string) => Promise<{ error: AuthError | null }>;
+  refreshSession: () => Promise<{ error: AuthError | null }>;
 
   // Organisation state
-  selectedOrganisation: any | null;
-  organisations: any[];
-  userMemberships: any[];
+  selectedOrganisation: Organisation | null;
+  organisations: Organisation[];
+  userMemberships: OrganisationMembership[];
   organisationLoading: boolean;
   organisationError: Error | null;
   hasValidOrganisationContext: boolean;
@@ -84,18 +69,18 @@ export interface UnifiedAuthContextType {
   getUserRole: (orgId?: string) => string;
   validateOrganisationAccess: (orgId: string) => boolean;
   refreshOrganisations: () => Promise<void>;
-  ensureOrganisationContext: () => any;
+  ensureOrganisationContext: () => Organisation;
   isOrganisationSecure: () => boolean;
-  getPrimaryOrganisation: () => any | null;
+  getPrimaryOrganisation: () => Organisation | null;
 
   // Event state
-  events: any[];
-  selectedEvent: any | null;
+  events: Event[];
+  selectedEvent: Event | null;
   eventLoading: boolean;
   eventError: Error | null;
   
   // Event methods
-  setSelectedEvent: (event: any | null) => void;
+  setSelectedEvent: (event: Event | null) => void;
   refreshEvents: () => Promise<void>;
 
   // Inactivity state
@@ -116,6 +101,7 @@ export interface UnifiedAuthContextType {
 
   // Additional unified properties
   appName: string;
+  appConfig: { requires_event: boolean } | null;
   isLoading: boolean;
   hasErrors: boolean;
 }
@@ -137,7 +123,9 @@ export interface UnifiedAuthProviderProps {
   persistState?: boolean;
   enablePersistence?: boolean;
   requireOrganisationContext?: boolean;
-  enableRBAC?: boolean;
+  
+  // App configuration
+  appConfig?: { requires_event: boolean } | null;
   
   // Inactivity auto-logout configuration - MANDATORY for security
   idleTimeoutMs: number; // REQUIRED: Inactivity timeout in milliseconds
@@ -155,21 +143,60 @@ export interface UnifiedAuthProviderProps {
 function UnifiedAuthContextProvider({ 
   children, 
   appName,
+  appConfig = { requires_event: true }, // Default to requiring events
   ...props 
 }: UnifiedAuthProviderProps) {
   const authService = useAuthService();
-  const rbacService = useRBACService();
   const organisationService = useOrganisationService();
-  const eventService = useEventService();
   const inactivityService = useInactivityService();
+  
+  // Try to get event service, but provide fallback if not available
+  let eventService;
+  try {
+    eventService = useEventService();
+  } catch (error) {
+    // EventService not available - provide fallback implementation
+    eventService = {
+      getEvents: () => [],
+      getSelectedEvent: () => null,
+      isLoading: () => false,
+      getError: () => null,
+      setSelectedEvent: () => {},
+      refreshEvents: async () => {}
+    };
+  }
 
+  // Get current auth state - these will trigger re-renders when services change
+  const currentUser = authService.getUser();
+  const currentSession = authService.getSession();
+  const isAuth = !!(currentUser && currentSession);
+  
+  // Get loading states - these will trigger re-renders when services change
+  const authLoading = authService.isLoading();
+  const orgLoading = organisationService.isLoading();
+  const eventLoading = eventService.isLoading();
+  const totalLoading = authLoading || orgLoading || eventLoading;
+  
+  // Log auth state for debugging with detailed loading states
+  console.log('[UnifiedAuthContext] Auth state:', {
+    isAuthenticated: isAuth,
+    user: currentUser?.email,
+    session: currentSession ? 'exists' : 'null',
+    totalLoading,
+    authLoading,
+    orgLoading,
+    eventLoading,
+    orgContextReady: organisationService.isContextReady()
+  });
+  
   // Memoized combined context value
-  const contextValue = useMemo<UnifiedAuthContextType>(() => ({
+  const contextValue = useMemo<UnifiedAuthContextType>(() => {
+    return {
     // Auth state
-    user: authService.getUser(),
-    session: authService.getSession(),
-    isAuthenticated: authService.isAuthenticated(),
-    authLoading: authService.isLoading(),
+    user: currentUser,
+    session: currentSession,
+    isAuthenticated: isAuth,
+    authLoading: authLoading,
     authError: authService.getError(),
     error: authService.getError(), // Alias for backward compatibility
     supabase: authService.getSupabaseClient(),
@@ -182,38 +209,11 @@ function UnifiedAuthContextProvider({
     updatePassword: authService.updatePassword.bind(authService),
     refreshSession: authService.refreshSession.bind(authService),
 
-    // RBAC state
-    permissions: rbacService.getPermissions(),
-    roles: rbacService.getRoles(),
-    accessLevel: rbacService.getAccessLevel(),
-    rbacLoading: rbacService.isLoading(),
-    rbacError: rbacService.getError(),
-    selectedEventId: rbacService.getSelectedEventId(),
-    appConfig: rbacService.getAppConfig(),
-    userEventAccess: rbacService.getUserEventAccess(),
-    eventAccessLoading: rbacService.isEventAccessLoading(),
-    selectedOrganisationId: rbacService.getSelectedOrganisationId(),
-    
-    // RBAC methods
-    hasPermission: rbacService.hasPermission.bind(rbacService),
-    hasAnyPermission: rbacService.hasAnyPermission.bind(rbacService),
-    hasAllPermissions: rbacService.hasAllPermissions.bind(rbacService),
-    hasRole: rbacService.hasRole.bind(rbacService),
-    hasAccessLevel: rbacService.hasAccessLevel.bind(rbacService),
-    canAccess: rbacService.canAccess.bind(rbacService),
-    validatePermission: rbacService.validatePermission.bind(rbacService),
-    validateAccess: rbacService.validateAccess.bind(rbacService),
-    refreshPermissions: rbacService.refreshPermissions.bind(rbacService),
-    setSelectedEventId: rbacService.setSelectedEventId.bind(rbacService),
-    loadUserEventAccess: rbacService.loadUserEventAccess.bind(rbacService),
-    getUserEventAccess: rbacService.getUserEventAccess.bind(rbacService),
-    requireOrganisationContext: rbacService.requireOrganisationContext.bind(rbacService),
-
     // Organisation state
     selectedOrganisation: organisationService.getSelectedOrganisation(),
     organisations: organisationService.getOrganisations(),
     userMemberships: organisationService.getUserMemberships(),
-    organisationLoading: organisationService.isLoading(),
+    organisationLoading: orgLoading,
     organisationError: organisationService.getError(),
     hasValidOrganisationContext: organisationService.hasValidOrganisationContext(),
     isContextReady: organisationService.isContextReady(),
@@ -230,7 +230,7 @@ function UnifiedAuthContextProvider({
     // Event state
     events: eventService.getEvents(),
     selectedEvent: eventService.getSelectedEvent(),
-    eventLoading: eventService.isLoading(),
+    eventLoading: eventLoading,
     eventError: eventService.getError(),
     
     // Event methods
@@ -255,9 +255,11 @@ function UnifiedAuthContextProvider({
 
     // Additional unified properties
     appName,
-    isLoading: authService.isLoading() || rbacService.isLoading() || organisationService.isLoading() || eventService.isLoading(),
-    hasErrors: !!(authService.getError() || rbacService.getError() || organisationService.getError() || eventService.getError()),
-  }), [authService, rbacService, organisationService, eventService, inactivityService, appName]);
+    appConfig: appConfig,
+    isLoading: totalLoading,
+    hasErrors: !!(authService.getError() || organisationService.getError() || eventService.getError()),
+  };
+  }, [authService, organisationService, eventService, inactivityService, appName, appConfig, currentUser, currentSession, isAuth, authLoading, orgLoading, eventLoading, totalLoading]);
 
   return (
     <UnifiedAuthContext.Provider value={contextValue}>
@@ -266,15 +268,53 @@ function UnifiedAuthContextProvider({
   );
 }
 
+// Wrapper for EventServiceProvider that reads selectedOrganisation from OrganisationService
+function EventServiceProviderWrapper({ 
+  children, 
+  supabaseClient,
+  user,
+  session,
+  appName
+}: {
+  children: React.ReactNode;
+  supabaseClient: SupabaseClient;
+  user: User | null;
+  session: Session | null;
+  appName: string;
+}) {
+  const organisationService = useOrganisationService();
+  const selectedOrganisation = organisationService.getSelectedOrganisation();
+
+  // Only render EventServiceProvider if user and session are available
+  if (!user || !session) {
+    return <>{children}</>;
+  }
+
+  return (
+    <EventServiceProvider
+      supabaseClient={supabaseClient}
+      user={user}
+      session={session}
+      appName={appName}
+      selectedOrganisation={selectedOrganisation}
+      setSelectedEventId={() => {
+        // Event selection is now handled at the application level
+      }}
+    >
+      {children}
+    </EventServiceProvider>
+  );
+}
+
 // Internal component that provides user/session to child providers
 function ServiceAwareProviders({ 
   children, 
   supabaseClient,
   appName,
+  appConfig,
   persistState,
   enablePersistence,
   requireOrganisationContext,
-  enableRBAC,
   idleTimeoutMs,
   warnBeforeMs,
   onIdleLogout,
@@ -284,54 +324,43 @@ function ServiceAwareProviders({
   const authService = useAuthService();
 
   return (
-    <RBACServiceProvider
+    <OrganisationServiceProvider
       supabaseClient={supabaseClient}
       user={authService.getUser()}
       session={authService.getSession()}
-      appName={appName}
     >
-      <OrganisationServiceProvider
+      <EventServiceProviderWrapper
         supabaseClient={supabaseClient}
         user={authService.getUser()}
         session={authService.getSession()}
+        appName={appName}
       >
-        <EventServiceProvider
+        <InactivityServiceProvider
           supabaseClient={supabaseClient}
           user={authService.getUser()}
           session={authService.getSession()}
-          appName={appName}
-          selectedOrganisation={null} // Will be updated by OrganisationService
-          setSelectedEventId={(eventId: string | null) => {
-            // This will be handled by the RBACService
-          }}
+          idleTimeoutMs={idleTimeoutMs}
+          warnBeforeMs={warnBeforeMs}
+          onIdleLogout={onIdleLogout}
         >
-          <InactivityServiceProvider
+          <UnifiedAuthContextProvider
+            appName={appName}
+            appConfig={appConfig}
             supabaseClient={supabaseClient}
-            user={authService.getUser()}
-            session={authService.getSession()}
+            persistState={persistState}
+            enablePersistence={enablePersistence}
+            requireOrganisationContext={requireOrganisationContext}
             idleTimeoutMs={idleTimeoutMs}
             warnBeforeMs={warnBeforeMs}
             onIdleLogout={onIdleLogout}
+            renderInactivityWarning={renderInactivityWarning}
+            dangerouslyDisableInactivity={dangerouslyDisableInactivity}
           >
-            <UnifiedAuthContextProvider
-              appName={appName}
-              supabaseClient={supabaseClient}
-              persistState={persistState}
-              enablePersistence={enablePersistence}
-              requireOrganisationContext={requireOrganisationContext}
-              enableRBAC={enableRBAC}
-              idleTimeoutMs={idleTimeoutMs}
-              warnBeforeMs={warnBeforeMs}
-              onIdleLogout={onIdleLogout}
-              renderInactivityWarning={renderInactivityWarning}
-              dangerouslyDisableInactivity={dangerouslyDisableInactivity}
-            >
-              {children}
-            </UnifiedAuthContextProvider>
-          </InactivityServiceProvider>
-        </EventServiceProvider>
-      </OrganisationServiceProvider>
-    </RBACServiceProvider>
+            {children}
+          </UnifiedAuthContextProvider>
+        </InactivityServiceProvider>
+      </EventServiceProviderWrapper>
+    </OrganisationServiceProvider>
   );
 }
 
@@ -339,10 +368,10 @@ export function UnifiedAuthProvider({
   children,
   supabaseClient,
   appName,
+  appConfig = { requires_event: true }, // Default to requiring events
   persistState = true,
   enablePersistence,
   requireOrganisationContext = true,
-  enableRBAC = false,
   idleTimeoutMs = 30 * 60 * 1000, // 30 minutes
   warnBeforeMs = 60 * 1000, // 60 seconds
   onIdleLogout,
@@ -354,10 +383,10 @@ export function UnifiedAuthProvider({
       <ServiceAwareProviders
         supabaseClient={supabaseClient}
         appName={appName}
+        appConfig={appConfig}
         persistState={persistState}
         enablePersistence={enablePersistence}
         requireOrganisationContext={requireOrganisationContext}
-        enableRBAC={enableRBAC}
         idleTimeoutMs={idleTimeoutMs}
         warnBeforeMs={warnBeforeMs}
         onIdleLogout={onIdleLogout}

package/src/providers/services/__tests__/AuthServiceProvider.integration.test.tsx

@@ -95,7 +95,7 @@ describe('AuthServiceProvider Integration', () => {
 
       expect(screen.getByTestId('user-id')).toHaveTextContent('no-user');
       expect(screen.getByTestId('is-authenticated')).toHaveTextContent('false');
-      expect(screen.getByTestId('is-loading')).toHaveTextContent('true');
+      expect(screen.getByTestId('is-loading')).toHaveTextContent('false'); // Initial state is not loading
       expect(screen.getByTestId('error')).toHaveTextContent('no-error');
     });
 

package/src/providers/services/__tests__/UnifiedAuthProvider.integration.test.tsx

@@ -62,8 +62,8 @@ function TestComponent() {
       <div data-testid="is-authenticated">{auth.isAuthenticated.toString()}</div>
       <div data-testid="is-loading">{auth.isLoading.toString()}</div>
       <div data-testid="app-name">{auth.appName}</div>
-      <div data-testid="permissions-count">{Object.keys(auth.permissions).length}</div>
-      <div data-testid="roles-count">{auth.roles.length}</div>
+       <div data-testid="permissions-count">{0}</div>
+       <div data-testid="roles-count">{0}</div>
       <div data-testid="organisations-count">{auth.organisations.length}</div>
       <div data-testid="events-count">{auth.events.length}</div>
     </div>
@@ -97,7 +97,7 @@ describe('UnifiedAuthProvider Integration', () => {
 
       expect(screen.getByTestId('user-id')).toHaveTextContent('no-user');
       expect(screen.getByTestId('is-authenticated')).toHaveTextContent('false');
-      expect(screen.getByTestId('is-loading')).toHaveTextContent('true');
+       expect(screen.getByTestId('is-loading')).toHaveTextContent('false');
       expect(screen.getByTestId('app-name')).toHaveTextContent('TEST_APP');
       expect(screen.getByTestId('permissions-count')).toHaveTextContent('0');
       expect(screen.getByTestId('roles-count')).toHaveTextContent('0');

package/src/rbac/README.md

@@ -592,7 +592,7 @@ const permissions = await getPermissionMap({
   userId: 'user-123',
   scope: { organisationId: 'org-456', appId: 'app-789' }
 });
-// Returns: { [pageId]: Operation[] }
+// Returns: { [permission]: boolean }
 ```
 
 ### React Hooks

package/src/rbac/__tests__/adapters.comprehensive.test.tsx

@@ -180,17 +180,17 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
 
         render(
           <PermissionGuard
-            scope={{ organisationId: 'org-123' as UUID }}
-            permission="read:users" as Permission
-            children={<div>Protected Content</div>}
+            {...defaultProps}
+            userId={'' as any}
+            fallback={<div>No Access</div>}
           />
         );
-        
-        expect(screen.getByText('Permission check failed: User context not available')).toBeInTheDocument();
-        expect(screen.getByText('Debug info')).toBeInTheDocument();
+
+        expect(screen.getByText('No Access')).toBeInTheDocument();
+        expect(screen.queryByText('Protected Content')).not.toBeInTheDocument();
       });
 
-      it('infers userId from window.__PACE_USER__ when not provided', () => {
+      it('does not infer userId from window.__PACE_USER__ when not provided', () => {
         mockUseCan.mockReturnValue({
           can: true,
           isLoading: false,
@@ -202,14 +202,13 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
 
         render(
           <PermissionGuard
-            scope={{ organisationId: 'org-123' as UUID }}
-            permission="read:users" as Permission
-            children={<div>Protected Content</div>}
+            {...defaultProps}
+            userId={'' as any}
+            fallback={<div>No Access</div>}
           />
         );
-        
-        expect(screen.getByText('Protected Content')).toBeInTheDocument();
-        expect(mockUseCan).toHaveBeenCalledWith('inferred-user-123', expect.any(Object), expect.any(String), undefined);
+
+        expect(mockUseCan).toHaveBeenCalledWith('', expect.any(Object), expect.any(String), undefined);
       });
     });
 
@@ -437,28 +436,27 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
     });
 
     describe('User Context Inference', () => {
-      it('shows error when no userId provided and cannot infer from context', () => {
+      it('renders fallback when user context is missing', () => {
         mockUseAccessLevel.mockReturnValue({
           accessLevel: 'viewer',
           isLoading: false,
           error: null,
         });
 
-        // Mock window.__PACE_USER__ as undefined
-        (window as any).__PACE_USER__ = undefined;
-
         render(
           <AccessLevelGuard
-            scope={{ organisationId: 'org-123' as UUID }}
+            {...defaultProps}
+            userId={'' as any}
             minLevel="admin"
-            children={<div>Admin Content</div>}
+            fallback={<div>No Access</div>}
           />
         );
-        
-        expect(screen.getByText('Access level check failed: User context not available')).toBeInTheDocument();
+
+        expect(screen.getByText('No Access')).toBeInTheDocument();
+        expect(screen.queryByText('Admin Content')).not.toBeInTheDocument();
       });
 
-      it('infers userId from window.__PACE_USER__ when not provided', () => {
+      it('does not infer userId from window globals', () => {
         mockUseAccessLevel.mockReturnValue({
           accessLevel: 'admin',
           isLoading: false,
@@ -470,14 +468,14 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
 
         render(
           <AccessLevelGuard
-            scope={{ organisationId: 'org-123' as UUID }}
+            {...defaultProps}
+            userId={'' as any}
             minLevel="admin"
-            children={<div>Admin Content</div>}
+            fallback={<div>No Access</div>}
           />
         );
-        
-        expect(screen.getByText('Admin Content')).toBeInTheDocument();
-        expect(mockUseAccessLevel).toHaveBeenCalledWith('inferred-user-123', expect.any(Object));
+
+        expect(mockUseAccessLevel).toHaveBeenCalledWith('', expect.any(Object));
       });
     });
   });