@jmruthers/pace-core 0.6.4 → 0.6.6

package/src/providers/OrganisationProvider.tsx

@@ -13,9 +13,9 @@
  * for backward compatibility or standalone usage.
  */
 
-import React from 'react';
-import { useUnifiedAuth } from '../providers/services/UnifiedAuthProvider';
-import { OrganisationServiceProvider } from './services/OrganisationServiceProvider';
+import React, { useContext } from 'react';
+import { UnifiedAuthContext } from '../providers/services/UnifiedAuthProvider';
+import { OrganisationServiceProvider, OrganisationServiceContext } from './services/OrganisationServiceProvider';
 import type { OrganisationProviderProps as BaseOrganisationProviderProps } from '../types/organisation';
 
 export interface OrganisationProviderProps extends BaseOrganisationProviderProps {
@@ -45,19 +45,29 @@ export function OrganisationProvider({
   autoSelectPrimaryOrganisation,
   onOrganisationChange
 }: OrganisationProviderProps) {
+  // Call all hooks unconditionally at the top level
+  // Hooks must be called in the same order on every render
+  // Check if we're already inside OrganisationServiceProvider (e.g., from UnifiedAuthProvider)
+  // If so, just pass through children to avoid double-wrapping
+  const existingOrganisationService = useContext(OrganisationServiceContext);
+  
   // Get auth context from UnifiedAuthProvider
-  const authContext = useUnifiedAuth();
+  // Use useContext directly instead of useUnifiedAuth() to avoid throwing
+  // if context isn't available yet (e.g., during initial render)
+  const authContext = useContext(UnifiedAuthContext);
   
-  // If we're inside UnifiedAuthProvider, it already includes OrganisationServiceProvider
-  // So we can just pass through the children
-  // However, if the auth context is not available, we need to handle that
-  if (!authContext) {
-    // If no auth context, we can't provide organisation service
-    // This might happen if used outside UnifiedAuthProvider
-    // In that case, we should probably throw an error or show a message
-    console.warn('OrganisationProvider: No auth context available. Make sure OrganisationProvider is used inside UnifiedAuthProvider.');
+  // Early return after all hooks have been called
+  if (existingOrganisationService) {
+    // We're already inside UnifiedAuthProvider which includes OrganisationServiceProvider
+    // Just pass through children - no need to wrap again
     return <>{children}</>;
   }
+  
+  // If no auth context, we can't provide organisation service
+  // This might happen if used outside UnifiedAuthProvider
+  if (!authContext) {
+    throw new Error('OrganisationProvider must be used inside UnifiedAuthProvider, or OrganisationServiceProvider must be provided separately');
+  }
 
   const { supabase, user, session } = authContext;
 
@@ -66,8 +76,7 @@ export function OrganisationProvider({
   // are handled by the OrganisationService internally, not by the provider
   // Note: supabase is mapped to supabaseClient for OrganisationServiceProvider
   if (!supabase) {
-    console.warn('OrganisationProvider: No supabase client available.');
-    return <>{children}</>;
+    throw new Error('OrganisationProvider: No supabase client available from UnifiedAuthProvider');
   }
 
   return (

package/src/providers/services/EventServiceProvider.tsx

@@ -73,16 +73,7 @@ export function EventServiceProvider({
   useEffect(() => {
     let isMounted = true;
 
-    logger.debug('EventServiceProvider', 'useEffect triggered', {
-      hasUser: !!user,
-      userId: user?.id,
-      hasSession: !!session,
-      appName,
-      isInitializing: initializingRef.current
-    });
-
     if (initializingRef.current) {
-      logger.debug('EventServiceProvider', 'Skipping - already initializing');
       return;
     }
 
@@ -90,14 +81,6 @@ export function EventServiceProvider({
       initializingRef.current = true;
 
       try {
-        logger.debug('EventServiceProvider', 'Updating dependencies and initializing', {
-          hasUser: !!user,
-          userId: user?.id,
-          hasSession: !!session,
-          appName,
-          hasSelectedOrganisation: !!selectedOrganisation
-        });
-
         // Update dependencies (now async to handle user change cleanup)
         await eventService.updateDependencies(supabaseClient, user, session, appName, selectedOrganisation, setSelectedEventId);
 
@@ -106,19 +89,13 @@ export function EventServiceProvider({
         // Re-initialize service when dependencies change
         // Only initialize if we have a user (required for fetching events)
         if (user && session && supabaseClient && appName) {
-          logger.debug('EventServiceProvider', 'Initializing event service');
           await eventService.initialize().catch(error => {
             if (isMounted) {
               logger.error('EventServiceProvider', 'Failed to initialize event service:', error);
             }
           });
         } else {
-          logger.debug('EventServiceProvider', 'Skipping initialization - missing required dependencies', {
-            hasUser: !!user,
-            hasSession: !!session,
-            hasSupabaseClient: !!supabaseClient,
-            appName
-          });
+          // Skipping initialization - missing required dependencies
         }
       } finally {
         initializingRef.current = false;

package/src/providers/services/UnifiedAuthProvider.tsx

@@ -198,23 +198,10 @@ function UnifiedAuthContextProvider({
   
   // App config removed - scope is now page-level only (rbac_app_pages.scope_type)
 
-  // Try to get event service, but provide fallback if not available
-  let eventService;
-  try {
-    eventService = useEventService();
-  } catch (error) {
-    // EventService not available - provide fallback implementation
-    // Include subscribe method to match BaseService interface
-    eventService = {
-      getEvents: () => [],
-      getSelectedEvent: () => null,
-      isLoading: () => false,
-      getError: () => null,
-      setSelectedEvent: () => {},
-      refreshEvents: async () => {},
-      subscribe: () => () => {} // No-op subscribe/unsubscribe for fallback
-    };
-  }
+  // Call hook unconditionally - if provider is missing, it will throw
+  // Errors should be handled by error boundaries at a higher level
+  // We cannot conditionally call hooks
+  const eventService = useEventService();
 
   // Get current auth state - these will trigger re-renders when services change
   const currentUser = authService.getUser();
@@ -232,14 +219,6 @@ function UnifiedAuthContextProvider({
   // This makes appId available early for navigation menu filtering
   const [appId, setAppId] = useState<string | undefined>(undefined);
   
-  useEffect(() => {
-    logger.debug('UnifiedAuthContextProvider', `Rendering [AuthService ID:${authService.getInstanceId?.() || 'unknown'}]`, {
-      hasUser: !!currentUser,
-      userId: currentUser?.id,
-      hasSession: !!currentSession,
-      isAuth
-    });
-  }, [currentUser?.id, currentSession?.access_token, isAuth, authService]);
 
   const isResolvingAppIdRef = useRef(false);
   const resolvedAppIdRef = useRef<string | undefined>(undefined);
@@ -668,12 +647,7 @@ function EventServiceProviderWrapper({
   }, []);
 
   useEffect(() => {
-    logger.debug('EventServiceProviderWrapper', 'Rendering with props', {
-      hasUser: !!user,
-      userId: user?.id,
-      hasSession: !!session,
-      selectedOrganisationId: selectedOrganisation?.id
-    });
+    // Render tracking removed for performance
   }, [user?.id, session?.access_token, selectedOrganisation?.id]);
 
   return (
@@ -720,12 +694,6 @@ function ServiceAwareProviders({
       const newUser = authService.getUser();
       const newSession = authService.getSession();
       
-      logger.debug('ServiceAwareProviders', 'Auth service notified, updating state', {
-        hasUser: !!newUser,
-        userId: newUser?.id,
-        hasSession: !!newSession
-      });
-      
       setUserState(newUser);
       setSessionState(newSession);
     });
@@ -737,15 +705,6 @@ function ServiceAwareProviders({
   const user = userState;
   const session = sessionState;
   
-  // Log when user/session changes for debugging
-  useEffect(() => {
-    logger.debug('ServiceAwareProviders', `User/session state [AuthService ID:${authService.getInstanceId?.() || 'unknown'}]`, {
-      hasUser: !!user,
-      userId: user?.id,
-      hasSession: !!session,
-      sessionToken: session?.access_token ? 'present' : 'missing'
-    });
-  }, [user?.id, session?.access_token, authService]);
 
   return (
     <OrganisationServiceProvider
@@ -824,8 +783,6 @@ export function UnifiedAuthProvider({
         note: 'Ensure you create the Supabase client once and reuse it. Creating multiple clients can cause performance issues and the "Multiple GoTrueClient instances" warning.'
       });
       clientRef.current = supabaseClient;
-    } else {
-      logger.debug('UnifiedAuthProvider', 'Supabase client reference is stable');
     }
   }, [supabaseClient]);
 

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

@@ -14,6 +14,9 @@ import { UnifiedAuthProvider, useUnifiedAuth } from '../UnifiedAuthProvider';
 import { type SupabaseClient, type User, type Session } from '@supabase/supabase-js';
 import { Logger, LogLevel } from '../../../utils/core/logger';
 
+// Unmock UnifiedAuthProvider to test the real implementation
+vi.unmock('../../../providers/services/UnifiedAuthProvider');
+
 // Mock Supabase client
 const createMockSupabaseClient = (): SupabaseClient => ({
   auth: {

package/src/rbac/README.md

@@ -229,18 +229,18 @@ import { PermissionEnforcer } from '@jmruthers/pace-core/rbac';
 
 function Dashboard() {
   return (
-    <div>
+    <main>
       <h1>Dashboard</h1>
       
       {/* Automatic scope resolution - no manual context needed */}
       <PermissionEnforcer
         permissions={['read:admin']}
         operation="admin-panel"
-        fallback={<div>Access Denied</div>}
+        fallback={<main>Access Denied</main>}
       >
         <AdminPanel />
       </PermissionEnforcer>
-    </div>
+    </main>
   );
 }
 ```
@@ -266,14 +266,14 @@ function UserActions() {
     }
   );
 
-  if (isLoading) return <div>Loading permissions...</div>;
-  if (error) return <div>Error: {error.message}</div>;
+  if (isLoading) return <main>Loading permissions...</main>;
+  if (error) return <main>Error: {error.message}</main>;
 
   return (
-    <div>
+    <section>
       {permissions['page-1']?.includes('read') && <ReadButton />}
       {permissions['page-1']?.includes('update') && <UpdateButton />}
-    </div>
+    </section>
   );
 }
 ```
@@ -301,13 +301,13 @@ function UserActions() {
     'page-123' // optional pageId
   );
 
-  if (isLoading) return <div>Checking permission...</div>;
-  if (error) return <div>Error: {error.message}</div>;
+  if (isLoading) return <main>Checking permission...</main>;
+  if (error) return <main>Error: {error.message}</main>;
 
   return (
-    <div>
+    <section>
       {can ? <AdminPanel /> : <AccessDenied />}
-    </div>
+    </section>
   );
 }
 ```
@@ -321,7 +321,7 @@ import { PermissionEnforcer, PagePermissionGuard } from '@jmruthers/pace-core/rb
 
 function EventDashboard() {
   return (
-    <div>
+    <main>
       <h1>Event Dashboard</h1>
       
       {/* Organization is automatically resolved from event context */}
@@ -338,7 +338,7 @@ function EventDashboard() {
       >
         <EventSettings />
       </PagePermissionGuard>
-    </div>
+    </main>
   );
 }
 ```
@@ -374,7 +374,7 @@ function EventDashboard() {
    ```tsx
    const { selectedOrganisationId } = useUnifiedAuth();
    if (!selectedOrganisationId) {
-     return <div>Please select an organisation first</div>;
+     return <main>Please select an organisation first</main>;
    }
    ```
 
@@ -479,14 +479,14 @@ function MyComponent() {
     { organisationId: 'org-456' }
   );
 
-  if (isLoading) return <div>Loading...</div>;
-  if (error) return <div>Error: {error.message}</div>;
+  if (isLoading) return <main>Loading...</main>;
+  if (error) return <main>Error: {error.message}</main>;
 
   return (
-    <div>
+    <section>
       {can && <AdminPanel />}
       {accessLevel === 'admin' && <AdminControls />}
-    </div>
+    </section>
   );
 }
 ```
@@ -498,7 +498,7 @@ import { PermissionEnforcer, PagePermissionGuard } from '@jmruthers/pace-core/rb
 
 function App() {
   return (
-    <div>
+    <main>
       <PermissionEnforcer
         permissions={['update:events']}
         operation="event-management"
@@ -514,7 +514,7 @@ function App() {
       >
         <AdminPanel />
       </PagePermissionGuard>
-    </div>
+    </main>
   );
 }
 ```