mesauth-angular 1.0.1 → 1.1.2

package/dist/fesm2022/mesauth-angular.mjs

@@ -1,14 +1,46 @@
 import * as i0 from '@angular/core';
-import { Injectable, NgModule, EventEmitter, signal, HostListener, HostBinding, Output, Component, ViewChild } from '@angular/core';
+import { InjectionToken, makeEnvironmentProviders, provideAppInitializer, inject, Injectable, NgModule, EventEmitter, signal, HostListener, HostBinding, Output, Component, ViewChild } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
 import { HubConnectionBuilder, LogLevel } from '@microsoft/signalr';
 import { BehaviorSubject, Subject, throwError } from 'rxjs';
 import { filter, debounceTime, tap, catchError, takeUntil } from 'rxjs/operators';
 import * as i2 from '@angular/router';
-import { NavigationEnd } from '@angular/router';
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import { Router, NavigationEnd } from '@angular/router';
 import * as i3 from '@angular/common';
 import { NgIf, CommonModule, NgFor } from '@angular/common';
 
+/** Injection token for MesAuth configuration */
+const MES_AUTH_CONFIG = new InjectionToken('MES_AUTH_CONFIG');
+/**
+ * Provides MesAuth with configuration.
+ * This is the recommended way to set up mesauth-angular in standalone apps.
+ *
+ * @example
+ * ```typescript
+ * // app.config.ts
+ * export const appConfig: ApplicationConfig = {
+ *   providers: [
+ *     provideHttpClient(withInterceptors([mesAuthInterceptor])),
+ *     provideMesAuth({
+ *       apiBaseUrl: 'https://auth.example.com',
+ *       userBaseUrl: 'https://app.example.com'
+ *     })
+ *   ]
+ * };
+ * ```
+ */
+function provideMesAuth(config) {
+    return makeEnvironmentProviders([
+        { provide: MES_AUTH_CONFIG, useValue: config },
+        MesAuthService,
+        provideAppInitializer(() => {
+            const mesAuthService = inject(MesAuthService);
+            const httpClient = inject(HttpClient);
+            const router = inject(Router);
+            mesAuthService.init(config, httpClient, router);
+        })
+    ]);
+}
 var NotificationType;
 (function (NotificationType) {
     NotificationType["Info"] = "Info";
@@ -58,7 +90,6 @@ class MesAuthService {
             });
         }
         this.fetchCurrentUser();
-        this.fetchInitialNotifications();
     }
     getConfig() {
         return this.config;
@@ -72,6 +103,8 @@ class MesAuthService {
                 this._currentUser.next(u);
                 if (u && this.config) {
                     this.startConnection(this.config);
+                    // Only fetch notifications after confirming user is logged in
+                    this.fetchInitialNotifications();
                 }
             },
             error: (err) => {
@@ -83,7 +116,8 @@ class MesAuthService {
         });
     }
     fetchInitialNotifications() {
-        if (!this.apiBase)
+        // Skip if no user is logged in or apiBase not set
+        if (!this.apiBase || !this._currentUser.value)
             return;
         this.http.get(`${this.apiBase}/notif/me`, { withCredentials: this.config?.withCredentials ?? true }).subscribe({
             next: (notifications) => {
@@ -260,57 +294,58 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
             type: Injectable
         }], ctorParameters: () => [] });
 
-class MesAuthInterceptor {
-    authService;
-    router;
-    constructor(authService, router) {
-        this.authService = authService;
-        this.router = router;
-    }
-    intercept(req, next) {
-        return next.handle(req).pipe(catchError((error) => {
-            const status = error.status;
-            if (status === 401 || status === 403) {
-                const config = this.authService.getConfig();
-                const baseUrl = config?.userBaseUrl || '';
-                // Use router URL for internal navigation (cleaner URLs)
-                // Falls back to window.location for full URL if needed
-                const currentUrl = this.router.url || window.location.pathname + window.location.search;
-                const returnUrl = encodeURIComponent(currentUrl);
-                // Avoid loops if already on auth/unauth pages
-                const isLoginPage = currentUrl.includes('/login');
-                const is403Page = currentUrl.includes('/403');
-                if (status === 401 && !isLoginPage) {
-                    window.location.href = `${baseUrl}/login?returnUrl=${returnUrl}`;
-                }
-                else if (status === 403 && !is403Page) {
-                    window.location.href = `${baseUrl}/403?returnUrl=${returnUrl}`;
-                }
+// Track if we're currently redirecting to prevent loopback
+let isRedirecting = false;
+/**
+ * Functional HTTP interceptor for handling 401/403 auth errors.
+ * Redirects to login page on 401, and to 403 page on 403.
+ * Includes loopback prevention to avoid infinite redirects.
+ */
+const mesAuthInterceptor = (req, next) => {
+    const authService = inject(MesAuthService);
+    const router = inject(Router);
+    return next(req).pipe(catchError((error) => {
+        const status = error.status;
+        // Check if we should handle this error and prevent loopback
+        if ((status === 401 || status === 403) && !isRedirecting) {
+            const config = authService.getConfig();
+            const baseUrl = config?.userBaseUrl || '';
+            // Use router URL for internal navigation (cleaner URLs)
+            // Falls back to window.location for full URL if needed
+            const currentUrl = router.url + (window.location.hash || '');
+            const returnUrl = encodeURIComponent(currentUrl);
+            // Avoid loops if already on auth/unauth pages
+            const isLoginPage = currentUrl.includes('/login');
+            const is403Page = currentUrl.includes('/403');
+            const isAuthPage = currentUrl.includes('/auth');
+            if (status === 401 && !isLoginPage && !isAuthPage) {
+                isRedirecting = true;
+                // Reset flag after a delay to allow future redirects after user returns
+                setTimeout(() => { isRedirecting = false; }, 5000);
+                window.location.href = `${baseUrl}/login?returnUrl=${returnUrl}`;
             }
-            return throwError(() => error);
-        }));
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: MesAuthInterceptor, deps: [{ token: MesAuthService }, { token: i2.Router }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: MesAuthInterceptor });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: MesAuthInterceptor, decorators: [{
-            type: Injectable
-        }], ctorParameters: () => [{ type: MesAuthService }, { type: i2.Router }] });
+            else if (status === 403 && !is403Page) {
+                isRedirecting = true;
+                setTimeout(() => { isRedirecting = false; }, 5000);
+                window.location.href = `${baseUrl}/403?returnUrl=${returnUrl}`;
+            }
+        }
+        return throwError(() => error);
+    }));
+};
 
 class MesAuthModule {
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: MesAuthModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
     static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.16", ngImport: i0, type: MesAuthModule });
     static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: MesAuthModule, providers: [
-            MesAuthService,
-            { provide: HTTP_INTERCEPTORS, useClass: MesAuthInterceptor, multi: true }
+            MesAuthService
         ] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: MesAuthModule, decorators: [{
             type: NgModule,
             args: [{
                     providers: [
-                        MesAuthService,
-                        { provide: HTTP_INTERCEPTORS, useClass: MesAuthInterceptor, multi: true }
+                        MesAuthService
                     ]
                 }]
         }] });
@@ -1185,5 +1220,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { MaUserComponent, MesAuthInterceptor, MesAuthModule, MesAuthService, NotificationBadgeComponent, NotificationPanelComponent, NotificationType, ThemeService, ToastContainerComponent, ToastService, UserProfileComponent };
+export { MES_AUTH_CONFIG, MaUserComponent, MesAuthModule, MesAuthService, NotificationBadgeComponent, NotificationPanelComponent, NotificationType, ThemeService, ToastContainerComponent, ToastService, UserProfileComponent, mesAuthInterceptor, provideMesAuth };
 //# sourceMappingURL=mesauth-angular.mjs.map