Merge pull request #1917 from damienbod/feature/fg/moving-to-inject-function

Moving to inject function

Author: FabianGosebrink

README.md

@@ -112,14 +112,14 @@ export class AppModule {}
 And call the method `checkAuth()` from your `app.component.ts`. The method `checkAuth()` is needed to process the redirect from your Security Token Service and set the correct states. This method must be used to ensure the correct functioning of the library.
 
 ```ts
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
 import { OidcSecurityService } from 'angular-auth-oidc-client';
 
 @Component({
  /*...*/
 })
 export class AppComponent implements OnInit {
- constructor(public oidcSecurityService: OidcSecurityService) {}
+ private readonly oidcSecurityService = inject(OidcSecurityService);
 
  ngOnInit() {
  this.oidcSecurityService

docs/site/angular-auth-oidc-client/docs/documentation/auto-login.md

@@ -27,10 +27,15 @@ import { AutoLoginPartialRoutesGuard } from 'angular-auth-oidc-client';
 const routes: Routes = [
  { path: '', pathMatch: 'full', redirectTo: 'home' },
  { path: 'home', component: HomeComponent },
- { path: 'protected', component: ProtectedComponent, canActivate: [AutoLoginPartialRoutesGuard] },
+ {
+ path: 'protected',
+ component: ProtectedComponent,
+ canActivate: [AutoLoginPartialRoutesGuard],
+ },
  {
  path: 'customers',
- loadChildren: () => import('./customers/customers.module').then((m) => m.CustomersModule),
+ loadChildren: () =>
+ import('./customers/customers.module').then((m) => m.CustomersModule),
  canLoad: [AutoLoginPartialRoutesGuard],
  },
  { path: 'unauthorized', component: UnauthorizedComponent },
@@ -42,12 +47,14 @@ Please make sure to call `checkAuth()` like normal in your `app.component.ts`.
 
 ```ts
 export class AppComponent implements OnInit {
- constructor(private oidcSecurityService: OidcSecurityService) {}
+ private readonly oidcSecurityService = inject(OidcSecurityService);
 
  ngOnInit() {
- this.oidcSecurityService.checkAuth().subscribe(({ isAuthenticated, userData, accessToken }) => {
- // ...
- });
+ this.oidcSecurityService
+ .checkAuth()
+ .subscribe(({ isAuthenticated, userData, accessToken }) => {
+ // ...
+ });
  }
 }
 ```
@@ -69,20 +76,31 @@ import { AutoLoginPartialRoutesGuard } from 'angular-auth-oidc-client';
 
 const routes: Routes = [
  { path: '', pathMatch: 'full', redirectTo: 'home' },
- { path: 'home', component: HomeComponent, canActivate: [AutoLoginPartialRoutesGuard] },
+ {
+ path: 'home',
+ component: HomeComponent,
+ canActivate: [AutoLoginPartialRoutesGuard],
+ },
  { path: 'callback', component: CallbackComponent }, // does nothing but setting up auth
 ];
 ```
+
 ### Custom Params for the guard
 
-If you need to pass custom params to the login request you can simply use the [data](https://angular.io/api/router/Route#data) attribute of the route. 
+If you need to pass custom params to the login request you can simply use the [data](https://angular.io/api/router/Route#data) attribute of the route.
 These parameters will then be appended to the login request
+
 ```ts
 import { AutoLoginPartialRoutesGuard } from 'angular-auth-oidc-client';
 
 const routes: Routes = [
  { path: '', pathMatch: 'full', redirectTo: 'home' },
- { path: 'home', component: HomeComponent, canActivate: [AutoLoginPartialRoutesGuard], data:{custom:'param'} },
+ {
+ path: 'home',
+ component: HomeComponent,
+ canActivate: [AutoLoginPartialRoutesGuard],
+ data: { custom: 'param' },
+ },
  { path: 'callback', component: CallbackComponent }, // does nothing but setting up auth
 ];
 ```

docs/site/angular-auth-oidc-client/docs/documentation/guards.md

@@ -13,16 +13,26 @@ Please refer to the auto-login guard in this repo as a reference. It is importan
 
 ```ts
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
+import {
+ ActivatedRouteSnapshot,
+ CanActivate,
+ Router,
+ RouterStateSnapshot,
+ UrlTree,
+} from '@angular/router';
 import { OidcSecurityService } from 'angular-auth-oidc-client';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 @Injectable({ providedIn: 'root' })
 export class AuthorizationGuard implements CanActivate {
- constructor(private oidcSecurityService: OidcSecurityService, private router: Router) {}
+ private readonly oidcSecurityService = inject(OidcSecurityService);
+ private readonly router = inject(Router);
 
- canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> {
+ canActivate(
+ route: ActivatedRouteSnapshot,
+ state: RouterStateSnapshot
+ ): Observable<boolean | UrlTree> {
  return this.oidcSecurityService.isAuthenticated$.pipe(
  take(1),
  map(({ isAuthenticated }) => {

docs/site/angular-auth-oidc-client/docs/documentation/login-logout.md

@@ -10,7 +10,7 @@ sidebar_position: 3
 For logging in a user you can call the `authorize()` method:
 
 ```ts
-constructor(private oidcSecurityService: OidcSecurityService) {}
+private readonly oidcSecurityService = inject(OidcSecurityService);
 
 // ...
 this.oidcSecurityService.authorize();
@@ -126,7 +126,8 @@ A simplified page (instead of the application url) can be used. Here's an exampl
  </script>
  </head>
  <body onload="sendMessage()">
- Transmitting authentication result ... (this popup will be closed automatically).
+ Transmitting authentication result ... (this popup will be closed
+ automatically).
  </body>
 </html>
 ```

docs/site/angular-auth-oidc-client/docs/documentation/public-events.md

@@ -37,7 +37,9 @@ Using the `filter` operator from RxJS you can decide which events you are intere
 ```ts
 import { PublicEventsService } from 'angular-auth-oidc-client';
 
-constructor(private eventService: PublicEventsService) {
+private readonly eventService = inject(PublicEventsService);
+
+ngOnInit() {
  this.eventService
  .registerForEvents()
  .pipe(filter((notification) => notification.type === EventTypes.CheckSessionReceived))

docs/site/angular-auth-oidc-client/docs/intro.md

@@ -72,7 +72,7 @@ import { OidcSecurityService } from 'angular-auth-oidc-client';
  /* ... */
 })
 export class AppComponent implements OnInit {
- constructor(public oidcSecurityService: OidcSecurityService) {}
+ private readonly oidcSecurityService = inject(OidcSecurityService);
 
  ngOnInit() {
  this.oidcSecurityService.checkAuth().subscribe(({ isAuthenticated, userData}) => /* ... */);

projects/angular-auth-oidc-client/src/lib/auth-state/auth-state.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { BehaviorSubject, Observable, throwError } from 'rxjs';
 import { distinctUntilChanged } from 'rxjs/operators';
 import { OpenIdConfiguration } from '../config/openid-configuration';
@@ -18,6 +18,16 @@ const DEFAULT_AUTHRESULT = {
 
 @Injectable({ providedIn: 'root' })
 export class AuthStateService {
+ private readonly storagePersistenceService = inject(
+ StoragePersistenceService
+ );
+
+ private readonly loggerService = inject(LoggerService);
+
+ private readonly publicEventsService = inject(PublicEventsService);
+
+ private readonly tokenValidationService = inject(TokenValidationService);
+
  private readonly authenticatedInternal$ =
  new BehaviorSubject<AuthenticatedResult>(DEFAULT_AUTHRESULT);
 
@@ -27,13 +37,6 @@ export class AuthStateService {
  .pipe(distinctUntilChanged());
  }
 
- constructor(
- private readonly storagePersistenceService: StoragePersistenceService,
- private readonly loggerService: LoggerService,
- private readonly publicEventsService: PublicEventsService,
- private readonly tokenValidationService: TokenValidationService
- ) {}
-
  setAuthenticatedAndFireEvent(allConfigs: OpenIdConfiguration[]): void {
  const result = this.composeAuthenticatedResult(allConfigs);
 

projects/angular-auth-oidc-client/src/lib/auth-state/check-auth.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import { forkJoin, Observable, of, throwError } from 'rxjs';
 import { catchError, map, switchMap, tap } from 'rxjs/operators';
 import { AutoLoginService } from '../auto-login/auto-login.service';
@@ -20,21 +20,35 @@ import { AuthStateService } from './auth-state.service';
 
 @Injectable({ providedIn: 'root' })
 export class CheckAuthService {
- constructor(
- private readonly checkSessionService: CheckSessionService,
- private readonly currentUrlService: CurrentUrlService,
- private readonly silentRenewService: SilentRenewService,
- private readonly userService: UserService,
- private readonly loggerService: LoggerService,
- private readonly authStateService: AuthStateService,
- private readonly callbackService: CallbackService,
- private readonly refreshSessionService: RefreshSessionService,
- private readonly periodicallyTokenCheckService: PeriodicallyTokenCheckService,
- private readonly popupService: PopUpService,
- private readonly autoLoginService: AutoLoginService,
- private readonly storagePersistenceService: StoragePersistenceService,
- private readonly publicEventsService: PublicEventsService
- ) {}
+ private readonly checkSessionService = inject(CheckSessionService);
+
+ private readonly currentUrlService = inject(CurrentUrlService);
+
+ private readonly silentRenewService = inject(SilentRenewService);
+
+ private readonly userService = inject(UserService);
+
+ private readonly loggerService = inject(LoggerService);
+
+ private readonly authStateService = inject(AuthStateService);
+
+ private readonly callbackService = inject(CallbackService);
+
+ private readonly refreshSessionService = inject(RefreshSessionService);
+
+ private readonly periodicallyTokenCheckService = inject(
+ PeriodicallyTokenCheckService
+ );
+
+ private readonly popupService = inject(PopUpService);
+
+ private readonly autoLoginService = inject(AutoLoginService);
+
+ private readonly storagePersistenceService = inject(
+ StoragePersistenceService
+ );
+
+ private readonly publicEventsService = inject(PublicEventsService);
 
  private getConfig(
  configuration: OpenIdConfiguration,

projects/angular-auth-oidc-client/src/lib/auto-login/auto-login-all-routes.guard.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {
  ActivatedRouteSnapshot,
  Router,
@@ -17,13 +17,15 @@ import { AutoLoginService } from './auto-login.service';
  */
 @Injectable({ providedIn: 'root' })
 export class AutoLoginAllRoutesGuard {
- constructor(
- private readonly autoLoginService: AutoLoginService,
- private readonly checkAuthService: CheckAuthService,
- private readonly loginService: LoginService,
- private readonly configurationService: ConfigurationService,
- private readonly router: Router
- ) {}
+ private readonly autoLoginService = inject(AutoLoginService);
+
+ private readonly checkAuthService = inject(CheckAuthService);
+
+ private readonly loginService = inject(LoginService);
+
+ private readonly configurationService = inject(ConfigurationService);
+
+ private readonly router = inject(Router);
 
  canLoad(): Observable<boolean> {
  const url =

projects/angular-auth-oidc-client/src/lib/auto-login/auto-login-partial-routes.guard.ts

@@ -14,13 +14,15 @@ import { AutoLoginService } from './auto-login.service';
 
 @Injectable({ providedIn: 'root' })
 export class AutoLoginPartialRoutesGuard {
- constructor(
- private readonly autoLoginService: AutoLoginService,
- private readonly authStateService: AuthStateService,
- private readonly loginService: LoginService,
- private readonly configurationService: ConfigurationService,
- private readonly router: Router
- ) {}
+ private readonly autoLoginService = inject(AutoLoginService);
+
+ private readonly authStateService = inject(AuthStateService);
+
+ private readonly loginService = inject(LoginService);
+
+ private readonly configurationService = inject(ConfigurationService);
+
+ private readonly router = inject(Router);
 
  canLoad(): Observable<boolean> {
  const url =