propro-utils 1.5.35 → 1.5.37

package/middlewares/access_token.js

@@ -2,6 +2,7 @@ require('dotenv').config();
 const axios = require('axios');
 const { getOrSetCache } = require('../utils/redis');
 const { checkIfUserExists } = require('./account_info');
+const ServiceManager = require('../utils/serviceManager');
 
 /**
  * Middleware for authenticating and authorizing API requests.

package/middlewares/account_info.js

@@ -2,6 +2,7 @@ require('dotenv').config();
 const axios = require('axios');
 const { getOrSetCache } = require('../utils/redis');
 const { v4: uuidv4 } = require('uuid');
+const ServiceManager = require('../utils/serviceManager');
 
 /**
  * Retrieves the account profile data from the authentication server and caches it using Redis.
@@ -84,7 +85,10 @@ const checkIfUserExists = async accountId => {
   try {
     const userSchema = await ServiceManager.getService('UserSchema');
     const userStyleSchema = await ServiceManager.getService('UserStyleSchema');
-    let user = await userSchema.findOne({ accountId });
+
+    let user = await userSchema
+      .findOne({ accountId })
+      .populate('userGlobalStyles');
 
     if (user) {
       if (!user.userGlobalStyles) {
@@ -93,6 +97,9 @@ const checkIfUserExists = async accountId => {
           accountId
         );
         await user.save();
+        user = await userSchema
+          .findOne({ accountId })
+          .populate('userGlobalStyles');
       }
       return user;
     }
@@ -101,16 +108,17 @@ const checkIfUserExists = async accountId => {
       userStyleSchema,
       accountId
     );
+
     user = await userSchema.create({
       accountId,
       id: uuidv4(),
       verified: false,
-      userGlobalStyles,
+      userGlobalStyles: userGlobalStyles._id,
     });
 
-    return user;
+    return await user.populate('userGlobalStyles');
   } catch (error) {
-    console.error('Error in getOrCreateUser:', error);
+    console.error('Error in checkIfUserExists:', error);
     throw new Error('Failed to get or create user');
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "propro-utils",
-  "version": "1.5.35",
+  "version": "1.5.37",
   "description": "Auth middleware for propro-auth",
   "main": "src/index.js",
   "scripts": {

package/src/server/middleware/cookieUtils.js

@@ -44,6 +44,7 @@ const sanitizeUser = user => {
     sanitized.accountId = sanitized._doc.accountId;
     sanitized.createdAt = sanitized._doc.createdAt;
     sanitized.updatedAt = sanitized._doc.updatedAt;
+    sanitized.userGlobalStyles = sanitized._doc.userGlobalStyles;
 
     delete sanitized._doc.mapList;
     delete sanitized._doc.folderList;