fix injeciton of default permissions

chriskalmar · Feb 7, 2021 · 7776f07 · 7776f07
1 parent 1ac02da
commit 7776f07
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/engine/entity/Entity.ts b/src/engine/entity/Entity.ts
@@ -768,7 +768,7 @@ export class Entity {
         this.defaultPermissions,
       );
     } else if (this.defaultPermissions) {
-      return processEntityPermissions(this, this.defaultPermissions);
+      return processEntityPermissions(this, {}, this.defaultPermissions);
     }
 
     return null;
@@ -842,7 +842,7 @@ export class Entity {
   }
 
   getPermissions() {
-    if (!this.setup.permissions || this.permissions) {
+    if (!this.setup.permissions && !this.defaultPermissions) {
       return this.permissions;
     }
 

diff --git a/src/engine/entity/ViewEntity.ts b/src/engine/entity/ViewEntity.ts
@@ -438,7 +438,7 @@ export class ViewEntity {
         this._defaultPermissions,
       );
     } else if (this._defaultPermissions) {
-      return processViewEntityPermissions(this, this._defaultPermissions);
+      return processViewEntityPermissions(this, {}, this._defaultPermissions);
     }
 
     return null;
@@ -478,7 +478,7 @@ export class ViewEntity {
   }
 
   getPermissions() {
-    if (!this._permissions || this.permissions) {
+    if (!this._permissions && this._defaultPermissions) {
       return this.permissions;
     }