propro-utils 1.7.30 → 1.7.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "propro-utils",
-  "version": "1.7.30",
+  "version": "1.7.32",
   "description": "Auth middleware for propro-auth",
   "main": "src/index.js",
   "private": false,

package/src/server/index.js

@@ -188,9 +188,11 @@ class AuthMiddleware {
     const refreshToken =
       req.cookies['x-refresh-token'] || req.headers['x-refresh-token'];
     if (!refreshToken) {
+      console.error('Refresh token missing in request');
       return res.status(401).json({
         redirectUrl: this.constructRedirectUrl(),
         error: 'No refresh token provided',
+        message: 'Authentication required. Please log in.',
       });
     }
 
@@ -198,16 +200,25 @@ class AuthMiddleware {
     const lockKey = refreshToken;
     if (this.refreshLocks.has(lockKey)) {
       // Wait for the in-flight request to complete
+      console.log('Waiting for in-flight refresh request to complete...');
       try {
         const result = await this.refreshLocks.get(lockKey);
+        console.log('Reusing result from in-flight refresh request');
         return res.status(200).json(result);
       } catch (error) {
-        return res.status(401).json({ error: 'Failed to refresh token' });
+        console.error('In-flight refresh request failed:', error);
+        return res.status(401).json({ 
+          error: 'Failed to refresh token',
+          message: 'Session refresh failed. Please log in again.',
+        });
       }
     }
 
     // Create a promise for this refresh operation
     const refreshPromise = (async () => {
+      console.log('Starting refresh token operation...');
+      const startTime = Date.now();
+      
       try {
         const response = await this.refreshTokens(refreshToken);
         const { account, access, refresh } = response.data;
@@ -216,10 +227,13 @@ class AuthMiddleware {
           throw new Error('Invalid or expired refresh token');
         }
 
+        console.log(`Token refresh successful for account: ${account.accountId}`);
+
         const user = await checkIfUserExists(account.accountId);
 
         const { returnTokens } = req.query;
         if (returnTokens === 'true') {
+          console.log(`Refresh completed in ${Date.now() - startTime}ms (returning tokens)`);
           return { account, user, access, refresh };
         }
         
@@ -231,11 +245,24 @@ class AuthMiddleware {
           this.options.appUrl
         );
 
-        return { message: 'Token refreshed successfully' };
+        console.log(`Refresh completed in ${Date.now() - startTime}ms (cookies set)`);
+        return { 
+          message: 'Token refreshed successfully',
+          account: { accountId: account.accountId, email: account.email },
+        };
+      } catch (error) {
+        const status = error?.response?.status;
+        console.error(`Token refresh failed after ${Date.now() - startTime}ms (status: ${status}):`, error.message);
+        
+        // Immediately clean up lock on failure to prevent blocking
+        this.refreshLocks.delete(lockKey);
+        
+        throw error;
       } finally {
-        // Clean up lock after 30 seconds
+        // Clean up lock after 30 seconds for successful requests
         setTimeout(() => {
           this.refreshLocks.delete(lockKey);
+          console.log('Refresh lock cleaned up (delayed)');
         }, 30000);
       }
     })();
@@ -248,7 +275,28 @@ class AuthMiddleware {
       res.status(200).json(result);
     } catch (error) {
       console.error('Error refreshing token:', error);
-      res.status(401).json({ error: 'Failed to refresh token' });
+      
+      const status = error?.response?.status || 401;
+      const errorMessage = error?.response?.data?.message || error?.message || 'Failed to refresh token';
+      
+      // Pass through rate limit status
+      if (status === 429) {
+        const retryAfter = error?.response?.headers?.['retry-after'];
+        return res.status(429).json({ 
+          error: 'Too many requests',
+          message: 'Rate limit exceeded. Please try again later.',
+          retryAfter: retryAfter ? parseInt(retryAfter) : 900,
+        });
+      }
+      
+      // Handle 401 unauthorized
+      res.status(status).json({ 
+        error: 'Failed to refresh token',
+        message: errorMessage,
+        details: status === 401 
+          ? 'Your session has expired. Please log in again.'
+          : 'Your session could not be refreshed. Please log in again.',
+      });
     }
   };