From 236faf47883df80c1d26991bb1a35ec8786cf315 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 27 Nov 2020 09:11:38 +0300 Subject: [PATCH] feat: implement new interfaces to permission.service --- .../core/src/lib/services/permission.service.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/services/permission.service.ts b/npm/ng-packs/packages/core/src/lib/services/permission.service.ts index deb474fa08..c89949b064 100644 --- a/npm/ng-packs/packages/core/src/lib/services/permission.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/permission.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { map, tap } from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import snq from 'snq'; -import { ApplicationConfiguration } from '../models/application-configuration'; +import { ApplicationConfigurationDto } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/models'; import { ConfigStateService } from './config-state.service'; @Injectable({ providedIn: 'root' }) @@ -19,7 +19,7 @@ export class PermissionService { return this.isPolicyGranted(key, policies); } - private isPolicyGranted(key: string, grantedPolicies: ApplicationConfiguration.Policy) { + private isPolicyGranted(key: string, grantedPolicies: Record) { if (!key) return true; const orRegexp = /\|\|/g; @@ -51,11 +51,11 @@ export class PermissionService { return this.mapToPolicies(this.configState.getAll()); } - private mapToPolicies(applicationConfiguration: ApplicationConfiguration.Response) { + private mapToPolicies(applicationConfiguration: ApplicationConfigurationDto) { return snq(() => applicationConfiguration.auth.grantedPolicies); } - private getPolicy(key: string, grantedPolicies: ApplicationConfiguration.Policy) { + private getPolicy(key: string, grantedPolicies: Record) { return snq(() => grantedPolicies[key], false); } }