refactor: improve customer user role checks for null or empty values

Author: skadefro

Makefile

@@ -1,6 +1,6 @@
 .PHONY: build
 
-VERSION = 1.5.11.119
+VERSION = 1.5.11.121
 HASH = $(shell git rev-parse --short HEAD)
 bump:
 	@echo "Bumping version to $(VERSION) recursively..."

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/core",
-  "version": "1.5.11.119",
+  "version": "1.5.11.121",
   "description": "Easy orchestration of data, code and automation tools.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {

public.template/swagger.json

@@ -513,7 +513,7 @@
 	},
 	"info": {
 		"title": "@openiap/core",
-		"version": "1.5.11.119",
+		"version": "1.5.11.121",
 		"description": "Easy orchestration of data, code and automation tools.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
 		"license": {
 			"name": "MPL-2.0"

src/Config.ts

@@ -376,7 +376,7 @@ export class Config {
         amqp_force_sender_has_invoke: false,
         amqp_force_consumer_has_update: false,
         amqp_enabled_exchange: false,
-        amqp_url: "amqp://localhost",
+        amqp_url: "amqp://localhost?frameMax=0x2000",
         amqp_username: "guest",
         amqp_password: "guest",
 

src/DatabaseConnection.ts

@@ -3079,16 +3079,18 @@ export class DatabaseConnection extends events.EventEmitter {
 
 
                 if (customer != null && !Util.IsNullEmpty(user2.customerid) && user2._id != customer.users && user2._id != customer.admins && user2._id != Wellknown.root._id) {
-                    // TODO: Check user has permission to this customer
-                    let custusers: Role = await this.getbyid<Role>(customer.users, "users", q.jwt, true, span);
-                    if (custusers != null) {
-                        custusers = Role.assign(custusers);
-                    }
-                    if (custusers != null && !custusers.IsMember(q.item._id)) {
-                        custusers = Role.assign(await this.getbyid<Role>(customer.users, "users", q.jwt, true, span));
-                        custusers.AddMember(q.item);
-                        await Logger.DBHelper.Save(custusers, Crypt.rootToken(), span);
-                        await Logger.DBHelper.CheckCache(q.collectionname, q.item, false, false, span);
+                    if(!Util.IsNullEmpty(customer.users)) {
+                        // TODO: Check user has permission to this customer
+                        let custusers: Role = await this.getbyid<Role>(customer.users, "users", q.jwt, true, span);
+                        if (custusers != null) {
+                            custusers = Role.assign(custusers);
+                        }
+                        if (custusers != null && !custusers.IsMember(q.item._id)) {
+                            custusers = Role.assign(await this.getbyid<Role>(customer.users, "users", q.jwt, true, span));
+                            custusers.AddMember(q.item);
+                            await Logger.DBHelper.Save(custusers, Crypt.rootToken(), span);
+                            await Logger.DBHelper.CheckCache(q.collectionname, q.item, false, false, span);
+                        }
                     }
                 } else {
                     // await Logger.DBHelper.UserRoleUpdate(q.item, false, span);
@@ -4046,23 +4048,27 @@ export class DatabaseConnection extends events.EventEmitter {
         } else if (user._type == "customer") {
             let customer = user as any as Customer;
             if (user.roles == null) user.roles = [];
-            user.roles.push(new Rolemember(user.name + " users", customer.users))
-            user.roles.push(new Rolemember(user.name + " admins", customer.admins))
-            let users = await Logger.DBHelper.FindRoleById(customer.users, Crypt.rootToken(), parent);
-            let admins = await Logger.DBHelper.FindRoleById(customer.admins, Crypt.rootToken(), parent);
-            if(users != null) {
-                for (let i = 0; i < users.members.length; i++) {
-                    const exists = user.roles.filter(x => x._id == users.members[i]._id);
-                    if (exists.length == 0) {
-                        user.roles.push(new Rolemember(users.members[i].name, users.members[i]._id))
+            if(!Util.IsNullEmpty(customer.users)) {
+                user.roles.push(new Rolemember(user.name + " users", customer.users))
+                let users = await Logger.DBHelper.FindRoleById(customer.users, Crypt.rootToken(), parent);
+                if(users != null) {
+                    for (let i = 0; i < users.members.length; i++) {
+                        const exists = user.roles.filter(x => x._id == users.members[i]._id);
+                        if (exists.length == 0) {
+                            user.roles.push(new Rolemember(users.members[i].name, users.members[i]._id))
+                        }
                     }
                 }
             }
-            if(admins != null) {
-                for (let i = 0; i < admins.members.length; i++) {
-                    const exists = user.roles.filter(x => x._id == admins.members[i]._id);
-                    if (exists.length == 0 && admins.members[i]._id != Wellknown.customer_admins._id) {
-                        user.roles.push(new Rolemember(admins.members[i].name, admins.members[i]._id))
+            if(!Util.IsNullEmpty(customer.admins)) {
+                user.roles.push(new Rolemember(user.name + " admins", customer.admins))
+                let admins = await Logger.DBHelper.FindRoleById(customer.admins, Crypt.rootToken(), parent);
+                if(admins != null) {
+                    for (let i = 0; i < admins.members.length; i++) {
+                        const exists = user.roles.filter(x => x._id == admins.members[i]._id);
+                        if (exists.length == 0 && admins.members[i]._id != Wellknown.customer_admins._id) {
+                            user.roles.push(new Rolemember(admins.members[i].name, admins.members[i]._id))
+                        }
                     }
                 }
             }

src/public/swagger.json

@@ -513,7 +513,7 @@
 	},
 	"info": {
 		"title": "@openiap/core",
-		"version": "1.5.11.119",
+		"version": "1.5.11.121",
 		"description": "Easy orchestration of data, code and automation tools.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
 		"license": {
 			"name": "MPL-2.0"