propro-utils 1.7.40 → 1.7.41

package/middlewares/access_token.js

@@ -37,15 +37,18 @@ const ServiceManager = require('../utils/serviceManager');
 const authValidation = (requiredPermissions = []) => {
   return async (req, res, next) => {
     try {
+      console.log("AUTH VALIDATION: 1", req.cookies);
       const accessToken =
-        req.cookies?.['x-access-token'] ||
-        req.headers.authorization?.split(' ')[1];
-
+      req.cookies?.['x-access-token'] ||
+      req.headers.authorization?.split(' ')[1];
+      
+      console.log("AUTH VALIDATION: 2", accessToken);
       if (!accessToken) {
         return res.status(403).json({ error: 'Access token is required' });
       }
-
+      
       const fetchPermission = async () => {
+        console.log("AUTH VALIDATION: fetchPermission()");
         const response = await axios.post(
           `${process.env.AUTH_URL}/api/v1/auth/validateToken`,
           {
@@ -55,32 +58,43 @@ const authValidation = (requiredPermissions = []) => {
         );
         return response.data;
       };
+      console.log("AUTH VALIDATION: 3");
       const redisClient = await ServiceManager.getService('RedisClient');
+      console.log("AUTH VALIDATION: 4");
       const cacheKey = `account:permissions:${accessToken}`;
+      console.log("AUTH VALIDATION: 5");
       const { accountId, validPermissions } = await getOrSetCache(
         redisClient,
         cacheKey,
         fetchPermission,
         1800
       );
-
+      console.log("AUTH VALIDATION: 6", validPermissions);
+      
       if (!validPermissions) {
         return res.status(403).json({ error: 'Invalid permissions' });
       }
-
+      
+      console.log("AUTH VALIDATION: 7", req.account);
+      
       req.account = accountId;
-
+      
       let user = null;
       try {
+        console.log("AUTH VALIDATION: 8");
         user = await checkIfUserExists(accountId);
+        console.log("AUTH VALIDATION: 9", user);
         if (!user) throw new Error('User not found');
       } catch (error) {
+        console.log("AUTH VALIDATION: ERROR 1", error);
         return res.status(403).json({error: error?.message || 'User not found'});
       }
-     
+      
       req.user = user.id;
+      console.log("AUTH VALIDATION: 10", req.user);
       next();
     } catch (error) {
+      console.log("AUTH VALIDATION: ERROR 2", error);
       if (error.response && error.response.status) {
         next(new Error(error.response.data.message));
       }

package/package.json

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

package/src/index.js

@@ -89,9 +89,7 @@ class ProProAuthMiddleware {
     }
   }
 
-  initializeServerAuth() {
-    console.log("INITIALIZE SERVER AUTH: Entered", this.serverAuth);
-    
+  initializeServerAuth() {    
     if (!this.serverAuth) {
       this.serverAuth = new ServerAuth(
         this.options.serverOptions,
@@ -102,17 +100,11 @@ class ProProAuthMiddleware {
         this.redisClient
       );
     }
-    console.log("INITIALIZE SERVER AUTH: UserSchema", this.serverAuth);
     ServiceManager.registerService('UserSchema', this.userSchema);
-    console.log('INITIALIZE SERVER AUTH: UserStyleSchema', this.userStyleSchema);
     ServiceManager.registerService('UserStyleSchema', this.userStyleSchema);
-    console.log('INITIALIZE SERVER AUTH: RedisClient', this.redisClient);
     ServiceManager.registerService('RedisClient', this.redisClient);
-    console.log('INITIALIZE SERVER AUTH: FolderSchema', this.folderSchema);
     ServiceManager.registerService('FolderSchema', this.folderSchema);
-    console.log('INITIALIZE SERVER AUTH: ThemeSchema', this.themeSchema);
     ServiceManager.registerService('ThemeSchema', this.themeSchema);
-    console.log('INITIALIZE SERVER AUTH: Exited');
     return this.serverAuth.middleware();
   }
 
@@ -125,14 +117,12 @@ class ProProAuthMiddleware {
 
   middleware() {
     return (req, res, next) => {
-      console.log("MIDDLEWARE: Entered", this.options)
       try {
         if (this.options.useServerAuth) {
           return this.initializeServerAuth()(req, res, next);
         } else if (this.options.useClientAuth) {
           return this.initializeClientAuth()(req, res, next);
         } else {
-          console.log("MIDDLEWARE: next()")
           next();
         }
       } catch (error) {

package/src/server/middleware/cookieUtils.js

@@ -184,14 +184,14 @@ const setAuthCookies = async (res, tokens, account, user, appUrl) => {
 
     await Promise.allSettled(extensionCookiePromises);
 
-    console.log('Auth cookies set successfully', {
-      domain,
-      sameSite: commonAttributes.sameSite,
-      cookieNames: [
-        ...Object.keys(httpOnlyCookies),
-        ...Object.keys(regularCookies),
-      ],
-    });
+    // console.log('Auth cookies set successfully', {
+    //   domain,
+    //   sameSite: commonAttributes.sameSite,
+    //   cookieNames: [
+    //     ...Object.keys(httpOnlyCookies),
+    //     ...Object.keys(regularCookies),
+    //   ],
+    // });
   } catch (error) {
     console.error('Error setting cookies:', {
       error: error.message,
@@ -258,11 +258,11 @@ const clearAuthCookies = async (res, appUrl) => {
     // Not in extension context, ignore
   }
 
-  console.log('Auth cookies cleared successfully', {
-    domain,
-    cookieNames,
-    sameSite: commonAttributes.sameSite,
-  });
+  // console.log('Auth cookies cleared successfully', {
+  //   domain,
+  //   cookieNames,
+  //   sameSite: commonAttributes.sameSite,
+  // });
 };
 
 module.exports = {