propro-utils 1.7.42 → 1.7.44

package/middlewares/access_token.js

@@ -37,18 +37,15 @@ 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];
       
-      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`,
           {
@@ -58,43 +55,32 @@ 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/middlewares/account_info.js

@@ -180,7 +180,8 @@ const checkIfUserExists = async accountId => {
   console.log("ACCOUNT INFO: 1");
 
   try {
-    const schemaResults = await Promise.all([
+    /* 
+     const schemaResults = await Promise.all([
       ServiceManager.getService("UserSchema"),
       ServiceManager.getService("UserStyleSchema"),
       ServiceManager.getService("FolderSchema"),
@@ -192,6 +193,31 @@ const checkIfUserExists = async accountId => {
     const [userSchema, userStyleSchema, folderSchema, themeSchema] =
       schemaResults;
 
+     */
+    const userSchema = await ServiceManager.getService("UserSchema");
+
+    console.log("ACCOUNT INFO: 2", userSchema);
+
+    const userStyleSchema = await ServiceManager.getService("UserStyleSchema");
+
+    console.log("ACCOUNT INFO: 3", userStyleSchema);
+
+    const folderSchema = await ServiceManager.getService("FolderSchema");
+
+    console.log("ACCOUNT INFO: 4", folderSchema);
+
+    const themeSchema = await ServiceManager.getService("ThemeSchema");
+    
+    console.log("ACCOUNT INFO: 5", themeSchema);
+
+    const schemaResults = [
+      userSchema,
+      userStyleSchema,
+      folderSchema,
+      themeSchema,
+    ];
+
+
     if (!userSchema) {
       throw new Error("UserSchema service not available");
     }

package/package.json

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

package/utils/serviceManager.js

@@ -31,15 +31,19 @@ class ServiceManager {
   }
 
   getService(name) {
+    console.log("GET SERVICE ", {name, service: this.services[name], servicePromise: this.servicePromises[name]});
+    
     if (this.services[name]) {
       return this.services[name];
     }
 
     if (!this.servicePromises[name]) {
       this.servicePromises[name] = {};
+      console.log("GET SERVICE - Promise assignment");
       this.servicePromises[name].promise = new Promise(resolve => {
         this.servicePromises[name].resolve = resolve;
       });
+      console.log("GET SERVICE - Promise assignment over", this.servicePromises[name]);
     }
 
     return this.servicePromises[name].promise;