From 43731b08dfa59eb32e9a40de693b725f17516d6d Mon Sep 17 00:00:00 2001 From: Sinan997 Date: Mon, 6 Nov 2023 14:05:09 +0300 Subject: [PATCH 1/3] import OAuthService to solve build error --- npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts index 1765367de5..e8ed5996d8 100644 --- a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts +++ b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts @@ -11,6 +11,7 @@ import { tap } from 'rxjs/operators'; import { AuthService, IAbpGuard } from '../abstracts'; import { findRoute, getRoutePath } from '../utils/route-utils'; import { RoutesService, PermissionService, HttpErrorReporterService } from '../services'; +import { OAuthService } from 'angular-oauth2-oidc'; /** * @deprecated Use `permissionGuard` *function* instead. From 3adcb77d8b0cbaec59066e6f7f08dee4462342c5 Mon Sep 17 00:00:00 2001 From: Sinan997 Date: Mon, 6 Nov 2023 14:26:26 +0300 Subject: [PATCH 2/3] change functional guard --- .../packages/core/src/lib/guards/permission.guard.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts index e8ed5996d8..1f9fb5ab18 100644 --- a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts +++ b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts @@ -11,8 +11,6 @@ import { tap } from 'rxjs/operators'; import { AuthService, IAbpGuard } from '../abstracts'; import { findRoute, getRoutePath } from '../utils/route-utils'; import { RoutesService, PermissionService, HttpErrorReporterService } from '../services'; -import { OAuthService } from 'angular-oauth2-oidc'; - /** * @deprecated Use `permissionGuard` *function* instead. */ @@ -52,7 +50,7 @@ export const permissionGuard: CanActivateFn = ( ) => { const router = inject(Router); const routesService = inject(RoutesService); - const oAuthService = inject(OAuthService); + const oAuthService = inject(AuthService); const permissionService = inject(PermissionService); const httpErrorReporter = inject(HttpErrorReporterService); @@ -67,7 +65,7 @@ export const permissionGuard: CanActivateFn = ( return permissionService.getGrantedPolicy$(requiredPolicy).pipe( tap(access => { - if (!access && oAuthService.hasValidAccessToken()) { + if (!access && oAuthService.isAuthenticated) { httpErrorReporter.reportError({ status: 403 } as HttpErrorResponse); } }), From 2437e3831fe58d7bedd86743888c6acf0676e527 Mon Sep 17 00:00:00 2001 From: Sinan997 Date: Mon, 6 Nov 2023 15:07:52 +0300 Subject: [PATCH 3/3] change variable name --- .../packages/core/src/lib/guards/permission.guard.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts index 1f9fb5ab18..342c73b572 100644 --- a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts +++ b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts @@ -20,7 +20,7 @@ import { RoutesService, PermissionService, HttpErrorReporterService } from '../s export class PermissionGuard implements IAbpGuard { protected readonly router = inject(Router); protected readonly routesService = inject(RoutesService); - protected readonly oAuthService = inject(AuthService); + protected readonly authService = inject(AuthService); protected readonly permissionService = inject(PermissionService); protected readonly httpErrorReporter = inject(HttpErrorReporterService); @@ -36,7 +36,7 @@ export class PermissionGuard implements IAbpGuard { return this.permissionService.getGrantedPolicy$(requiredPolicy).pipe( tap(access => { - if (!access && this.oAuthService.isAuthenticated) { + if (!access && this.authService.isAuthenticated) { this.httpErrorReporter.reportError({ status: 403 } as HttpErrorResponse); } }), @@ -50,7 +50,7 @@ export const permissionGuard: CanActivateFn = ( ) => { const router = inject(Router); const routesService = inject(RoutesService); - const oAuthService = inject(AuthService); + const authService = inject(AuthService); const permissionService = inject(PermissionService); const httpErrorReporter = inject(HttpErrorReporterService); @@ -65,7 +65,7 @@ export const permissionGuard: CanActivateFn = ( return permissionService.getGrantedPolicy$(requiredPolicy).pipe( tap(access => { - if (!access && oAuthService.isAuthenticated) { + if (!access && authService.isAuthenticated) { httpErrorReporter.reportError({ status: 403 } as HttpErrorResponse); } }),