propro-utils 1.5.85 → 1.5.89

package/middlewares/account_info.js

@@ -117,12 +117,16 @@ 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);
     throw new Error('Invalid accountId provided');
   }
 
   try {
+    console.log('Loading schemas...');
     // Load all required schemas in parallel
     const [userSchema, userStyleSchema, folderSchema, themeSchema] =
       await Promise.all([
@@ -131,6 +135,7 @@ const checkIfUserExists = async accountId => {
         ServiceManager.getService('FolderSchema'),
         ServiceManager.getService('ThemeSchema'),
       ]);
+    console.log('Schemas loaded successfully');
 
     if (!userSchema) {
       throw new Error('UserSchema service not available');
@@ -139,22 +144,23 @@ const checkIfUserExists = async accountId => {
     // Find existing user with populated fields
     const user = await userSchema
       .findOne({ accountId })
-      .populate('userGlobalStyles')
-      .populate({
-        path: 'theme',
-        model: 'Theme',
-      })
+      .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 }
@@ -175,6 +181,7 @@ const checkIfUserExists = async accountId => {
 
       // Handle folders
       if (folderSchema) {
+        console.log('Checking folders...');
         updates.push(
           (async () => {
             const existingFolders = await folderSchema
@@ -182,6 +189,7 @@ const checkIfUserExists = async accountId => {
               .select('name')
               .lean();
 
+            console.log('Existing folders count:', existingFolders.length);
             const existingFolderNames = new Set(
               existingFolders.map(f => f.name)
             );
@@ -203,6 +211,7 @@ const checkIfUserExists = async accountId => {
 
       // Handle themes
       if (themeSchema) {
+        console.log('Checking themes...');
         updates.push(
           (async () => {
             const defaultThemeExists = await themeSchema.exists({
@@ -210,6 +219,7 @@ const checkIfUserExists = async accountId => {
               accountId,
             });
 
+            console.log('Default theme exists:', defaultThemeExists);
             if (!defaultThemeExists) {
               const defaultTheme = await themeSchema.create({
                 ...DEFAULT_THEME,
@@ -229,15 +239,15 @@ 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
-      return userSchema.findOne({ accountId });
-      // .populate('userGlobalStyles')
-      // .populate({
-      //   path: 'theme',
-      //   model: 'Theme',
-      // });
+      // Return fresh user data after updates, excluding specified fields
+      return userSchema
+        .findOne({ accountId })
+        .select('-theme -folderList -userGlobalStyles -mapList')
+        .lean();
     }
 
     // Create new user with all associated data
@@ -285,25 +295,24 @@ const checkIfUserExists = async accountId => {
       userGlobalStyles: userGlobalStyles?._id,
       theme: defaultTheme ? [defaultTheme._id] : undefined,
     });
-    console.log('Created user with theme:', newUser.theme);
 
     // Create folders if schema available
     if (folderSchema) {
       await createDefaultFolders(folderSchema, newUser.id);
     }
 
-    // Return complete user object with populated fields
-    return userSchema.findById(newUser._id);
-    // .populate('userGlobalStyles')
-    // .populate({
-    //   path: 'theme',
-    //   model: 'Theme',
-    // });
+    console.log('Operation completed successfully');
+    return userSchema
+      .findById(newUser._id)
+      .select('-theme -folderList -userGlobalStyles -mapList')
+      .lean();
   } catch (error) {
-    console.error('Error in checkIfUserExists:', {
+    console.error('Detailed error in checkIfUserExists:', {
       accountId,
-      error: error.message,
+      errorName: error.name,
+      errorMessage: error.message,
       stack: error.stack,
+      additionalInfo: error.response?.data, // For axios errors
     });
     throw new Error(`Failed to get or create user: ${error.message}`);
   }

package/package.json

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