From 8426687b516c6995a452f2921ee69c1742e3c2b4 Mon Sep 17 00:00:00 2001
From: Mahmut Gundogdu <mahmutgundogdu@hotmail.com.tr>
Date: Tue, 31 Oct 2023 14:37:42 +0300
Subject: [PATCH] remove ISS in in url after the login. Remove some unuseds,

---
 .../packages/core/src/lib/guards/permission.guard.ts   | 10 +++-------
 .../packages/oauth/src/lib/utils/auth-utils.ts         |  3 +--
 2 files changed, 4 insertions(+), 9 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 ae3fdb6e37..a4576d41bf 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
@@ -1,13 +1,9 @@
 import { Injectable, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
 import { HttpErrorResponse } from '@angular/common/http';
-
 import { Observable, of } from 'rxjs';
 import { tap } from 'rxjs/operators';
-
-import { OAuthService } from 'angular-oauth2-oidc';
-
-import { IAbpGuard } from '../abstracts';
+import { AuthService, IAbpGuard } from '../abstracts';
 import { findRoute, getRoutePath } from '../utils/route-utils';
 import { RoutesService, PermissionService, HttpErrorReporterService } from '../services';
 
@@ -17,7 +13,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(OAuthService);
+  protected readonly oAuthService = inject(AuthService);
   protected readonly permissionService = inject(PermissionService);
   protected readonly httpErrorReporter = inject(HttpErrorReporterService);
 
@@ -33,7 +29,7 @@ export class PermissionGuard implements IAbpGuard {
 
     return this.permissionService.getGrantedPolicy$(requiredPolicy).pipe(
       tap(access => {
-        if (!access && this.oAuthService.hasValidAccessToken()) {
+        if (!access && this.oAuthService.isAuthenticated) {
           this.httpErrorReporter.reportError({ status: 403 } as HttpErrorResponse);
         }
       }),
diff --git a/npm/ng-packs/packages/oauth/src/lib/utils/auth-utils.ts b/npm/ng-packs/packages/oauth/src/lib/utils/auth-utils.ts
index f1dc5b6106..bd50e97ee7 100644
--- a/npm/ng-packs/packages/oauth/src/lib/utils/auth-utils.ts
+++ b/npm/ng-packs/packages/oauth/src/lib/utils/auth-utils.ts
@@ -1,6 +1,5 @@
-import { inject, Injector } from '@angular/core';
+import { Injector } from '@angular/core';
 import { Router } from '@angular/router';
-import { OAuthStorage, TokenResponse } from 'angular-oauth2-oidc';
 import { pipe } from 'rxjs';
 import { switchMap, tap } from 'rxjs/operators';
 import {