From f6dcfae28c470d91003d885b28cafa894ed111df Mon Sep 17 00:00:00 2001
From: Junyi <mytharcher@users.noreply.github.com>
Date: Mon, 12 Apr 2021 18:10:59 +0800
Subject: [PATCH] refactor: use boolean value instead of null (#74)

---
 .../src/AccessController.ts                   | 19 +++++++++----------
 packages/plugin-permissions/src/server.ts     |  4 ++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/plugin-permissions/src/AccessController.ts b/packages/plugin-permissions/src/AccessController.ts
index c35481fdb..372c817fe 100644
--- a/packages/plugin-permissions/src/AccessController.ts
+++ b/packages/plugin-permissions/src/AccessController.ts
@@ -84,7 +84,7 @@ export type CollectionPermissions = {
   tabs: any[]
 };
 
-export type PermissionParams = true | null | {
+export type PermissionParams = boolean | {
   filter: any,
   fields: any[]
 };
@@ -175,7 +175,7 @@ export default class AccessController<T extends typeof AccessController = typeof
     if (!actionPermissions.length) {
       // 如果找不到可用的 action 记录
       // 则认为没有权限
-      return null;
+      return false;
     }
 
     const filters = actionPermissions
@@ -195,7 +195,7 @@ export default class AccessController<T extends typeof AccessController = typeof
   async one(resourceKey): Promise<PermissionParams> {
     const any = await this.any();
 
-    if (!any || any === true) {
+    if (typeof any === 'boolean') {
       return any;
     }
 
@@ -209,7 +209,7 @@ export default class AccessController<T extends typeof AccessController = typeof
       }
     });
 
-    return existed ? any : null;
+    return existed ? any : false;
   }
 
   async getPermissions(): Promise<any> {
@@ -338,12 +338,11 @@ export default class AccessController<T extends typeof AccessController = typeof
     };
 
     if (this.roles) {
-      if ((this.constructor as T).isRoot(this.roles)) {
-        return this.roles;
-      }
-      for (const role of this.roles) {
-        role.permissions = await role.getPermissions(permissionOptions);
-        role.set('permissions', role.permissions);
+      if (!(this.constructor as T).isRoot(this.roles)) {
+        for (const role of this.roles) {
+          role.permissions = await role.getPermissions(permissionOptions);
+          role.set('permissions', role.permissions);
+        }
       }
       return this.roles;
     }
diff --git a/packages/plugin-permissions/src/server.ts b/packages/plugin-permissions/src/server.ts
index 7d07600e7..a7eddaaae 100644
--- a/packages/plugin-permissions/src/server.ts
+++ b/packages/plugin-permissions/src/server.ts
@@ -4,7 +4,7 @@ import { Application } from '@nocobase/server';
 import { Operator } from '@nocobase/database';
 import * as collectionsRolesActions from './actions/collections.roles';
 import * as rolesCollectionsActions from './actions/roles.collections';
-import AccessController from './AccessController';
+import AccessController, { PermissionParams } from './AccessController';
 
 // API
 // const permissions = ctx.app.getPluginInstance('permissions');
@@ -105,7 +105,7 @@ export class Permissions {
       actionName
     } = ctx.action.params;
 
-    let result = null;
+    let result: PermissionParams = false;
 
     // 关系数据的权限
     if (associatedName && resourceField) {