Merge pull request #220 from aziiee/dynamic-groups

fix(permissions): allow dynamic group names
adfinis · Dec 16, 2021 · 5c139ff · 5c139ff
2 parents 800f434 + 65470fd
commit 5c139ff
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/frontend/app/services/account.js b/frontend/app/services/account.js
@@ -21,13 +21,15 @@ export default class AccountService extends Service {
     return this.session.data.authenticated?.userinfo.groups ?? [];
   }
 
-  isInGroup(group) {
-    return this.groups.includes(group);
+  isInGroup(groupRegex) {
+    return this.groups.some((group) => new RegExp(groupRegex).test(group));
   }
 
-  isInGroups(amount, groups) {
+  isInGroups(amount, groupsRegex) {
     const method = amount === "one" ? "some" : "every";
-    return this.groups[method]((group) => groups.includes(group));
+    return this.groups[method]((group) =>
+      groupsRegex.some((groupRegex) => new RegExp(groupRegex).test(group))
+    );
   }
 
   async fetchCurrentUser() {