propro-utils 1.5.97 → 1.6.0

package/middlewares/account_info.js

@@ -1,11 +1,11 @@
-require('dotenv').config();
-const axios = require('axios');
-const { getOrSetCache } = require('../utils/redis');
-const { v4: uuidv4 } = require('uuid');
-const ServiceManager = require('../utils/serviceManager');
+require("dotenv").config();
+const axios = require("axios");
+const { getOrSetCache } = require("../utils/redis");
+const { v4: uuidv4 } = require("uuid");
+const ServiceManager = require("../utils/serviceManager");
 const defaultUserGlobalStyleShortcuts =
-  require('./defaultUserGlobalStyleShortcuts.json').defaultGlobalStyleShortcuts;
-const defaultFolders = require('./defaultFolders.json').defaultFolders;
+  require("./defaultUserGlobalStyleShortcuts.json").defaultGlobalStyleShortcuts;
+const defaultFolders = require("./defaultFolders.json").defaultFolders;
 
 /**
  * Retrieves the account profile data from the authentication server and caches it using Redis.
@@ -20,10 +20,10 @@ const defaultFolders = require('./defaultFolders.json').defaultFolders;
 const getAccountProfile = async (redisClient, userSchema, accountId) => {
   try {
     const accessToken =
-      req.cookies['x-access-token'] || req.headers.authorization?.split(' ')[1];
+      req.cookies["x-access-token"] || req.headers.authorization?.split(" ")[1];
 
     if (!accessToken) {
-      throw new Error('Access token is required');
+      throw new Error("Access token is required");
     }
 
     const fetchPermission = async () => {
@@ -49,7 +49,7 @@ const getAccountProfile = async (redisClient, userSchema, accountId) => {
     );
 
     if (!profileData) {
-      throw new Error('Invalid permissions');
+      throw new Error("Invalid permissions");
     }
 
     return profileData;
@@ -57,7 +57,7 @@ const getAccountProfile = async (redisClient, userSchema, accountId) => {
     if (error.response && error.response.status) {
       throw new Error(error.response.data.message);
     }
-    throw new Error('Error validating token');
+    throw new Error("Error validating token");
   }
 };
 
@@ -67,12 +67,13 @@ const getAccountProfile = async (redisClient, userSchema, accountId) => {
  * @returns {Promise<Object>} The consolidated UserGlobalStyles document
  */
 async function consolidateGlobalStyles(accountId) {
-  const userStyleSchema = await ServiceManager.getService('UserStyleSchema');
+  const userStyleSchema = await ServiceManager.getService("UserStyleSchema");
 
-  // Find all global styles for this account
+  // Find all global styles for this account with allowDiskUse option
   const allStyles = await userStyleSchema
     .find({ accountId })
-    .sort({ createdAt: 1 });
+    .sort({ createdAt: 1 })
+    .option({ allowDiskUse: true });
 
   if (allStyles.length <= 1) {
     return allStyles[0];
@@ -83,8 +84,8 @@ async function consolidateGlobalStyles(accountId) {
   const uniqueShortcuts = new Map();
 
   // Merge all shortcuts, keeping the latest version of each shortcut by ID
-  allStyles.forEach(style => {
-    style.styleShortcuts.forEach(shortcut => {
+  allStyles.forEach((style) => {
+    style.styleShortcuts.forEach((shortcut) => {
       uniqueShortcuts.set(shortcut.id.toString(), shortcut);
     });
   });
@@ -100,7 +101,7 @@ async function consolidateGlobalStyles(accountId) {
   });
 
   // Update user reference if needed
-  const userSchema = await ServiceManager.getService('UserSchema');
+  const userSchema = await ServiceManager.getService("UserSchema");
   await userSchema.updateMany(
     { accountId },
     { userGlobalStyles: mainStyle._id }
@@ -108,7 +109,6 @@ async function consolidateGlobalStyles(accountId) {
 
   return mainStyle;
 }
-
 /**
  * Creates a new user global styles document with default style shortcuts.
  *
@@ -140,8 +140,8 @@ async function createUserGlobalStyles(userStyleSchema, accountId) {
  */
 async function createDefaultFolders(folderSchema, accountId) {
   try {
-    console.log('Creating default folders for user:', accountId);
-    const folderPromises = defaultFolders.map(folder =>
+    console.log("Creating default folders for user:", accountId);
+    const folderPromises = defaultFolders.map((folder) =>
       folderSchema.create({
         ...folder,
         user_id: accountId,
@@ -149,17 +149,17 @@ async function createDefaultFolders(folderSchema, accountId) {
     );
     return Promise.all(folderPromises);
   } catch (error) {
-    console.error('Error in createDefaultFolders:', error);
-    throw new Error('Failed to create default folders');
+    console.error("Error in createDefaultFolders:", error);
+    throw new Error("Failed to create default folders");
   }
 }
 
 const DEFAULT_THEME = {
-  canvasBackground: '#1E1D1D',
+  canvasBackground: "#1E1D1D",
   defaultItemWidth: 200,
-  defaultColor: '#ffffff',
-  fontSize: '16px',
-  name: 'Default Theme',
+  defaultColor: "#ffffff",
+  fontSize: "16px",
+  name: "Default Theme",
   isDefault: true,
 };
 
@@ -171,49 +171,49 @@ const DEFAULT_THEME = {
  * @returns {Promise<Object>} A promise that resolves to the complete user object
  * @throws {Error} If there's an issue with database operations or invalid input
  */
-const checkIfUserExists = async accountId => {
+const checkIfUserExists = async (accountId) => {
   // Input validation
-  if (!accountId || typeof accountId !== 'string') {
-    console.warn('Invalid accountId provided:', accountId);
-    throw new Error('Invalid accountId provided');
+  if (!accountId || typeof accountId !== "string") {
+    console.warn("Invalid accountId provided:", accountId);
+    throw new Error("Invalid accountId provided");
   }
 
   try {
     const schemaResults = await Promise.all([
-      ServiceManager.getService('UserSchema'),
-      ServiceManager.getService('UserStyleSchema'),
-      ServiceManager.getService('FolderSchema'),
-      ServiceManager.getService('ThemeSchema'),
+      ServiceManager.getService("UserSchema"),
+      ServiceManager.getService("UserStyleSchema"),
+      ServiceManager.getService("FolderSchema"),
+      ServiceManager.getService("ThemeSchema"),
     ]);
 
     const [userSchema, userStyleSchema, folderSchema, themeSchema] =
       schemaResults;
 
     if (!userSchema) {
-      throw new Error('UserSchema service not available');
+      throw new Error("UserSchema service not available");
     }
 
     // Optional schemas warning
     if (!userStyleSchema) {
       console.warn(
-        'UserStyleSchema service not available - style features will be skipped'
+        "UserStyleSchema service not available - style features will be skipped"
       );
     }
     if (!folderSchema) {
       console.warn(
-        'FolderSchema service not available - folder features will be skipped'
+        "FolderSchema service not available - folder features will be skipped"
       );
     }
     if (!themeSchema) {
       console.warn(
-        'ThemeSchema service not available - theme features will be skipped'
+        "ThemeSchema service not available - theme features will be skipped"
       );
     }
 
     // Find existing user with populated fields
     const user = await userSchema
       .findOne({ accountId })
-      .select('-theme -folderList -userGlobalStyles -mapList')
+      .select("-theme -folderList -userGlobalStyles -mapList")
       .lean();
 
     if (user) {
@@ -231,19 +231,19 @@ const checkIfUserExists = async accountId => {
           (async () => {
             const existingFolders = await folderSchema
               .find({ user_id: user.id })
-              .select('name')
+              .select("name")
               .lean();
 
             const existingFolderNames = new Set(
-              existingFolders.map(f => f.name)
+              existingFolders.map((f) => f.name)
             );
             const foldersToCreate = defaultFolders.filter(
-              folder => !existingFolderNames.has(folder.name)
+              (folder) => !existingFolderNames.has(folder.name)
             );
 
             if (foldersToCreate.length > 0) {
               return folderSchema.insertMany(
-                foldersToCreate.map(folder => ({
+                foldersToCreate.map((folder) => ({
                   ...folder,
                   user_id: user.id,
                 }))
@@ -258,7 +258,7 @@ const checkIfUserExists = async accountId => {
         updates.push(
           (async () => {
             const defaultThemeExists = await themeSchema.exists({
-              name: 'Default Theme',
+              name: "Default Theme",
               accountId,
             });
 
@@ -286,7 +286,7 @@ const checkIfUserExists = async accountId => {
       // Return fresh user data after updates, excluding specified fields
       return userSchema
         .findOne({ accountId })
-        .select('-theme -folderList -userGlobalStyles -mapList')
+        .select("-theme -folderList -userGlobalStyles -mapList")
         .lean();
     }
 
@@ -298,7 +298,7 @@ const checkIfUserExists = async accountId => {
     let userGlobalStyles;
     if (userStyleSchema) {
       creationTasks.push(
-        createUserGlobalStyles(userStyleSchema, accountId).then(styles => {
+        createUserGlobalStyles(userStyleSchema, accountId).then((styles) => {
           userGlobalStyles = styles;
           return styles;
         })
@@ -316,8 +316,8 @@ const checkIfUserExists = async accountId => {
             userId,
             id: uuidv4(),
           })
-          .then(theme => {
-            console.log('Created theme:', theme);
+          .then((theme) => {
+            console.log("Created theme:", theme);
             defaultTheme = theme;
             return theme;
           })
@@ -343,10 +343,10 @@ const checkIfUserExists = async accountId => {
 
     return userSchema
       .findById(newUser._id)
-      .select('-theme -folderList -userGlobalStyles -mapList')
+      .select("-theme -folderList -userGlobalStyles -mapList")
       .lean();
   } catch (error) {
-    console.error('Detailed error in checkIfUserExists:', {
+    console.error("Detailed error in checkIfUserExists:", {
       accountId,
       errorName: error.name,
       errorMessage: error.message,
@@ -361,9 +361,9 @@ const updateUserGlobalStyleShortcuts = async (userId, shortcutId, shortcut) => {
   try {
     const user = await userSchema
       .findOne({ id: userId })
-      .populate('userGlobalStyles');
+      .populate("userGlobalStyles");
     if (!user) {
-      throw new Error('User not found');
+      throw new Error("User not found");
     }
 
     // Ensure we have consolidated styles
@@ -371,7 +371,7 @@ const updateUserGlobalStyleShortcuts = async (userId, shortcutId, shortcut) => {
 
     // Find the index of the shortcut to update
     const shortcutIndex = consolidatedStyles.styleShortcuts.findIndex(
-      s => s.id.toString() === shortcutId
+      (s) => s.id.toString() === shortcutId
     );
 
     if (shortcutIndex === -1) {
@@ -388,7 +388,7 @@ const updateUserGlobalStyleShortcuts = async (userId, shortcutId, shortcut) => {
     await consolidatedStyles.save();
     return consolidatedStyles;
   } catch (error) {
-    console.error('Error updating user global style shortcuts:', error);
+    console.error("Error updating user global style shortcuts:", error);
     throw error;
   }
 };

package/package.json

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

package/src/server/middleware/cookieUtils.js

@@ -3,19 +3,19 @@
  * This module provides functions for setting and clearing authentication cookies.
  */
 
-const { URL } = require('url');
+const { URL } = require("url");
 
 /**
  * Safely stringify an object, handling circular references
  * @param {Object} obj - The object to stringify
  * @return {string} A JSON string representation of the object
  */
-const safeStringify = obj => {
+const safeStringify = (obj) => {
   const seen = new WeakSet();
   return JSON.stringify(obj, (key, value) => {
-    if (typeof value === 'object' && value !== null) {
+    if (typeof value === "object" && value !== null) {
       if (seen.has(value)) {
-        return '[Circular]';
+        return "[Circular]";
       }
       seen.add(value);
     }
@@ -28,7 +28,7 @@ const safeStringify = obj => {
  * @param {Object} user - The user object to sanitize
  * @return {Object} A sanitized version of the user object
  */
-const sanitizeUser = user => {
+const sanitizeUser = (user) => {
   const sanitized = { ...user };
 
   delete sanitized.password;
@@ -61,10 +61,10 @@ const sanitizeUser = user => {
  * @param {Object} details - Cookie details
  * @returns {Promise} Promise that resolves when cookie is set
  */
-const setChromeExtensionCookie = details => {
+const setChromeExtensionCookie = (details) => {
   return new Promise((resolve, reject) => {
     try {
-      chrome.cookies.set(details, cookie => {
+      chrome.cookies.set(details, (cookie) => {
         if (chrome.runtime.lastError) {
           reject(chrome.runtime.lastError);
         } else {
@@ -83,13 +83,13 @@ const setChromeExtensionCookie = details => {
  */
 const setAuthCookies = async (res, tokens, account, user, appUrl) => {
   if (!tokens?.refresh?.token || !tokens?.access?.token) {
-    throw new Error('Invalid tokens object');
+    throw new Error("Invalid tokens object");
   }
   if (!account) {
-    throw new Error('Invalid account object');
+    throw new Error("Invalid account object");
   }
   if (!user) {
-    throw new Error('Invalid user object');
+    throw new Error("Invalid user object");
   }
 
   const currentDateTime = new Date();
@@ -102,34 +102,34 @@ const setAuthCookies = async (res, tokens, account, user, appUrl) => {
   let domain;
   try {
     domain = appUrl ? new URL(appUrl).hostname : undefined;
-    if (domain?.includes('mapmap.app')) {
-      domain = '.mapmap.app';
+    if (domain?.includes("mapmap.app")) {
+      domain = ".mapmap.app";
     }
-    if (domain?.includes('localhost')) {
+    if (domain?.includes("localhost")) {
       domain = undefined;
     }
-    if (domain?.includes('propro.so')) {
-      domain = 'propro.so';
+    if (domain?.includes("propro.so")) {
+      domain = ".propro.so";
     }
   } catch (error) {
-    console.error('Invalid appUrl:', { error, appUrl });
+    console.error("Invalid appUrl:", { error, appUrl });
     domain = undefined;
   }
 
   const commonAttributes = {
     secure: true,
-    sameSite: 'None',
+    sameSite: "None",
     domain,
-    path: '/',
+    path: "/",
   };
 
   const httpOnlyCookies = {
-    'x-refresh-token': {
+    "x-refresh-token": {
       value: tokens.refresh.token,
       maxAge: refreshMaxAge,
       httpOnly: true,
     },
-    'x-access-token': {
+    "x-access-token": {
       value: tokens.access.token,
       maxAge: accessMaxAge,
       httpOnly: true,
@@ -150,7 +150,7 @@ const setAuthCookies = async (res, tokens, account, user, appUrl) => {
       maxAge: refreshMaxAge,
     },
     has_account_token: {
-      value: JSON.stringify({ value: 'true', expires: accessMaxAge }),
+      value: JSON.stringify({ value: "true", expires: accessMaxAge }),
       maxAge: accessMaxAge,
     },
   };
@@ -170,21 +170,21 @@ const setAuthCookies = async (res, tokens, account, user, appUrl) => {
       ...regularCookies,
     }).map(([name, config]) => {
       return setChromeExtensionCookie({
-        url: `https://${domain || 'propro.so'}`,
+        url: `https://${domain || "propro.so"}`,
         name,
         value: config.value,
         secure: true,
         httpOnly: !!config.httpOnly,
-        sameSite: 'no_restriction',
-        path: '/',
+        sameSite: "no_restriction",
+        path: "/",
         expirationDate: Math.floor((Date.now() + config.maxAge) / 1000),
-        domain: domain?.startsWith('.') ? domain : `.${domain || 'propro.so'}`,
+        domain: domain?.startsWith(".") ? domain : `.${domain || "propro.so"}`,
       });
     });
 
     await Promise.allSettled(extensionCookiePromises);
 
-    console.log('Auth cookies set successfully', {
+    console.log("Auth cookies set successfully", {
       domain,
       sameSite: commonAttributes.sameSite,
       cookieNames: [
@@ -193,11 +193,11 @@ const setAuthCookies = async (res, tokens, account, user, appUrl) => {
       ],
     });
   } catch (error) {
-    console.error('Error setting cookies:', {
+    console.error("Error setting cookies:", {
       error: error.message,
       stack: error.stack,
     });
-    throw new Error('Failed to set authentication cookies');
+    throw new Error("Failed to set authentication cookies");
   }
 };
 
@@ -208,44 +208,44 @@ const clearAuthCookies = async (res, appUrl) => {
   let domain;
   try {
     domain = appUrl ? new URL(appUrl).hostname : undefined;
-    if (domain?.includes('mapmap.app')) {
-      domain = '.mapmap.app';
+    if (domain?.includes("mapmap.app")) {
+      domain = ".mapmap.app";
     }
-    if (domain?.includes('localhost')) {
+    if (domain?.includes("localhost")) {
       domain = undefined;
     }
   } catch (error) {
-    console.error('Invalid appUrl:', error);
+    console.error("Invalid appUrl:", error);
     domain = undefined;
   }
 
   const commonAttributes = {
     secure: true,
-    sameSite: 'None',
+    sameSite: "None",
     domain,
-    path: '/',
+    path: "/",
   };
 
   const cookieNames = [
-    'x-refresh-token',
-    'x-access-token',
-    'user',
-    'account',
-    'has_account_token',
+    "x-refresh-token",
+    "x-access-token",
+    "user",
+    "account",
+    "has_account_token",
   ];
 
   // Clear web cookies
-  cookieNames.forEach(cookieName => {
+  cookieNames.forEach((cookieName) => {
     res.clearCookie(cookieName, commonAttributes);
   });
 
   try {
     const extensionClearPromises = cookieNames.map(
-      name =>
-        new Promise(resolve => {
+      (name) =>
+        new Promise((resolve) => {
           chrome.cookies.remove(
             {
-              url: `https://${domain || 'mapmap.app'}`,
+              url: `https://${domain || "mapmap.app"}`,
               name,
             },
             resolve
@@ -258,7 +258,7 @@ const clearAuthCookies = async (res, appUrl) => {
     // Not in extension context, ignore
   }
 
-  console.log('Auth cookies cleared successfully', {
+  console.log("Auth cookies cleared successfully", {
     domain,
     cookieNames,
     sameSite: commonAttributes.sameSite,