🐛 修复权限通配符设置问题 #416

Author: CodFrm

src/app/cache_key.ts

@@ -7,7 +7,7 @@ export default class CacheKey {
   }
 
   static permissionConfirm(scriptUuid: string, confirm: ConfirmParam): string {
-    return `permission:${scriptUuid}:${confirm.permissionValue || ""}:${confirm.permission || ""}`;
+    return `permission:${scriptUuid}:${confirm.permission}:${confirm.permissionValue || ""}`;
   }
 
   // importFile 导入文件

src/app/service/service_worker/permission_verify.ts

@@ -177,7 +177,7 @@ export default class PermissionVerify {
       if (!model) {
         // 允许通配
         if (confirm.wildcard) {
-          model = await this.permissionDAO.findByKey(request.uuid, confirm.permission, confirm.permissionValue || "");
+          model = await this.permissionDAO.findByKey(request.uuid, confirm.permission, "*");
         }
       }
       return Promise.resolve(model);
@@ -315,11 +315,9 @@ export default class PermissionVerify {
     const oldConfirm = await this.permissionDAO.findByKey(data.uuid, data.permission, data.permissionValue);
     if (!oldConfirm) {
       throw new Error("permission not found");
-    } else {
-      await this.permissionDAO.delete(this.permissionDAO.key(oldConfirm));
-      // 删除缓存
-      Cache.getInstance().del(CacheKey.permissionConfirm(data.uuid, oldConfirm));
     }
+    await this.permissionDAO.delete(this.permissionDAO.key(oldConfirm));
+    this.clearCache(data.uuid);
   }
 
   getScriptPermissions(uuid: string) {
@@ -330,7 +328,7 @@ export default class PermissionVerify {
   // 添加权限
   async addPermission(permission: Permission) {
     await this.permissionDAO.save(permission);
-    Cache.getInstance().del(CacheKey.permissionConfirm(permission.uuid, permission));
+    this.clearCache(permission.uuid);
   }
 
   // 重置权限
@@ -339,8 +337,24 @@ export default class PermissionVerify {
     const permissions = await this.permissionDAO.find((key, item) => item.uuid === uuid);
     permissions.forEach((item) => {
       this.permissionDAO.delete(this.permissionDAO.key(item));
-      Cache.getInstance().del(CacheKey.permissionConfirm(uuid, item));
     });
+    this.clearCache(uuid);
+  }
+
+  clearCache(uuid: string) {
+    return Cache.getInstance()
+      .list()
+      .then((keys) => {
+        // 删除所有以permission:uuid:开头的缓存
+        return Promise.all(
+          keys.map((key) => {
+            if (key.startsWith(`permission:${uuid}:`)) {
+              return Cache.getInstance().del(key);
+            }
+            return Promise.resolve();
+          })
+        );
+      });
   }
 
   init() {
@@ -349,7 +363,7 @@ export default class PermissionVerify {
     this.group.on("getInfo", this.getInfo.bind(this));
     this.group.on("deletePermission", this.deletePermission.bind(this));
     this.group.on("getScriptPermissions", this.getScriptPermissions.bind(this));
-    this.group.on("addPermission", this.getInfo.bind(this));
+    this.group.on("addPermission", this.addPermission.bind(this));
     this.group.on("resetPermission", this.resetPermission.bind(this));
 
     subscribeScriptDelete(this.mq, (data) => {