propro-utils 1.5.46 → 1.5.49

package/middlewares/account_info.js

@@ -137,17 +137,19 @@ const checkIfUserExists = async accountId => {
       accountId
     );
 
-    const folders = await createDefaultFolders(folderSchema, accountId);
-    console.log('Folders created:', folders);
-    user.folders = folders;
-    await user.save();
-
-    return await userSchema.create({
+    user = await userSchema.create({
       accountId,
       id: uuidv4(),
       verified: false,
       userGlobalStyles: userGlobalStyles._id,
     });
+
+    const folders = await createDefaultFolders(folderSchema, accountId);
+    console.log('Folders created:', folders);
+    user.folders = folders.map(folder => folder._id);
+    await user.save();
+
+    return user;
   } catch (error) {
     console.error('Error in checkIfUserExists:', error);
     throw new Error('Failed to get or create user');

package/package.json

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

package/src/index.js

@@ -50,10 +50,17 @@ let _serverAuth, _clientAuth;
  * ```
  */
 class ProProAuthMiddleware {
-  constructor(options = {}, userSchema, userStyleSchema, redisClient) {
+  constructor(
+    options = {},
+    userSchema,
+    userStyleSchema,
+    folderSchema,
+    redisClient
+  ) {
     this.options = options;
     this.userSchema = userSchema;
     this.userStyleSchema = userStyleSchema;
+    this.folderSchema = folderSchema;
     this.redisClient = redisClient;
     this.serverAuth = null;
     this.clientAuth = null;
@@ -84,6 +91,7 @@ class ProProAuthMiddleware {
         this.options.serverOptions,
         this.userSchema,
         this.userStyleSchema,
+        this.folderSchema,
         this.redisClient
       );
     }
@@ -91,6 +99,7 @@ class ProProAuthMiddleware {
     ServiceManager.registerService('UserSchema', this.userSchema);
     ServiceManager.registerService('UserStyleSchema', this.userStyleSchema);
     ServiceManager.registerService('RedisClient', this.redisClient);
+    ServiceManager.registerService('FolderSchema', this.folderSchema);
     return this.serverAuth.middleware();
   }