propro-utils 1.6.2 → 1.6.4

package/middlewares/account_info.js

@@ -61,55 +61,6 @@ 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 })
-    .options({ allowDiskUse: true });
-
-  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.
  *
@@ -118,13 +69,6 @@ async function consolidateGlobalStyles(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,
@@ -156,7 +100,7 @@ async function createDefaultFolders(folderSchema, accountId) {
 }
 
 const DEFAULT_THEME = {
-  canvasBackground: "#1E1D1D",
+  canvasBackground: "#000000",
   defaultItemWidth: 200,
   defaultColor: "#ffffff",
   fontSize: "16px",
@@ -173,6 +117,8 @@ 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);
@@ -180,6 +126,8 @@ 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"),
@@ -190,6 +138,14 @@ 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");
     }
@@ -211,23 +167,83 @@ const checkIfUserExists = async (accountId) => {
       );
     }
 
-    // Find existing user with populated fields
-    const user = await userSchema
-      .findOne({ accountId })
-      .select("-theme -folderList -userGlobalStyles -mapList")
-      .lean();
+    console.log("Schema loading and validation complete");
+
+    // Find existing user without excluding fields we need to check
+    const user = await userSchema.findOne({ accountId }).lean();
+
+    console.log("User lookup result:", user ? "User found" : "User not found");
 
     if (user) {
+      console.log("Updating existing user data...");
       const updates = [];
 
-      // Handle userGlobalStyles
+      // Handle userGlobalStyles - check properly if styles exist in the database
       if (userStyleSchema) {
-        // Consolidate any duplicate global styles
-        await consolidateGlobalStyles(accountId);
+        // Check if the user has a userGlobalStyles reference
+        const hasStyleReference = user.userGlobalStyles != null;
+
+        if (hasStyleReference) {
+          // Verify the referenced style document actually exists
+          const styleExists = await userStyleSchema.exists({
+            _id: user.userGlobalStyles,
+          });
+
+          if (!styleExists) {
+            console.log(
+              "User has style reference but document not found, creating new styles..."
+            );
+            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 {
+            // Style exists, check if it has shortcuts
+            const styleDoc = await userStyleSchema.findById(
+              user.userGlobalStyles
+            );
+            if (
+              !styleDoc.styleShortcuts ||
+              styleDoc.styleShortcuts.length === 0
+            ) {
+              console.log("Updating empty styleShortcuts with defaults...");
+              updates.push(
+                userStyleSchema.updateOne(
+                  { _id: user.userGlobalStyles },
+                  { styleShortcuts: defaultUserGlobalStyleShortcuts }
+                )
+              );
+            }
+          }
+        } else {
+          // No style reference, create new styles
+          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;
+              }
+            )
+          );
+        }
       }
 
       // Handle folders
       if (folderSchema) {
+        console.log("Checking folders...");
         updates.push(
           (async () => {
             const existingFolders = await folderSchema
@@ -235,6 +251,7 @@ const checkIfUserExists = async (accountId) => {
               .select("name")
               .lean();
 
+            console.log("Existing folders count:", existingFolders.length);
             const existingFolderNames = new Set(
               existingFolders.map((f) => f.name)
             );
@@ -256,6 +273,7 @@ const checkIfUserExists = async (accountId) => {
 
       // Handle themes
       if (themeSchema) {
+        console.log("Checking themes...");
         updates.push(
           (async () => {
             const defaultThemeExists = await themeSchema.exists({
@@ -263,6 +281,7 @@ const checkIfUserExists = async (accountId) => {
               accountId,
             });
 
+            console.log("Default theme exists:", defaultThemeExists);
             if (!defaultThemeExists) {
               const defaultTheme = await themeSchema.create({
                 ...DEFAULT_THEME,
@@ -282,13 +301,12 @@ 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
-        .findOne({ accountId })
-        .select("-theme -folderList -userGlobalStyles -mapList")
-        .lean();
+      // Return fresh user data after updates
+      return userSchema.findOne({ accountId }).lean();
     }
 
     // Create new user with all associated data
@@ -342,10 +360,8 @@ const checkIfUserExists = async (accountId) => {
       await createDefaultFolders(folderSchema, newUser.id);
     }
 
-    return userSchema
-      .findById(newUser._id)
-      .select("-theme -folderList -userGlobalStyles -mapList")
-      .lean();
+    console.log("Operation completed successfully");
+    return userSchema.findById(newUser._id).lean();
   } catch (error) {
     console.error("Detailed error in checkIfUserExists:", {
       accountId,
@@ -358,44 +374,7 @@ const checkIfUserExists = async (accountId) => {
   }
 };
 
-const updateUserGlobalStyleShortcuts = async (userId, shortcutId, shortcut) => {
-  try {
-    const user = await userSchema
-      .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.6.2",
+  "version": "1.6.4",
   "description": "Auth middleware for propro-auth",
   "main": "src/index.js",
   "scripts": {
@@ -46,6 +46,7 @@
     "jest-mock-axios": "^4.7.3",
     "jsonwebtoken": "^9.0.2",
     "multer": "^1.4.5-lts.1",
+    "neverthrow": "^8.2.0",
     "nodemailer": "^6.9.7",
     "nodemailer-mailgun-transport": "^2.1.5",
     "querystring": "^0.2.1",

package/src/server/middleware/cookieUtils.js

@@ -109,16 +109,20 @@ const setAuthCookies = async (res, tokens, account, user, appUrl) => {
       domain = undefined;
     }
     if (domain?.includes("propro.so")) {
-      domain = ".propro.so";
+      domain = "propro.so";
     }
   } catch (error) {
     console.error("Invalid appUrl:", { error, appUrl });
     domain = undefined;
   }
 
+  // Determine if we're in a local development environment
+  const isLocalhost =
+    !domain || domain === "localhost" || domain.includes("localhost");
+
   const commonAttributes = {
-    secure: true,
-    sameSite: "None",
+    secure: !isLocalhost, // Only require secure for non-localhost environments
+    sameSite: isLocalhost ? "Lax" : "None", // Use Lax for localhost, None for production
     domain,
     path: "/",
   };
@@ -219,9 +223,13 @@ const clearAuthCookies = async (res, appUrl) => {
     domain = undefined;
   }
 
+  // Determine if we're in a local development environment
+  const isLocalhost =
+    !domain || domain === "localhost" || domain.includes("localhost");
+
   const commonAttributes = {
-    secure: true,
-    sameSite: "None",
+    secure: !isLocalhost, // Only require secure for non-localhost environments
+    sameSite: isLocalhost ? "Lax" : "None", // Use Lax for localhost, None for production
     domain,
     path: "/",
   };