@@ -84,9 +84,9 @@ export class Enforcer extends ManagementEnforcer {
84
84
*/
85
85
public async getRolesForUser ( name : string , domain ?: string ) : Promise < string [ ] > {
86
86
if ( domain == null ) {
87
- return await this . rm . getRoles ( name ) ;
87
+ return this . rm . getRoles ( name ) ;
88
88
} else {
89
- return await this . rm . getRoles ( name , domain ) ;
89
+ return this . rm . getRoles ( name , domain ) ;
90
90
}
91
91
}
92
92
@@ -99,9 +99,9 @@ export class Enforcer extends ManagementEnforcer {
99
99
*/
100
100
public async getUsersForRole ( name : string , domain ?: string ) : Promise < string [ ] > {
101
101
if ( domain == null ) {
102
- return await this . rm . getUsers ( name ) ;
102
+ return this . rm . getUsers ( name ) ;
103
103
} else {
104
- return await this . rm . getUsers ( name , domain ) ;
104
+ return this . rm . getUsers ( name , domain ) ;
105
105
}
106
106
}
107
107
@@ -137,9 +137,9 @@ export class Enforcer extends ManagementEnforcer {
137
137
*/
138
138
public async addRoleForUser ( user : string , role : string , domain ?: string ) : Promise < boolean > {
139
139
if ( domain == null ) {
140
- return await this . addGroupingPolicy ( user , role ) ;
140
+ return this . addGroupingPolicy ( user , role ) ;
141
141
} else {
142
- return await this . addGroupingPolicy ( user , role , domain ) ;
142
+ return this . addGroupingPolicy ( user , role , domain ) ;
143
143
}
144
144
}
145
145
@@ -154,9 +154,9 @@ export class Enforcer extends ManagementEnforcer {
154
154
*/
155
155
public async deleteRoleForUser ( user : string , role : string , domain ?: string ) : Promise < boolean > {
156
156
if ( domain == null ) {
157
- return await this . removeGroupingPolicy ( user , role ) ;
157
+ return this . removeGroupingPolicy ( user , role ) ;
158
158
} else {
159
- return await this . removeGroupingPolicy ( user , role , domain ) ;
159
+ return this . removeGroupingPolicy ( user , role , domain ) ;
160
160
}
161
161
}
162
162
@@ -170,9 +170,9 @@ export class Enforcer extends ManagementEnforcer {
170
170
*/
171
171
public async deleteRolesForUser ( user : string , domain ?: string ) : Promise < boolean > {
172
172
if ( domain == null ) {
173
- return await this . removeFilteredGroupingPolicy ( 0 , user ) ;
173
+ return this . removeFilteredGroupingPolicy ( 0 , user ) ;
174
174
} else {
175
- return await this . removeFilteredGroupingPolicy ( 0 , user , '' , domain ) ;
175
+ return this . removeFilteredGroupingPolicy ( 0 , user , '' , domain ) ;
176
176
}
177
177
}
178
178
@@ -184,7 +184,7 @@ export class Enforcer extends ManagementEnforcer {
184
184
* @return succeeds or not.
185
185
*/
186
186
public async deleteUser ( user : string ) : Promise < boolean > {
187
- return await this . removeFilteredGroupingPolicy ( 0 , user ) ;
187
+ return this . removeFilteredGroupingPolicy ( 0 , user ) ;
188
188
}
189
189
190
190
/**
@@ -207,7 +207,7 @@ export class Enforcer extends ManagementEnforcer {
207
207
* @return succeeds or not.
208
208
*/
209
209
public async deletePermission ( ...permission : string [ ] ) : Promise < boolean > {
210
- return await this . removeFilteredPolicy ( 1 , ...permission ) ;
210
+ return this . removeFilteredPolicy ( 1 , ...permission ) ;
211
211
}
212
212
213
213
/**
@@ -220,7 +220,7 @@ export class Enforcer extends ManagementEnforcer {
220
220
*/
221
221
public async addPermissionForUser ( user : string , ...permission : string [ ] ) : Promise < boolean > {
222
222
permission . unshift ( user ) ;
223
- return await this . addPolicy ( ...permission ) ;
223
+ return this . addPolicy ( ...permission ) ;
224
224
}
225
225
226
226
/**
@@ -233,7 +233,7 @@ export class Enforcer extends ManagementEnforcer {
233
233
*/
234
234
public async deletePermissionForUser ( user : string , ...permission : string [ ] ) : Promise < boolean > {
235
235
permission . unshift ( user ) ;
236
- return await this . removePolicy ( ...permission ) ;
236
+ return this . removePolicy ( ...permission ) ;
237
237
}
238
238
239
239
/**
@@ -244,7 +244,7 @@ export class Enforcer extends ManagementEnforcer {
244
244
* @return succeeds or not.
245
245
*/
246
246
public async deletePermissionsForUser ( user : string ) : Promise < boolean > {
247
- return await this . removeFilteredPolicy ( 0 , user ) ;
247
+ return this . removeFilteredPolicy ( 0 , user ) ;
248
248
}
249
249
250
250
/**
@@ -253,7 +253,7 @@ export class Enforcer extends ManagementEnforcer {
253
253
* @param user the user.
254
254
* @return the permissions, a permission is usually like (obj, act). It is actually the rule without the subject.
255
255
*/
256
- public getPermissionsForUser ( user : string ) : string [ ] [ ] {
256
+ public async getPermissionsForUser ( user : string ) : Promise < string [ ] [ ] > {
257
257
return this . getFilteredPolicy ( 0 , user ) ;
258
258
}
259
259
@@ -264,7 +264,7 @@ export class Enforcer extends ManagementEnforcer {
264
264
* @param permission the permission, usually be (obj, act). It is actually the rule without the subject.
265
265
* @return whether the user has the permission.
266
266
*/
267
- public hasPermissionForUser ( user : string , ...permission : string [ ] ) : boolean {
267
+ public async hasPermissionForUser ( user : string , ...permission : string [ ] ) : Promise < boolean > {
268
268
permission . unshift ( user ) ;
269
269
return this . hasPolicy ( ...permission ) ;
270
270
}
@@ -283,11 +283,11 @@ export class Enforcer extends ManagementEnforcer {
283
283
const res : string [ ] = [ ] ;
284
284
const roles = await this . rm . getRoles ( name , ...domain ) ;
285
285
res . push ( ...roles ) ;
286
- await Promise . all (
287
- roles . map ( async n => {
288
- res . push ( ...( await this . getImplicitRolesForUser ( n , ...domain ) ) ) ;
289
- } )
290
- ) ;
286
+
287
+ for ( const n of roles ) {
288
+ res . push ( ...( await this . getImplicitRolesForUser ( n , ...domain ) ) ) ;
289
+ }
290
+
291
291
return res ;
292
292
}
293
293
@@ -306,13 +306,15 @@ export class Enforcer extends ManagementEnforcer {
306
306
const roles = [ user , ...( await this . getImplicitRolesForUser ( user , ...domain ) ) ] ;
307
307
const res : string [ ] [ ] = [ ] ;
308
308
const withDomain = domain && domain . length !== 0 ;
309
- roles . forEach ( n => {
309
+
310
+ for ( const n of roles ) {
310
311
if ( withDomain ) {
311
- res . push ( ...this . getFilteredPolicy ( 0 , n , ...domain ) ) ;
312
+ res . push ( ...( await this . getFilteredPolicy ( 0 , n , ...domain ) ) ) ;
312
313
} else {
313
- res . push ( ...this . getPermissionsForUser ( n ) ) ;
314
+ res . push ( ...( await this . getPermissionsForUser ( n ) ) ) ;
314
315
}
315
- } ) ;
316
+ }
317
+
316
318
return res ;
317
319
}
318
320
}
0 commit comments