Merge branch 'main' into feature/2079#wildcards-in-secureRoutes

# Conflicts:
#	projects/angular-auth-oidc-client/src/lib/interceptor/closest-matching-route.service.spec.ts

Author: stephaniekatterwe

.eslintrc.json

@@ -22,10 +22,57 @@
             "format": ["PascalCase"]
           }
         ],
+        "@typescript-eslint/member-ordering": [
+          "error",
+          {
+            "default": {
+              "memberTypes": [
+                // Static members
+                "public-static-field",
+                "protected-static-field",
+                "private-static-field",
+                "#private-static-field",
+
+                // Readonly fields (grouped)
+                "private-instance-readonly-field",
+
+                // Constructors
+                "public-constructor",
+                "protected-constructor",
+                "private-constructor",
+
+                // Methods
+                "public-instance-method",
+                "protected-instance-method",
+                "private-instance-method"
+              ]
+            }
+          }
+        ],
         "max-len": "off",
-        "no-useless-constructor": "off",
-        "lines-between-class-members": ["error", "always"],
-        "newline-after-var": ["error", "always"],
+        "lines-between-class-members": [
+          "error",
+          {
+            "enforce": [
+              {
+                "blankLine": "always",
+                "prev": "method",
+                "next": "method"
+              },
+              {
+                "blankLine": "always",
+                "prev": "field",
+                "next": "method"
+              }
+            ]
+          }
+        ],
+        "padding-line-between-statements": [
+          "error",
+          { "blankLine": "always", "prev": ["const", "let", "var"], "next": "*" },
+          { "blankLine": "never", "prev": ["const", "let", "var"], "next": ["const", "let", "var"] },
+          { "blankLine": "always", "prev": "*", "next": "return" }
+        ],
         "one-var": ["error", "never"],
         "@typescript-eslint/no-useless-constructor": ["error"],
         "@typescript-eslint/prefer-readonly": ["error"],
@@ -35,15 +82,13 @@
         "no-case-declarations": ["error"],
         "no-empty": ["error"],
         "@typescript-eslint/no-empty-function": ["error"],
-        "no-unused-vars": "off",
         "@typescript-eslint/ban-types": ["error"],
         "no-useless-escape": ["error"],
         "no-prototype-builtins": ["error"],
         "prefer-spread": ["error"],
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/typedef": ["error"],
         "@typescript-eslint/explicit-function-return-type": ["error"],
-        "newline-before-return": ["error"],
         "@typescript-eslint/no-unused-vars": [
           "error",
           {

package.json

@@ -18,6 +18,7 @@
     "build-lib-prod": "ng build angular-auth-oidc-client --configuration production && npm run schematics-build && npm run copy-files",
     "test-lib": "ng test angular-auth-oidc-client --code-coverage",
     "test-lib-ci": "ng test angular-auth-oidc-client --watch=false --browsers=ChromeHeadlessNoSandbox --code-coverage",
+    "lint-lib-fix": "ng lint angular-auth-oidc-client --fix",
     "lint-lib": "ng lint angular-auth-oidc-client",
     "pack-lib": "npm run build-lib-prod && npm pack ./dist/angular-auth-oidc-client",
     "publish-lib": "npm run build-lib-prod && npm publish ./dist/angular-auth-oidc-client",

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

@@ -1,65 +1,63 @@
-import { HttpHeaders, HttpParams } from '@angular/common/http';
-import { Injectable, inject } from '@angular/core';
-import { Observable } from 'rxjs';
-import { OpenIdConfiguration } from '../config/openid-configuration';
-import { HttpBaseService } from './http-base.service';
-
-const NGSW_CUSTOM_PARAM = 'ngsw-bypass';
-
-@Injectable({ providedIn: 'root' })
-export class DataService {
-  private readonly httpClient = inject(HttpBaseService);
-
-  get<T>(
-    url: string,
-    config: OpenIdConfiguration,
-    token?: string
-  ): Observable<T> {
-    const headers = this.prepareHeaders(token);
-    const params = this.prepareParams(config);
-
-    return this.httpClient.get<T>(url, {
-      headers,
-      params,
-    });
-  }
-
-  post<T>(
-    url: string | null,
-    body: unknown,
-    config: OpenIdConfiguration,
-    headersParams?: HttpHeaders
-  ): Observable<T> {
-    const headers = headersParams || this.prepareHeaders();
-    const params = this.prepareParams(config);
-
-    return this.httpClient.post<T>(url ?? '', body, { headers, params });
-  }
-
-  private prepareHeaders(token?: string): HttpHeaders {
-    let headers = new HttpHeaders();
-
-    headers = headers.set('Accept', 'application/json');
-
-    if (!!token) {
-      headers = headers.set(
-        'Authorization',
-        'Bearer ' + decodeURIComponent(token)
-      );
-    }
-
-    return headers;
-  }
-
-  private prepareParams(config: OpenIdConfiguration): HttpParams {
-    let params = new HttpParams();
-
-    const { ngswBypass } = config;
-
-    if (ngswBypass) {
-      params = params.set(NGSW_CUSTOM_PARAM, '');
-    }
-
-    return params;
-  }
-}
+import { HttpHeaders, HttpParams } from '@angular/common/http';
+import { Injectable, inject } from '@angular/core';
+import { Observable } from 'rxjs';
+import { OpenIdConfiguration } from '../config/openid-configuration';
+import { HttpBaseService } from './http-base.service';
+
+const NGSW_CUSTOM_PARAM = 'ngsw-bypass';
+
+@Injectable({ providedIn: 'root' })
+export class DataService {
+  private readonly httpClient = inject(HttpBaseService);
+
+  get<T>(
+    url: string,
+    config: OpenIdConfiguration,
+    token?: string
+  ): Observable<T> {
+    const headers = this.prepareHeaders(token);
+    const params = this.prepareParams(config);
+
+    return this.httpClient.get<T>(url, {
+      headers,
+      params,
+    });
+  }
+
+  post<T>(
+    url: string | null,
+    body: unknown,
+    config: OpenIdConfiguration,
+    headersParams?: HttpHeaders
+  ): Observable<T> {
+    const headers = headersParams || this.prepareHeaders();
+    const params = this.prepareParams(config);
+
+    return this.httpClient.post<T>(url ?? '', body, { headers, params });
+  }
+
+  private prepareHeaders(token?: string): HttpHeaders {
+    let headers = new HttpHeaders();
+
+    headers = headers.set('Accept', 'application/json');
+
+    if (!!token) {
+      headers = headers.set(
+        'Authorization',
+        'Bearer ' + decodeURIComponent(token)
+      );
+    }
+
+    return headers;
+  }
+
+  private prepareParams(config: OpenIdConfiguration): HttpParams {
+    let params = new HttpParams();    const { ngswBypass } = config;
+
+    if (ngswBypass) {
+      params = params.set(NGSW_CUSTOM_PARAM, '');
+    }
+
+    return params;
+  }
+}

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

@@ -1,4 +1,4 @@
-import { Injectable, inject } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import { BehaviorSubject, Observable, throwError } from 'rxjs';
 import { distinctUntilChanged } from 'rxjs/operators';
 import { OpenIdConfiguration } from '../config/openid-configuration';
@@ -21,11 +21,8 @@ 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$ =
@@ -190,7 +187,6 @@ export class AuthStateService {
     }
     const tokenToCheck =
       this.storagePersistenceService.getIdToken(configuration);
-
     const idTokenExpired = this.tokenValidationService.hasIdTokenExpired(
       tokenToCheck,
       configuration,
@@ -221,7 +217,6 @@ export class AuthStateService {
         configuration,
         renewTimeBeforeTokenExpiresInSeconds
       );
-
     const hasExpired = !accessTokenHasNotExpired;
 
     if (hasExpired) {
@@ -320,9 +315,8 @@ export class AuthStateService {
       configId: config.configId ?? '',
       isAuthenticated: this.isAuthenticated(config),
     }));
-
     const isAuthenticated = allConfigsAuthenticated.every(
-      (x) => !!x.isAuthenticated
+      (x) => x.isAuthenticated
     );
 
     return { allConfigsAuthenticated, isAuthenticated };