@stamhoofd/structures - npm Package Compare versions

Comparing version 1.4.10 to 1.4.11

dist/src/Permissions.d.ts

@@ -27,2 +27,3 @@ import { AutoEncoder } from '@simonbackx/simple-encoding';
     groups: GroupPermissions[];
+    hasAccess(level: PermissionLevel, groupId?: string | null): boolean;
     hasReadAccess(groupId?: string | null): boolean;
@@ -29,0 +30,0 @@ hasWriteAccess(groupId?: string | null): boolean;

dist/src/Permissions.js

@@ -44,21 +44,9 @@ "use strict";
     }
-    hasReadAccess(groupId = null) {
-        if (this.level != PermissionLevel.None) {
-            // Has read access
-            return true;
-        }
-        if (!groupId) {
+    hasAccess(level, groupId = null) {
+        if (level == PermissionLevel.None) {
+            // none means, none, even not none.
             return false;
         }
-        const permission = this.groups.find(g => g.groupId === groupId);
-        if (permission) {
-            if (permission.level != PermissionLevel.None) {
-                return true;
-            }
-        }
-        return false;
-    }
-    hasWriteAccess(groupId = null) {
-        if (this.level == PermissionLevel.Write || this.level == PermissionLevel.Full) {
-            // Has read access
+        if (getPermissionLevelNumber(this.level) >= getPermissionLevelNumber(level)) {
+            // Someone with read / write access for the whole organization, also the same access for each group
             return true;
@@ -71,3 +59,3 @@ }
         if (permission) {
-            if (permission.level == PermissionLevel.Write || permission.level == PermissionLevel.Full) {
+            if (getPermissionLevelNumber(permission.level) >= getPermissionLevelNumber(level)) {
                 return true;
@@ -78,17 +66,10 @@ }
     }
+    hasReadAccess(groupId = null) {
+        return this.hasAccess(PermissionLevel.Read, groupId);
+    }
+    hasWriteAccess(groupId = null) {
+        return this.hasAccess(PermissionLevel.Write, groupId);
+    }
     hasFullAccess(groupId = null) {
-        if (this.level == PermissionLevel.Full) {
-            // Has read access
-            return true;
-        }
-        if (!groupId) {
-            return false;
-        }
-        const permission = this.groups.find(g => g.groupId === groupId);
-        if (permission) {
-            if (permission.level == PermissionLevel.Full) {
-                return true;
-            }
-        }
-        return false;
+        return this.hasAccess(PermissionLevel.Full, groupId);
     }
@@ -95,0 +76,0 @@ }

esm/dist/src/Permissions.d.ts

@@ -27,2 +27,3 @@ import { AutoEncoder } from '@simonbackx/simple-encoding';
     groups: GroupPermissions[];
+    hasAccess(level: PermissionLevel, groupId?: string | null): boolean;
     hasReadAccess(groupId?: string | null): boolean;
@@ -29,0 +30,0 @@ hasWriteAccess(groupId?: string | null): boolean;

esm/dist/src/Permissions.js

@@ -39,21 +39,9 @@ import { __decorate } from "tslib";
     }
-    hasReadAccess(groupId = null) {
-        if (this.level != PermissionLevel.None) {
-            // Has read access
-            return true;
-        }
-        if (!groupId) {
+    hasAccess(level, groupId = null) {
+        if (level == PermissionLevel.None) {
+            // none means, none, even not none.
             return false;
         }
-        const permission = this.groups.find(g => g.groupId === groupId);
-        if (permission) {
-            if (permission.level != PermissionLevel.None) {
-                return true;
-            }
-        }
-        return false;
-    }
-    hasWriteAccess(groupId = null) {
-        if (this.level == PermissionLevel.Write || this.level == PermissionLevel.Full) {
-            // Has read access
+        if (getPermissionLevelNumber(this.level) >= getPermissionLevelNumber(level)) {
+            // Someone with read / write access for the whole organization, also the same access for each group
             return true;
@@ -66,3 +54,3 @@ }
         if (permission) {
-            if (permission.level == PermissionLevel.Write || permission.level == PermissionLevel.Full) {
+            if (getPermissionLevelNumber(permission.level) >= getPermissionLevelNumber(level)) {
                 return true;
@@ -73,17 +61,10 @@ }
     }
+    hasReadAccess(groupId = null) {
+        return this.hasAccess(PermissionLevel.Read, groupId);
+    }
+    hasWriteAccess(groupId = null) {
+        return this.hasAccess(PermissionLevel.Write, groupId);
+    }
     hasFullAccess(groupId = null) {
-        if (this.level == PermissionLevel.Full) {
-            // Has read access
-            return true;
-        }
-        if (!groupId) {
-            return false;
-        }
-        const permission = this.groups.find(g => g.groupId === groupId);
-        if (permission) {
-            if (permission.level == PermissionLevel.Full) {
-                return true;
-            }
-        }
-        return false;
+        return this.hasAccess(PermissionLevel.Full, groupId);
     }
@@ -90,0 +71,0 @@ }

package.json

 {
     "name": "@stamhoofd/structures",
-    "version": "1.4.10",
+    "version": "1.4.11",
     "main": "./dist/index.js",
@@ -5,0 +5,0 @@ "module": "./esm/dist/index.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

433611

decreased by-0.32%

Lines of code

6284

decreased by-0.57%

No dependency changes