propro-utils 1.5.78 → 1.5.80

package/middlewares/account_info.js

@@ -140,7 +140,10 @@ const checkIfUserExists = async accountId => {
     const user = await userSchema
       .findOne({ accountId })
       .populate('userGlobalStyles')
-      .populate('theme')
+      .populate({
+        path: 'theme',
+        model: 'Theme',
+      })
       .lean();
 
     if (user) {
@@ -199,11 +202,12 @@ const checkIfUserExists = async accountId => {
       }
 
       // Handle themes
+      console.log('themeSchema:', themeSchema);
       if (themeSchema) {
         updates.push(
           (async () => {
             const defaultThemeExists = await themeSchema.exists({
-              name: 'Default Theme',
+              // name: 'Default Theme',
               accountId,
             });
 
@@ -232,7 +236,10 @@ const checkIfUserExists = async accountId => {
       return userSchema
         .findOne({ accountId })
         .populate('userGlobalStyles')
-        .populate('theme');
+        .populate({
+          path: 'theme',
+          model: 'Theme',
+        });
     }
 
     // Create new user with all associated data
@@ -262,6 +269,7 @@ const checkIfUserExists = async accountId => {
             id: uuidv4(),
           })
           .then(theme => {
+            console.log('Created theme:', theme);
             defaultTheme = theme;
             return theme;
           })
@@ -279,6 +287,7 @@ 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) {
@@ -289,7 +298,10 @@ const checkIfUserExists = async accountId => {
     return userSchema
       .findById(newUser._id)
       .populate('userGlobalStyles')
-      .populate('theme');
+      .populate({
+        path: 'theme',
+        model: 'Theme',
+      });
   } catch (error) {
     console.error('Error in checkIfUserExists:', {
       accountId,

package/package.json

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

package/src/server/index.js

@@ -157,7 +157,10 @@ class AuthMiddleware {
         this.options.redirectUri
       );
 
+      console.log('tokens:', tokens);
+      console.log('account:', account);
       const user = await checkIfUserExists(account.accountId);
+      console.log('user:', user);
 
       if (!user) {
         throw new Error('User not found');