Improve bit setting

Author: skadefro

OpenFlow/src/DatabaseConnection.ts

@@ -118,7 +118,7 @@ export class DatabaseConnection {
                                 console.log("Running in multi tenant mode, skip adding permissions for " + item.name);
                             } else if (arr[0]._type == "user") {
                                 var u: User = User.assign(arr[0]);
-                                if (u.getRight(item._id) == null) {
+                                if (!u.hasRight(item._id, Rights.read)) {
                                     console.log("Assigning " + item.name + " read permission to " + u.name);
                                     u.addRight(item._id, item.name, [Rights.read], false);
 
@@ -131,7 +131,7 @@ export class DatabaseConnection {
                                 var r: Role = Role.assign(arr[0]);
                                 if (r._id == WellknownIds.admins || r._id == WellknownIds.users) {
                                 }
-                                if (r.getRight(item._id) == null) {
+                                if (!r.hasRight(item._id, Rights.read)) {
                                     console.log("Assigning " + item.name + " read permission to " + r.name);
                                     r.addRight(item._id, item.name, [Rights.read], false);
                                     await this.db.collection("users").updateOne({ _id: r._id }, { $set: { _acl: r._acl } });
@@ -157,7 +157,7 @@ export class DatabaseConnection {
                         console.log("Running in multi tenant mode, skip removing permissions for " + item.name);
                     } else if (arr[0]._type == "user") {
                         var u: User = User.assign(arr[0]);
-                        if (u.getRight(item._id) != null) {
+                        if (u.hasRight(item._id, Rights.read)) {
                             console.log("Removing " + item.name + " read permissions from " + u.name);
                             u.removeRight(item._id, [Rights.read]);
                             // await this.db.collection("users").save(u);
@@ -167,7 +167,7 @@ export class DatabaseConnection {
                         }
                     } else if (arr[0]._type == "role") {
                         var r: Role = Role.assign(arr[0]);
-                        if (r.getRight(item._id) != null) {
+                        if (r.hasRight(item._id, Rights.read)) {
                             console.log("Removing " + item.name + " read permissions from " + r.name);
                             r.removeRight(item._id, [Rights.read]);
                             // await this.db.collection("users").save(r);

OpenFlow/src/base.ts

@@ -123,8 +123,17 @@ export class Base implements IBase {
         if (!right) { return; }
         rights.forEach(bit => {
             if (bit == Rights.full_control) { this._acl = this._acl.filter(x => x._id != _id); } else { right.unsetBit(bit); }
-
         });
         this.setRight(right);
+        var view = right.getview();
+        var posetiv = view.filter(x => x > 0);
+        if (posetiv.length == 0) {
+            this._acl = this._acl.filter(x => x._id != _id);
+        }
+    }
+    hasRight(_id: string, bit: number, deny: boolean = false): boolean {
+        var ace = this.getRight(_id, deny);
+        if (ace == null) return false;
+        return ace.getBit(bit);
     }
 }

VERSION

@@ -1 +1 @@
-0.0.410
+0.0.411