diff --git a/npm/ng-packs/packages/oauth/src/lib/handlers/oauth-configuration.handler.ts b/npm/ng-packs/packages/oauth/src/lib/handlers/oauth-configuration.handler.ts index a2a9228b78..42ddb89c90 100644 --- a/npm/ng-packs/packages/oauth/src/lib/handlers/oauth-configuration.handler.ts +++ b/npm/ng-packs/packages/oauth/src/lib/handlers/oauth-configuration.handler.ts @@ -1,4 +1,4 @@ -import { Inject, Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { AuthConfig, OAuthService } from "angular-oauth2-oidc"; import compare from 'just-compare'; import { filter, map } from 'rxjs/operators'; @@ -8,11 +8,11 @@ import { ABP, EnvironmentService, CORE_OPTIONS } from '@abp/ng.core'; providedIn: 'root', }) export class OAuthConfigurationHandler { - constructor( - private oAuthService: OAuthService, - private environmentService: EnvironmentService, - @Inject(CORE_OPTIONS) private options: ABP.Root, - ) { + private oAuthService = inject(OAuthService); + private environmentService = inject(EnvironmentService); + private options = inject(CORE_OPTIONS); + + constructor() { this.listenToSetEnvironment(); } diff --git a/npm/ng-packs/packages/oauth/src/lib/interceptors/api.interceptor.ts b/npm/ng-packs/packages/oauth/src/lib/interceptors/api.interceptor.ts index e7ee208c47..e6921d5961 100644 --- a/npm/ng-packs/packages/oauth/src/lib/interceptors/api.interceptor.ts +++ b/npm/ng-packs/packages/oauth/src/lib/interceptors/api.interceptor.ts @@ -1,5 +1,5 @@ import { HttpHandler, HttpHeaders, HttpRequest } from '@angular/common/http'; -import { Inject, Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { OAuthService } from 'angular-oauth2-oidc'; import { finalize } from 'rxjs/operators'; import { @@ -14,12 +14,11 @@ import { providedIn: 'root', }) export class OAuthApiInterceptor implements IApiInterceptor { - constructor( - private oAuthService: OAuthService, - private sessionState: SessionStateService, - private httpWaitService: HttpWaitService, - @Inject(TENANT_KEY) private tenantKey: string, - ) {} + private oAuthService = inject(OAuthService); + private sessionState = inject(SessionStateService); + private httpWaitService = inject(HttpWaitService); + private tenantKey = inject(TENANT_KEY); + intercept(request: HttpRequest, next: HttpHandler) { this.httpWaitService.addRequest(request); diff --git a/npm/ng-packs/packages/oauth/src/lib/services/oauth.service.ts b/npm/ng-packs/packages/oauth/src/lib/services/oauth.service.ts index a490f92dd2..51c97a8101 100644 --- a/npm/ng-packs/packages/oauth/src/lib/services/oauth.service.ts +++ b/npm/ng-packs/packages/oauth/src/lib/services/oauth.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Injector } from '@angular/core'; +import { Injectable, Injector, inject } from '@angular/core'; import { Params } from '@angular/router'; import { from, Observable, lastValueFrom, EMPTY } from 'rxjs'; import { filter, map, switchMap, take, tap } from 'rxjs/operators'; @@ -13,6 +13,8 @@ import { HttpHeaders } from '@angular/common/http'; providedIn: 'root', }) export class AbpOAuthService implements IAuthService { + protected injector = inject(Injector); + private strategy!: AuthFlowStrategy; private readonly oAuthService: OAuthService; @@ -28,7 +30,7 @@ export class AbpOAuthService implements IAuthService { return this.strategy.isInternalAuth; } - constructor(protected injector: Injector) { + constructor() { this.oAuthService = this.injector.get(OAuthService); }