Merge pull request #55 from Service-Soft/54-add-ssr-support

ssr support, package updates
Service-Soft · Dec 29, 2024 · 7a00e3d · 7a00e3d
2 parents 957abf5 + e6d6b4b
commit 7a00e3d
Show file tree

Hide file tree

Showing 15 changed files with 8,544 additions and 7,646 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,29 +28,31 @@
     },
     "private": true,
     "dependencies": {
-        "@angular/animations": "~18.0.1",
+        "@angular/animations": "^18.0.1",
         "@angular/cdk": "^18.0.1",
-        "@angular/common": "~18.0.1",
-        "@angular/compiler": "~18.0.1",
-        "@angular/core": "~18.0.1",
-        "@angular/forms": "~18.0.1",
+        "@angular/common": "^18.0.1",
+        "@angular/compiler": "^18.0.1",
+        "@angular/core": "^18.0.1",
+        "@angular/forms": "^18.0.1",
         "@angular/material": "^18.0.1",
-        "@angular/platform-browser": "~18.0.1",
-        "@angular/platform-browser-dynamic": "~18.0.1",
-        "@angular/router": "~18.0.1",
+        "@angular/platform-browser": "^18.0.1",
+        "@angular/platform-browser-dynamic": "^18.0.1",
+        "@angular/router": "^18.0.1",
+        "@fortawesome/angular-fontawesome": "^0.15.0",
+        "@fortawesome/free-solid-svg-icons": "^6.7.2",
         "rxjs": "~7.8.1",
         "tslib": "^2.6.2",
         "zone.js": "~0.14.6"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "~18.0.2",
+        "@angular-devkit/build-angular": "^18.0.2",
         "@angular/cli": "~18.0.2",
-        "@angular/compiler-cli": "~18.0.1",
+        "@angular/compiler-cli": "^18.0.1",
         "@simplewebauthn/browser": "^10.0.0",
         "@types/jasmine": "~5.1.4",
         "@types/qrcode": "^1.5.5",
         "concurrently": "^8.2.2",
-        "eslint-config-service-soft": "^1.5.0",
+        "eslint-config-service-soft": "^1.5.8",
         "jasmine-core": "~5.1.2",
         "karma": "~6.4.3",
         "karma-chrome-launcher": "~3.2.0",
@@ -64,7 +66,7 @@
         "npm-run-all": "^4.1.5",
         "qrcode": "^1.5.3",
         "ts-node": "^10.9.2",
-        "typescript": "~5.4.5",
+        "typescript": "~5.5",
         "wait-on": "^7.2.0"
     }
-}
+}
diff --git a/projects/ngx-material-auth-showcase/src/app/routes.ts b/projects/ngx-material-auth-showcase/src/app/routes.ts
@@ -1,5 +1,6 @@
-/* eslint-disable promise/prefer-await-to-then */
+
 import { inject } from '@angular/core';
+import { faHome, faLock, faUser } from '@fortawesome/free-solid-svg-icons';
 import { JwtBelongsToGuard, JwtLoggedInGuard, JwtRoleGuard } from 'ngx-material-auth';
 import { FooterRow, NavElementTypes, NavbarRow, NavUtilities, NavRoute } from 'ngx-material-navigation';
 
@@ -18,7 +19,7 @@ export const navbarRows: NavbarRow[] = [
                     path: '',
                     loadComponent: () => import('./pages/home/home.component').then(m => m.HomeComponent)
                 },
-                icon: 'fas fa-home',
+                icon: faHome,
                 name: 'Home',
                 collapse: 'never'
             },
@@ -29,13 +30,13 @@ export const navbarRows: NavbarRow[] = [
                     path: 'login',
                     loadComponent: () => import('./pages/login/login.component').then(m => m.LoginComponent)
                 },
-                icon: 'fas fa-user',
+                icon: faUser,
                 name: 'Login',
                 collapse: 'sm'
             },
             {
                 type: NavElementTypes.MENU,
-                icon: 'fas fa-lock',
+                icon: faLock,
                 name: 'Restricted Routes',
                 collapse: 'sm',
                 elements: [

diff --git a/projects/ngx-material-auth-showcase/src/app/services/custom-auth.service.spec.ts b/projects/ngx-material-auth-showcase/src/app/services/custom-auth.service.spec.ts
@@ -1,10 +1,8 @@
 /* eslint-disable cspell/spellchecker */
-/* eslint-disable sonar/no-duplicate-string */
 import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { TestBed } from '@angular/core/testing';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
-import jasmine from 'jasmine';
 import { JwtInterceptor, NGX_AUTH_SERVICE, NGX_JWT_INTERCEPTOR_ALLOWED_DOMAINS } from 'ngx-material-auth';
 import { firstValueFrom } from 'rxjs';
 
@@ -70,7 +68,7 @@ describe('CustomAuthService', () => {
                 password: 'stringstring'
             });
         }
-        catch (error) { }
+        catch { }
         expect(service.authData).toBeUndefined();
     });
 

diff --git a/projects/ngx-material-auth-showcase/src/app/services/custom-auth.service.ts b/projects/ngx-material-auth-showcase/src/app/services/custom-auth.service.ts
@@ -1,5 +1,5 @@
 import { HttpClient } from '@angular/common/http';
-import { Injectable, NgZone } from '@angular/core';
+import { Inject, Injectable, NgZone, PLATFORM_ID } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { Router } from '@angular/router';
@@ -42,9 +42,11 @@ export class CustomAuthService extends JwtAuthService<CustomAuthData, Roles, Bas
         snackBar: MatSnackBar,
         ngZone: NgZone,
         router: Router,
-        dialog: MatDialog
+        dialog: MatDialog,
+        @Inject(PLATFORM_ID)
+        platformId: Object
     ) {
-        super(http, snackBar, ngZone, router, dialog);
+        super(http, snackBar, ngZone, router, dialog, platformId);
     }
 
     async deleteAllBiometricCredentials(): Promise<void> {

diff --git a/projects/ngx-material-auth-showcase/src/main.ts b/projects/ngx-material-auth-showcase/src/main.ts
@@ -19,7 +19,7 @@ if (environment.production) {
 // eslint-disable-next-line unusedImports/no-unused-vars
 function getBelongsToForRouteValue(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
     const authService: CustomAuthService = inject(CustomAuthService);
-    if (!authService.authData?.userId) {
+    if (authService.authData?.userId) {
         return false;
     }
     const allowedUserIds: string[] | undefined = route.data['allowedUserIds'] as string[] | undefined;

diff --git a/projects/ngx-material-auth-showcase/tsconfig.app.json b/projects/ngx-material-auth-showcase/tsconfig.app.json
@@ -1,15 +1,13 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../out-tsc/app",
-    "types": []
-  },
-  "files": [
-    "src/main.ts",
-    "src/polyfills.ts"
-  ],
-  "include": [
-    "src/**/*.d.ts"
-  ]
-}
+    "compilerOptions": {
+        "outDir": "../../out-tsc/app",
+        "types": []
+    },
+    "extends": "../../tsconfig.json",
+    "files": [
+        "src/main.ts",
+        "src/polyfills.ts"
+    ],
+    "include": ["src/**/*.d.ts"]
+}
diff --git a/projects/ngx-material-auth-showcase/tsconfig.spec.json b/projects/ngx-material-auth-showcase/tsconfig.spec.json
@@ -1,18 +1,16 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../out-tsc/spec",
-    "types": [
-      "jasmine"
+    "compilerOptions": {
+        "outDir": "../../out-tsc/spec",
+        "types": ["jasmine"]
+    },
+    "extends": "../../tsconfig.json",
+    "files": [
+        "src/test.ts",
+        "src/polyfills.ts"
+    ],
+    "include": [
+        "src/**/*.spec.ts",
+        "src/**/*.d.ts"
     ]
-  },
-  "files": [
-    "src/test.ts",
-    "src/polyfills.ts"
-  ],
-  "include": [
-    "src/**/*.spec.ts",
-    "src/**/*.d.ts"
-  ]
-}
+}
diff --git a/projects/ngx-material-auth/package.json b/projects/ngx-material-auth/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ngx-material-auth",
-    "version": "18.0.1",
+    "version": "18.0.2",
     "license": "MIT",
     "keywords": [
         "angular",

diff --git a/...x-material-auth/src/components/confirm-reset-password/confirm-reset-password.component.ts b/...x-material-auth/src/components/confirm-reset-password/confirm-reset-password.component.ts
@@ -211,7 +211,7 @@ export class NgxMatAuthConfirmResetPasswordComponent<
             form.resetForm();
             await this.router.navigateByUrl(this.routeAfterReset);
         }
-        catch (error) {
+        catch {
             form.resetForm();
             await this.router.navigateByUrl(this.routeAfterReset);
         }

diff --git a/projects/ngx-material-auth/src/interceptors/http-error.interceptor.ts b/projects/ngx-material-auth/src/interceptors/http-error.interceptor.ts
@@ -1,5 +1,6 @@
+import { isPlatformBrowser } from '@angular/common';
 import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpStatusCode } from '@angular/common/http';
-import { Inject, Injectable } from '@angular/core';
+import { Inject, Injectable, PLATFORM_ID } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Router } from '@angular/router';
 import { Observable, catchError, throwError } from 'rxjs';
@@ -57,7 +58,9 @@ export class HttpErrorInterceptor<
         protected readonly router: Router,
         @Inject(NGX_AUTH_SERVICE)
         protected readonly authService: AuthServiceType,
-        protected readonly dialog: MatDialog
+        protected readonly dialog: MatDialog,
+        @Inject(PLATFORM_ID)
+        protected readonly platformId: Object
     ) { }
 
     /**
@@ -129,6 +132,9 @@ export class HttpErrorInterceptor<
             return error.message;
         }
         if (this.isCORSError(error)) {
+            if (!isPlatformBrowser(this.platformId)) {
+                return this.CORS_ERROR_MESSAGE;
+            }
             if (!window.navigator.onLine) {
                 return this.NO_INTERNET_CONNECTION_ERROR_MESSAGE;
             }

diff --git a/projects/ngx-material-auth/src/services/jwt-auth.service.ts b/projects/ngx-material-auth/src/services/jwt-auth.service.ts
@@ -1,5 +1,6 @@
+import { isPlatformBrowser } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
-import { InjectionToken, NgZone } from '@angular/core';
+import { Inject, InjectionToken, NgZone, PLATFORM_ID } from '@angular/core';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { Router } from '@angular/router';
@@ -220,6 +221,9 @@ export abstract class JwtAuthService<
     }
 
     set authData(value: AuthDataType | undefined) {
+        if (!isPlatformBrowser(this.platformId)) {
+            return;
+        }
         value = this.transformAuthDataBeforeSetting(value);
         localStorage.setItem(this.AUTH_DATA_KEY, JSON.stringify(value));
         if (!value) {
@@ -237,6 +241,9 @@ export abstract class JwtAuthService<
      * This is separated from the auth data because it's also needed when the user is logged out.
      */
     get biometricCredentials(): BiometricCredentials[] {
+        if (!isPlatformBrowser(this.platformId)) {
+            return [];
+        }
         const jsonString: string | null = localStorage.getItem(this.BIOMETRIC_CREDENTIALS_KEY);
         if (!jsonString) {
             return [];
@@ -245,6 +252,9 @@ export abstract class JwtAuthService<
     }
 
     set biometricCredentials(value: BiometricCredentials[] | undefined) {
+        if (!isPlatformBrowser(this.platformId)) {
+            return;
+        }
         localStorage.setItem(this.BIOMETRIC_CREDENTIALS_KEY, JSON.stringify(value));
         if (!value) {
             localStorage.removeItem(this.BIOMETRIC_CREDENTIALS_KEY);
@@ -264,8 +274,14 @@ export abstract class JwtAuthService<
         protected readonly snackbar: MatSnackBar,
         protected readonly zone: NgZone,
         protected readonly router: Router,
-        protected readonly dialog: MatDialog
+        protected readonly dialog: MatDialog,
+        @Inject(PLATFORM_ID)
+        protected readonly platformId: Object
     ) {
+        if (!isPlatformBrowser(platformId)) {
+            this.authDataSubject = new BehaviorSubject<AuthDataType | undefined>(undefined);
+            return;
+        }
         const stringData: string | null = localStorage.getItem(this.AUTH_DATA_KEY);
         const authData: AuthDataType | undefined = stringData ? JSON.parse(stringData) as AuthDataType : undefined;
         this.authDataSubject = new BehaviorSubject(authData);

diff --git a/projects/ngx-material-auth/tsconfig.lib.json b/projects/ngx-material-auth/tsconfig.lib.json
@@ -1,15 +1,15 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-    "extends": "../../tsconfig.json",
     "compilerOptions": {
-        "outDir": "../../out-tsc/lib",
         "declaration": true,
         "declarationMap": true,
         "inlineSources": true,
+        "outDir": "../../out-tsc/lib",
         "types": []
     },
     "exclude": [
         "src/test.ts",
         "**/*.spec.ts"
-    ]
+    ],
+    "extends": "../../tsconfig.json"
 }
diff --git a/projects/ngx-material-auth/tsconfig.lib.prod.json b/projects/ngx-material-auth/tsconfig.lib.prod.json
@@ -1,10 +1,10 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-    "extends": "./tsconfig.lib.json",
+    "angularCompilerOptions": {
+        "compilationMode": "partial"
+    },
     "compilerOptions": {
         "declarationMap": false
     },
-    "angularCompilerOptions": {
-        "compilationMode": "partial"
-    }
+    "extends": "./tsconfig.lib.json"
 }
diff --git a/projects/ngx-material-auth/tsconfig.spec.json b/projects/ngx-material-auth/tsconfig.spec.json
@@ -1,15 +1,11 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-    "extends": "../../tsconfig.json",
     "compilerOptions": {
         "outDir": "../../out-tsc/spec",
-        "types": [
-            "jasmine"
-        ]
+        "types": ["jasmine"]
     },
-    "files": [
-        "src/test.ts"
-    ],
+    "extends": "../../tsconfig.json",
+    "files": ["src/test.ts"],
     "include": [
         "**/*.spec.ts",
         "**/*.d.ts"