Merge branch 'master' of github.com:profullstack/generate-pdf-api

Author: ralyodio

public/js/api-client.js

@@ -2,6 +2,31 @@
  * API client for document generation service
  */
 export class ApiClient {
+  // Flag to avoid logging token warning multiple times
+  static _tokenWarningLogged = false;
+  
+  /**
+   * Get a valid JWT token or null if none is available
+   * @returns {string|null} - Valid JWT token or null
+   * @private
+   */
+  static _getValidJwtToken() {
+    // Get JWT token from localStorage
+    const jwtToken = localStorage.getItem('jwt_token');
+    
+    // Validate token to prevent sending 'null' string
+    if (jwtToken && jwtToken !== 'null' && jwtToken.length > 50) {
+      return jwtToken;
+    }
+    
+    // Log only once per session to avoid console spam
+    if (!ApiClient._tokenWarningLogged) {
+      console.warn('No valid JWT token available in localStorage');
+      ApiClient._tokenWarningLogged = true;
+    }
+    
+    return null;
+  }
   /**
    * Base URL for API endpoints
    * @type {string}
@@ -128,13 +153,13 @@ export class ApiClient {
     url.searchParams.append('limit', limit.toString());
     url.searchParams.append('offset', offset.toString());
 
-    // Get JWT token from localStorage
-    const jwtToken = localStorage.getItem('jwt_token');
-    
     const headers = {
       'Accept': 'application/json',
     };
 
+    // Get a valid JWT token using our helper method
+    const jwtToken = ApiClient._getValidJwtToken();
+    
     // Add Authorization header with JWT token if available
     if (jwtToken) {
       headers['Authorization'] = `Bearer ${jwtToken}`;
@@ -162,13 +187,13 @@ export class ApiClient {
    */
   static async createSubscription(email, plan, coin) {
     try {
-      // Get JWT token from localStorage
-      const jwtToken = localStorage.getItem('jwt_token');
-      
       const headers = {
         'Content-Type': 'application/json'
       };
 
+      // Get a valid JWT token using our helper method
+      const jwtToken = ApiClient._getValidJwtToken();
+      
       // Add Authorization header with JWT token if available
       if (jwtToken) {
         headers['Authorization'] = `Bearer ${jwtToken}`;
@@ -227,21 +252,16 @@ export class ApiClient {
    * @private
    */
   static async fetchBinaryResponse(url, body) {
-    // Get JWT token from localStorage and ensure it's properly formatted
-    let jwtToken = localStorage.getItem('jwt_token');
-    
     const headers = {
       'Content-Type': 'application/json',
     };
 
+    // Get a valid JWT token using our helper method
+    const jwtToken = ApiClient._getValidJwtToken();
+    
     // Add Authorization header with JWT token if available
     if (jwtToken) {
-      // Ensure token is properly trimmed
-      jwtToken = jwtToken.trim();
-      
-      // Log token information for debugging
       console.log(`API Client: Using JWT token of length ${jwtToken.length}`);
-      
       headers['Authorization'] = `Bearer ${jwtToken}`;
     }
 

public/js/components/api-key-manager.js

@@ -729,9 +729,27 @@ export class ApiKeyManager extends BaseComponent {
   _getApiKey() {
     // First, try to get JWT token
     const jwtToken = localStorage.getItem('jwt_token');
-    if (jwtToken) {
-      console.log('Using JWT token for authentication, length:', jwtToken.length);
+    if (jwtToken && jwtToken !== 'null' && jwtToken.length > 50) {
+      console.log('Using valid JWT token for authentication, length:', jwtToken.length);
       return jwtToken;
+    } else if (jwtToken) {
+      console.warn('Found invalid JWT token in localStorage, length:', jwtToken?.length || 0);
+    }
+    
+    // Try to recover JWT token from Supabase
+    try {
+      // Check if Supabase client is available globally
+      if (window.supabase) {
+        const session = window.supabase.auth.session();
+        if (session && session.access_token && session.access_token.length > 50) {
+          console.log('Recovered token from Supabase session, length:', session.access_token.length);
+          // Store for future use
+          localStorage.setItem('jwt_token', session.access_token);
+          return session.access_token;
+        }
+      }
+    } catch (e) {
+      console.error('Error recovering token from Supabase:', e);
     }
 
     // Next, try API key from localStorage
@@ -749,7 +767,7 @@ export class ApiKeyManager extends BaseComponent {
       return urlApiKey;
     }
 
-    console.warn('No authentication token found in storage or URL');
+    console.warn('No valid authentication token found in storage or URL');
     return null;
   }
 }

public/js/components/pf-dialog.js

@@ -357,4 +357,7 @@ if (typeof window !== 'undefined') {
 
   // Add to window for direct access
   window.PfDialog = PfDialog;
-}
+}
+
+// Export the class for module imports
+export default PfDialog;

public/js/utils/auth-status.js

@@ -67,6 +67,17 @@ export async function checkAuthStatus() {
       };
     }
 
+    // Only proceed with a valid token
+    if (!jwtToken || jwtToken === 'null' || jwtToken.length < 50) {
+      console.error('No valid token available after recovery attempts');
+      return {
+        authenticated: false,
+        message: 'No valid authentication token available'
+      };
+    }
+    
+    console.log('Using JWT token for auth check, length:', jwtToken.length);
+    
     // Make request to auth status endpoint
     const response = await fetch('/api/1/auth/status', {
       method: 'GET',