erm

Signed-off-by: boris <boris@borishub.co.uk>

public/js/apiClient.js

@@ -5,23 +5,40 @@
  * authentication and common request patterns.
  * 
  * The client uses JWT tokens for authentication, which are automatically
- * included in requests via the authFetch function provided by the auth service.
+ * included in requests via the fetchAuth function provided by the simpleAuth service.
+ * 
+ * NOTE: For authentication (login, logout, token validation), please use the simpleAuth
+ * service directly instead of this API client.
  */
 class ApiClient {
     /**
      * Constructor
      * 
      * Initialises the API client and sets up the authenticated fetch function.
-     * Relies on the auth service being available in the global scope.
+     * Relies on the simpleAuth service being available in the global scope.
      */
     constructor() {
         // Ensure auth service is available
-        if (!window.auth) {
+        if (!simpleAuth) {
             console.error('Auth service not available');
         }
         
-        // Create authenticated fetch function if not already available
-        this.authFetch = window.authFetch || window.auth?.createAuthFetch() || fetch;
+        // Use the fetchAuth method from simpleAuth
+        this.authFetch = async (url, options = {}) => {
+            try {
+                // For unauthenticated requests or when authentication is not required
+                if (!options.requireAuth || !simpleAuth.isAuthenticated()) {
+                    return fetch(url, options);
+                }
+                
+                // For authenticated requests
+                delete options.requireAuth; // Remove the custom property
+                return simpleAuth.fetchAuth(url, options);
+            } catch (error) {
+                console.error('Error in authFetch:', error);
+                throw error;
+            }
+        };
     }
     
     /**
@@ -115,7 +132,27 @@ class ApiClient {
             formData.append(key, value);
         });
         
-        return this.post('/facilitycontroller.php', formData);
+        try {
+            // Use authenticated fetch for all facility requests
+            const response = await this.authFetch('/facilitycontroller.php', {
+                method: 'POST',
+                body: formData,
+                requireAuth: true // Explicitly require authentication
+            });
+
+            // Check if response is ok
+            if (!response.ok) {
+                throw new Error(`HTTP error! status: ${response.status}`);
+            }
+
+            // Parse the JSON response
+            const jsonData = await response.json();
+            console.log('Facility API response:', { action, data: jsonData });
+            return jsonData;
+        } catch (error) {
+            console.error('Facility API error:', error);
+            throw error;
+        }
     }
     
     /**
@@ -183,12 +220,15 @@ class ApiClient {
      * 
      * This method adds a new status update to a facility.
      * 
-     * @param {number|string} idStatus - The facility ID
-     * @param {string} updateStatus - The status comment
+     * @param {number|string} facilityId - The facility ID
+     * @param {string} statusComment - The status comment
      * @returns {Promise<Object>} The response data
      */
-    async addFacilityStatus(idStatus, updateStatus) {
-        return this.facility('status', { idStatus, updateStatus });
+    async addFacilityStatus(facilityId, statusComment) {
+        return this.facility('status', { 
+            facilityId: facilityId,
+            statusComment: statusComment
+        });
     }
     
     /**
@@ -217,87 +257,6 @@ class ApiClient {
     async deleteFacilityStatus(statusId, facilityId) {
         return this.facility('deleteStatus', { statusId, facilityId });
     }
-    
-    /**
-     * Authenticates a user
-     * 
-     * This method sends a login request with the provided credentials.
-     * It uses a direct fetch call rather than authFetch since the user
-     * isn't authenticated yet.
-     * 
-     * @param {string} username - The username
-     * @param {string} password - The password
-     * @param {string} captchaInput - The CAPTCHA input (optional)
-     * @returns {Promise<Object>} The response data
-     */
-    async login(username, password, captchaInput = null) {
-        const formData = new FormData();
-        formData.append('action', 'login');
-        formData.append('username', username);
-        formData.append('password', password);
-        
-        if (captchaInput) {
-            formData.append('captchaInput', captchaInput);
-        }
-        
-        const response = await fetch('/logincontroller.php', {
-            method: 'POST',
-            headers: {
-                'X-Requested-With': 'XMLHttpRequest'
-            },
-            body: formData
-        });
-        
-        return await response.json();
-    }
-    
-    /**
-     * Refreshes the access token
-     * 
-     * This method sends a request to refresh an expired JWT token
-     * using the provided refresh token.
-     * 
-     * @param {string} refreshToken - The refresh token
-     * @returns {Promise<Object>} The response data
-     */
-    async refreshToken(refreshToken) {
-        const formData = new FormData();
-        formData.append('action', 'refresh');
-        formData.append('refreshToken', refreshToken);
-        
-        const response = await fetch('/logincontroller.php', {
-            method: 'POST',
-            headers: {
-                'X-Requested-With': 'XMLHttpRequest'
-            },
-            body: formData
-        });
-        
-        return await response.json();
-    }
-    
-    /**
-     * Logs out the current user
-     * 
-     * This method sends a logout request to invalidate the session.
-     * Note that client-side token removal is handled separately.
-     * 
-     * @returns {Promise<Object>} The response data
-     */
-    async logout() {
-        const formData = new FormData();
-        formData.append('action', 'logout');
-        
-        const response = await fetch('/logincontroller.php', {
-            method: 'POST',
-            headers: {
-                'X-Requested-With': 'XMLHttpRequest'
-            },
-            body: formData
-        });
-        
-        return await response.json();
-    }
 }
 
 // Initialize API client