properly handle user prehooks for role updates

airqo-platform · Dec 2, 2024 · f093cd6 · f093cd6
1 parent ae4579e
commit f093cd6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/auth-service/models/Network.js b/src/auth-service/models/Network.js
@@ -119,7 +119,7 @@ NetworkSchema.pre(
       const query = this.getQuery ? this.getQuery() : { _id: this._id };
 
       // Get the correct tenant-specific model
-      const tenant = this.tenant || constants.DEFAULT_TENANT;
+      const tenant = this.tenant || constants.DEFAULT_TENANT || "airqo";
       const Network = getModelByTenant(tenant, "network", NetworkSchema);
 
       const existingDoc = await Network.findOne(query);

diff --git a/src/auth-service/models/User.js b/src/auth-service/models/User.js
@@ -257,7 +257,11 @@ UserSchema.pre(
       // Helper function to handle role updates
       const handleRoleUpdates = async (fieldName, idField) => {
         const query = this.getQuery ? this.getQuery() : { _id: this._id };
-        const doc = await this.model.findOne(query);
+
+        // Get the correct tenant-specific model
+        const tenant = this.tenant || constants.DEFAULT_TENANT || "airqo";
+        const User = getModelByTenant(tenant, "user", UserSchema);
+        const doc = await User.findOne(query);
         if (!doc) return;
 
         let newRoles = [];