fix: resolve 401/400 errors by centralizing API client and injecting organizationId in backend

apps/admin/src/lib/api.ts

@@ -8,3 +8,49 @@ export const ah = (token: string, orgId?: string | null) => {
     if (orgId) headers['x-organization-id'] = orgId;
     return headers;
 };
+
+export const api = {
+    async request(path: string, options: any = {}, token: string | null = null, orgId: string | null = null) {
+        const url = path.startsWith('http') ? path : `${API_URL}${path}`;
+        const headers = {
+            ...ah(token || '', orgId),
+            ...(options.headers || {})
+        };
+
+        const res = await fetch(url, { ...options, headers });
+        
+        if (res.status === 401) {
+            // Global 401 handling: Clear session and redirect to login
+            sessionStorage.clear();
+            window.location.href = '/login';
+            throw new Error('Unauthorized');
+        }
+
+        if (!res.ok) {
+            const error = await res.json().catch(() => ({ error: 'Unknown error' }));
+            throw new Error(error.error || `Request failed with status ${res.status}`);
+        }
+
+        return res.json();
+    },
+
+    get(path: string, token: string | null, orgId: string | null = null) {
+        return this.request(path, { method: 'GET' }, token, orgId);
+    },
+
+    post(path: string, body: any, token: string | null, orgId: string | null = null) {
+        return this.request(path, { method: 'POST', body: JSON.stringify(body) }, token, orgId);
+    },
+
+    put(path: string, body: any, token: string | null, orgId: string | null = null) {
+        return this.request(path, { method: 'PUT', body: JSON.stringify(body) }, token, orgId);
+    },
+
+    patch(path: string, body: any, token: string | null, orgId: string | null = null) {
+        return this.request(path, { method: 'PATCH', body: JSON.stringify(body) }, token, orgId);
+    },
+
+    delete(path: string, token: string | null, orgId: string | null = null) {
+        return this.request(path, { method: 'DELETE' }, token, orgId);
+    }
+};

apps/admin/src/pages/AnalyticsPage.tsx

@@ -10,7 +10,7 @@ import {
 } from 'lucide-react';
 import { useAuth } from '../lib/auth';
 import { useTenant } from '../lib/tenant';
-import { API_URL, ah } from '../lib/api';
+import { api } from '../lib/api';
 
 const COLORS = ['#6366f1', '#10b981', '#f59e0b', '#ef4444'];
 
@@ -27,14 +27,13 @@ export default function AnalyticsPage() {
     const fetchData = async () => {
       setLoading(true);
       try {
-        const h = ah(token, selectedOrgId);
-        const [usageRes, pedagogyRes] = await Promise.all([
-          fetch(`${API_URL}/v1/analytics/usage`, { headers: h }),
-          fetch(`${API_URL}/v1/analytics/pedagogy`, { headers: h })
+        const [usageData, pedagogyData] = await Promise.all([
+          api.get('/v1/analytics/usage', token, selectedOrgId),
+          api.get('/v1/analytics/pedagogy', token, selectedOrgId)
         ]);
 
-        if (usageRes.ok) setUsage(await usageRes.json());
-        if (pedagogyRes.ok) setPedagogy(await pedagogyRes.json());
+        setUsage(usageData);
+        setPedagogy(pedagogyData);
       } catch (err) {
         console.error('Analytics fetch error:', err);
       } finally {

apps/admin/src/pages/ClientsManagementView.tsx

@@ -1,6 +1,6 @@
 import { useState, useEffect } from 'react';
 import { Building2, Plus, MessageSquare, ShieldCheck, Activity, Loader2, X } from 'lucide-react';
-import { API_URL, ah } from '../lib/api';
+import { api } from '../lib/api';
 import { useAuth } from '../lib/auth';
 import { launchEmbeddedSignup } from '../lib/meta-signup';
 import MetaVerificationGuide from '../components/MetaVerificationGuide';
@@ -43,13 +43,8 @@ export default function ClientsManagementView() {
     const fetchClients = async () => {
         if (!token) return;
         try {
-            const res = await fetch(`${API_URL}/v1/organizations`, {
-                headers: ah(token)
-            });
-            if (res.ok) {
-                const data = await res.json();
-                setClients(data);
-            }
+            const data = await api.get('/v1/organizations', token);
+            setClients(data);
         } catch (error) {
             console.error("Failed to fetch organizations:", error);
         } finally {
@@ -65,16 +60,10 @@ export default function ClientsManagementView() {
         e.preventDefault();
         setIsCreating(true);
         try {
-            const res = await fetch(`${API_URL}/v1/organizations`, {
-                method: 'POST',
-                headers: ah(token!),
-                body: JSON.stringify({ name: newOrgName })
-            });
-            if (res.ok) {
-                await fetchClients();
-                setIsModalOpen(false);
-                setNewOrgName('');
-            }
+            await api.post('/v1/organizations', { name: newOrgName }, token!);
+            await fetchClients();
+            setIsModalOpen(false);
+            setNewOrgName('');
         } catch (error) {
             console.error("Failed to create organization:", error);
         } finally {
@@ -87,22 +76,12 @@ export default function ClientsManagementView() {
         try {
             const signupData = await launchEmbeddedSignup();
             
-            // Send the received credentials to our backend
-            const res = await fetch(`${API_URL}/v1/organizations/${orgId}/whatsapp-setup`, {
-                method: 'POST',
-                headers: ah(token!),
-                body: JSON.stringify(signupData)
-            });
-
-            if (res.ok) {
-                alert("WhatsApp connecté avec succès !");
-                fetchClients(); // Refresh list
-            } else {
-                const err = await res.json();
-                alert(`Erreur lors de l'enregistrement : ${err.error}`);
-            }
+            await api.post(`/v1/organizations/${orgId}/whatsapp-setup`, signupData, token!);
+            
+            alert("WhatsApp connecté avec succès !");
+            fetchClients(); // Refresh list
         } catch (error: any) {
-            alert(`Erreur Meta : ${error.message}`);
+            alert(`Erreur : ${error.message}`);
         }
     };
 
@@ -296,18 +275,12 @@ export default function ClientsManagementView() {
                     onClose={() => setSelectedOrgForPersonality(null)} 
                     onSave={async (config) => {
                         try {
-                            const res = await fetch(`${API_URL}/v1/organizations/${selectedOrgForPersonality.id}/personality`, {
-                                method: 'PATCH',
-                                headers: ah(token!),
-                                body: JSON.stringify(config)
-                            });
-                            if (res.ok) {
-                                alert("Personnalité mise à jour !");
-                                fetchClients();
-                                setSelectedOrgForPersonality(null);
-                            }
-                        } catch (err) {
-                            console.error(err);
+                            await api.patch(`/v1/organizations/${selectedOrgForPersonality.id}/personality`, config, token!);
+                            alert("Personnalité mise à jour !");
+                            fetchClients();
+                            setSelectedOrgForPersonality(null);
+                        } catch (err: any) {
+                            alert(`Erreur : ${err.message}`);
                         }
                     }}
                 />

apps/api/src/index.ts

@@ -87,6 +87,9 @@ const registerRoutes = async () => {
                     request.headers['x-organization-id'] = user.organizationId;
                 }
             }
+
+            // Centralized property for routes to use
+            (request as any).organizationId = request.headers['x-organization-id'];
         });
 
         scope.addHook('preHandler', (request, _reply, done) => {