propro-utils 1.5.94 → 1.5.96

package/middlewares/access_token.js

@@ -77,7 +77,7 @@ const authValidation = (requiredPermissions = []) => {
       req.user = user.id;
       next();
     } catch (error) {
-      console.log(error);
+      console.log(error.message);
       if (error.response && error.response.status) {
         next(new Error(error.response.data.message));
       }

package/middlewares/account_info.js

@@ -6,6 +6,7 @@ const ServiceManager = require('../utils/serviceManager');
 const defaultUserGlobalStyleShortcuts =
   require('./defaultUserGlobalStyleShortcuts.json').defaultGlobalStyleShortcuts;
 const defaultFolders = require('./defaultFolders.json').defaultFolders;
+const User = require('../models/user');
 
 /**
  * Retrieves the account profile data from the authentication server and caches it using Redis.
@@ -61,6 +62,54 @@ const getAccountProfile = async (redisClient, userSchema, accountId) => {
   }
 };
 
+/**
+ * Consolidates multiple UserGlobalStyles documents for an account into one
+ * @param {string} accountId - The account ID to consolidate styles for
+ * @returns {Promise<Object>} The consolidated UserGlobalStyles document
+ */
+async function consolidateGlobalStyles(accountId) {
+  const userStyleSchema = await ServiceManager.getService('UserStyleSchema');
+
+  // Find all global styles for this account
+  const allStyles = await userStyleSchema
+    .find({ accountId })
+    .sort({ createdAt: 1 });
+
+  if (allStyles.length <= 1) {
+    return allStyles[0];
+  }
+
+  // Use the first document as the main one and merge shortcuts from others
+  const mainStyle = allStyles[0];
+  const uniqueShortcuts = new Map();
+
+  // Merge all shortcuts, keeping the latest version of each shortcut by ID
+  allStyles.forEach(style => {
+    style.styleShortcuts.forEach(shortcut => {
+      uniqueShortcuts.set(shortcut.id.toString(), shortcut);
+    });
+  });
+
+  // Update the main style document with consolidated shortcuts
+  mainStyle.styleShortcuts = Array.from(uniqueShortcuts.values());
+  await mainStyle.save();
+
+  // Delete other style documents
+  await userStyleSchema.deleteMany({
+    accountId,
+    _id: { $ne: mainStyle._id },
+  });
+
+  // Update user reference if needed
+  const userSchema = await ServiceManager.getService('UserSchema');
+  await userSchema.updateMany(
+    { accountId },
+    { userGlobalStyles: mainStyle._id }
+  );
+
+  return mainStyle;
+}
+
 /**
  * Creates a new user global styles document with default style shortcuts.
  *
@@ -69,6 +118,13 @@ const getAccountProfile = async (redisClient, userSchema, accountId) => {
  * @returns {Promise<Object>} A promise that resolves to the created user global styles object.
  */
 async function createUserGlobalStyles(userStyleSchema, accountId) {
+  // First check if any existing styles need to be consolidated
+  const existingStyles = await userStyleSchema.find({ accountId });
+
+  if (existingStyles.length > 0) {
+    return await consolidateGlobalStyles(accountId);
+  }
+
   return await userStyleSchema.create({
     id: uuidv4(),
     styleShortcuts: defaultUserGlobalStyleShortcuts,
@@ -100,7 +156,7 @@ async function createDefaultFolders(folderSchema, accountId) {
 }
 
 const DEFAULT_THEME = {
-  canvasBackground: '#000000',
+  canvasBackground: '#1E1D1D',
   defaultItemWidth: 200,
   defaultColor: '#ffffff',
   fontSize: '16px',
@@ -117,8 +173,6 @@ const DEFAULT_THEME = {
  * @throws {Error} If there's an issue with database operations or invalid input
  */
 const checkIfUserExists = async accountId => {
-  console.log('Starting checkIfUserExists for accountId:', accountId);
-
   // Input validation
   if (!accountId || typeof accountId !== 'string') {
     console.warn('Invalid accountId provided:', accountId);
@@ -126,8 +180,6 @@ const checkIfUserExists = async accountId => {
   }
 
   try {
-    console.log('Loading schemas...');
-    // Load all required schemas in parallel
     const schemaResults = await Promise.all([
       ServiceManager.getService('UserSchema'),
       ServiceManager.getService('UserStyleSchema'),
@@ -138,14 +190,6 @@ const checkIfUserExists = async accountId => {
     const [userSchema, userStyleSchema, folderSchema, themeSchema] =
       schemaResults;
 
-    // Log the status of each schema
-    console.log('Schema loading results:', {
-      userSchema: userSchema ? 'Loaded' : 'Not available',
-      userStyleSchema: userStyleSchema ? 'Loaded' : 'Not available',
-      folderSchema: folderSchema ? 'Loaded' : 'Not available',
-      themeSchema: themeSchema ? 'Loaded' : 'Not available',
-    });
-
     if (!userSchema) {
       throw new Error('UserSchema service not available');
     }
@@ -167,49 +211,23 @@ const checkIfUserExists = async accountId => {
       );
     }
 
-    console.log('Schema loading and validation complete');
-
     // Find existing user with populated fields
     const user = await userSchema
       .findOne({ accountId })
       .select('-theme -folderList -userGlobalStyles -mapList')
       .lean();
 
-    console.log('User lookup result:', user ? 'User found' : 'User not found');
-
     if (user) {
-      console.log('Updating existing user data...');
       const updates = [];
 
       // Handle userGlobalStyles
       if (userStyleSchema) {
-        if (!user.userGlobalStyles) {
-          console.log('Creating missing userGlobalStyles...');
-          updates.push(
-            createUserGlobalStyles(userStyleSchema, accountId).then(
-              async styles => {
-                console.log('UserGlobalStyles created successfully');
-                await userSchema.updateOne(
-                  { _id: user._id },
-                  { userGlobalStyles: styles._id }
-                );
-                return styles;
-              }
-            )
-          );
-        } else if (user.userGlobalStyles.styleShortcuts?.length === 0) {
-          updates.push(
-            userStyleSchema.updateOne(
-              { _id: user.userGlobalStyles._id },
-              { styleShortcuts: defaultUserGlobalStyleShortcuts }
-            )
-          );
-        }
+        // Consolidate any duplicate global styles
+        await consolidateGlobalStyles(accountId);
       }
 
       // Handle folders
       if (folderSchema) {
-        console.log('Checking folders...');
         updates.push(
           (async () => {
             const existingFolders = await folderSchema
@@ -217,7 +235,6 @@ const checkIfUserExists = async accountId => {
               .select('name')
               .lean();
 
-            console.log('Existing folders count:', existingFolders.length);
             const existingFolderNames = new Set(
               existingFolders.map(f => f.name)
             );
@@ -239,7 +256,6 @@ const checkIfUserExists = async accountId => {
 
       // Handle themes
       if (themeSchema) {
-        console.log('Checking themes...');
         updates.push(
           (async () => {
             const defaultThemeExists = await themeSchema.exists({
@@ -247,7 +263,6 @@ const checkIfUserExists = async accountId => {
               accountId,
             });
 
-            console.log('Default theme exists:', defaultThemeExists);
             if (!defaultThemeExists) {
               const defaultTheme = await themeSchema.create({
                 ...DEFAULT_THEME,
@@ -267,9 +282,7 @@ const checkIfUserExists = async accountId => {
       }
 
       // Wait for all updates to complete
-      console.log('Waiting for all updates to complete...');
       await Promise.all(updates);
-      console.log('All updates completed successfully');
 
       // Return fresh user data after updates, excluding specified fields
       return userSchema
@@ -329,7 +342,6 @@ const checkIfUserExists = async accountId => {
       await createDefaultFolders(folderSchema, newUser.id);
     }
 
-    console.log('Operation completed successfully');
     return userSchema
       .findById(newUser._id)
       .select('-theme -folderList -userGlobalStyles -mapList')
@@ -346,7 +358,44 @@ const checkIfUserExists = async accountId => {
   }
 };
 
+const updateUserGlobalStyleShortcuts = async (userId, shortcutId, shortcut) => {
+  try {
+    const user = await User.findOne({ id: userId }).populate(
+      'userGlobalStyles'
+    );
+    if (!user) {
+      throw new Error('User not found');
+    }
+
+    // Ensure we have consolidated styles
+    const consolidatedStyles = await consolidateGlobalStyles(user.accountId);
+
+    // Find the index of the shortcut to update
+    const shortcutIndex = consolidatedStyles.styleShortcuts.findIndex(
+      s => s.id.toString() === shortcutId
+    );
+
+    if (shortcutIndex === -1) {
+      // If the shortcut doesn't exist, add it
+      consolidatedStyles.styleShortcuts.push(shortcut);
+    } else {
+      // If the shortcut exists, update it
+      consolidatedStyles.styleShortcuts[shortcutIndex] = {
+        ...consolidatedStyles.styleShortcuts[shortcutIndex],
+        ...shortcut,
+      };
+    }
+
+    await consolidatedStyles.save();
+    return consolidatedStyles;
+  } catch (error) {
+    console.error('Error updating user global style shortcuts:', error);
+    throw error;
+  }
+};
+
 module.exports = {
   getAccountProfile,
   checkIfUserExists,
+  updateUserGlobalStyleShortcuts,
 };

package/package.json

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