fix: remove use spread operator with await in array

nodece · nodece · commit 6e4f87676301 · 2020-04-05T23:31:24.000+08:00
diff --git a/src/enforcer.ts b/src/enforcer.ts
@@ -288,7 +288,8 @@ export class Enforcer extends ManagementEnforcer {
     res.push(...roles);
 
     for (const n of roles) {
-      res.push(...(await this.getImplicitRolesForUser(n, ...domain)));
+      const role = await this.getImplicitRolesForUser(n, ...domain);
+      res.push(...role);
     }
 
     return res;
@@ -306,15 +307,18 @@ export class Enforcer extends ManagementEnforcer {
    * But getImplicitPermissionsForUser("alice") will get: [["admin", "data1", "read"], ["alice", "data2", "read"]].
    */
   public async getImplicitPermissionsForUser(user: string, ...domain: string[]): Promise<string[][]> {
-    const roles = [user, ...(await this.getImplicitRolesForUser(user, ...domain))];
+    const roles = await this.getImplicitRolesForUser(user, ...domain);
+    roles.unshift(user);
     const res: string[][] = [];
     const withDomain = domain && domain.length !== 0;
 
     for (const n of roles) {
       if (withDomain) {
-        res.push(...(await this.getFilteredPolicy(0, n, ...domain)));
+        const p = await this.getFilteredPolicy(0, n, ...domain);
+        res.push(...p);
       } else {
-        res.push(...(await this.getPermissionsForUser(n)));
+        const p = await this.getPermissionsForUser(n);
+        res.push(...p);
       }
     }
 
diff --git a/src/rbac/defaultRoleManager.ts b/src/rbac/defaultRoleManager.ts
@@ -204,7 +204,7 @@ export class DefaultRoleManager implements RoleManager {
    * printRoles prints all the roles to log.
    */
   public async printRoles(): Promise<void> {
-    [...this.allRoles.values()].map(n => {
+    [...this.allRoles.values()].forEach(n => {
       logPrint(n.toString());
     });
   }

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ export class DefaultRoleManager implements RoleManager {`
`204`	`204`	`* printRoles prints all the roles to log.`
`205`	`205`	`*/`
`206`	`206`	`public async printRoles(): Promise<void> {`
`207`		`- [...this.allRoles.values()].map(n => {`
	`207`	`+ [...this.allRoles.values()].forEach(n => {`
`208`	`208`	`logPrint(n.toString());`
`209`	`209`	`});`
`210`	`210`	`}`