@arsedizioni/ars-utils 18.2.338 → 18.2.339

package/fesm2022/arsedizioni-ars-utils-clipper.common.mjs

@@ -1,10 +1,11 @@
 import * as i0 from '@angular/core';
 import { signal, computed, inject, Injectable, NgModule } from '@angular/core';
+import { HttpClient, HttpHeaders, HttpErrorResponse } from '@angular/common/http';
+import { Router } from '@angular/router';
 import { DialogService } from '@arsedizioni/ars-utils/ui';
-import { timer, EMPTY, throwError, of, catchError as catchError$1 } from 'rxjs';
-import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { throwError, of, catchError as catchError$1, switchMap } from 'rxjs';
 import { BroadcastService, SystemUtils } from '@arsedizioni/ars-utils/core';
-import { switchMap, shareReplay, catchError, map } from 'rxjs/operators';
+import { catchError, map } from 'rxjs/operators';
 
 const ClipperMessages = {
     /**
@@ -1851,30 +1852,14 @@ class ClipperSearchUtils {
 }
 
 class ClipperService {
-    get loginInfo() {
-        if (!this._loginInfo) {
-            const loginInfo = localStorage.getItem('clipper_login');
-            if (loginInfo) {
-                try {
-                    this._loginInfo = JSON.parse(loginInfo);
-                }
-                catch { }
-            }
-        }
-        return this._loginInfo;
-    }
-    get serviceUri() {
-        return this._serviceUri;
-    }
     constructor() {
-        this.REFRESH_INTERVAL = 60000 * 50; //50 min
         this.httpClient = inject(HttpClient);
         this.broadcastService = inject(BroadcastService);
         this.dialogService = inject(DialogService);
-        this.tokenRefreshInterval = this.REFRESH_INTERVAL;
-        this.refreshing = false;
+        this._serviceUri = null;
+        this._accessRoute = null;
+        this._errorRoute = null;
         this._loginInfo = null;
-        this._serviceUri = "https://clipper.arsedizioni.it";
         this.loggedIn = signal(false);
         this.loggingIn = signal(false);
         this.snapshot = signal(null);
@@ -1886,13 +1871,29 @@ class ClipperService {
         });
         this.visible = signal(false);
         this.supportsRS = signal(false);
-        this.initialize();
     }
-    ngOnDestroy() {
-        // Clean-up
-        if (this.tokenRefreshTimerSubscription) {
-            this.tokenRefreshTimerSubscription.unsubscribe();
+    get serviceUri() {
+        return this._serviceUri;
+    }
+    get accessRoute() {
+        return this._accessRoute;
+    }
+    get errorRoute() {
+        return this._errorRoute;
+    }
+    get loginInfo() {
+        if (!this._loginInfo) {
+            const loginInfo = localStorage.getItem('clipper_login');
+            if (loginInfo) {
+                try {
+                    this._loginInfo = JSON.parse(loginInfo);
+                }
+                catch { }
+            }
         }
+        return this._loginInfo;
+    }
+    ngOnDestroy() {
         if (this.broadcastServiceSubscription) {
             this.broadcastServiceSubscription.unsubscribe();
         }
@@ -1900,16 +1901,18 @@ class ClipperService {
     /**
      * Initialize service
      * @param serviceUri : the service uri
-     * @param tokenRefreshInterval : the token refresh interval
+     * @param accessRoute : the login route
+     * @param errorRoute : the optional route to navigate in case of 403 error
      */
-    initialize(serviceUri = null, tokenRefreshInterval = this.REFRESH_INTERVAL) {
+    initialize(serviceUri, accessRoute = "/login", errorRoute = null) {
         // Create unique client id
         if (!localStorage.getItem('clipper_client_id')) {
             localStorage.setItem('clipper_client_id', SystemUtils.generateUUID());
         }
         // Initialize
         this._serviceUri = serviceUri;
-        this.tokenRefreshInterval = tokenRefreshInterval;
+        this._accessRoute = accessRoute;
+        this._errorRoute = errorRoute;
         // React to message broadcasting
         if (!this.broadcastServiceSubscription) {
             this.broadcastServiceSubscription = this.broadcastService.getMessage().subscribe(message => {
@@ -1947,49 +1950,16 @@ class ClipperService {
         if (!this.loggedIn() && this.getToken()) {
             // Auto login
             this.loggedIn.set(true);
-            // Start refresh timer
-            this.enableTokenRefresh();
-        }
-    }
-    /**
-     * Set JWT token
-     * @param token : token
-     */
-    setToken(token) {
-        //console.log(new Date().toString() + " - token:" + token.substring(token.length - 15));
-        sessionStorage.setItem('clipper_jwt', token);
-        if (token) {
-            this.enableTokenRefresh();
         }
     }
     /**
    * Set JWT tokens
-   * @param valur : token
+   * @param value : the login result
    */
-    setToken2(value) {
+    setToken(value) {
         sessionStorage.setItem('clipper_jwt', value.token);
         sessionStorage.setItem('clipper_jwt_refresh', value.refreshToken);
     }
-    /**
-   * Enable JWT token auto refresh
-   */
-    enableTokenRefresh() {
-        if (!this.tokenRefreshTimerSubscription) {
-            this.tokenRefreshTimer =
-                timer(this.tokenRefreshInterval, this.tokenRefreshInterval)
-                    .pipe(switchMap(() => {
-                    if (this.refreshing || !this.loggedIn())
-                        return EMPTY;
-                    this.refreshing = true;
-                    this.refresh().subscribe({
-                        error: () => { this.refreshing = false; },
-                        complete: () => { this.refreshing = false; }
-                    });
-                    return EMPTY;
-                }), shareReplay(1));
-            this.tokenRefreshTimerSubscription = this.tokenRefreshTimer.subscribe();
-        }
-    }
     /**
      * Return current JWT token
      * @param refresh: true to get the refresh token. Default is false.
@@ -2011,60 +1981,6 @@ class ClipperService {
      * @returns: the login result
      */
     login(email = null, password = null, remember = false, oauth = null, oauthAccessToken = null) {
-        this.clear();
-        this.loggingIn.set(true);
-        return this.httpClient
-            .post(this._serviceUri + '/login', {
-            user: oauth ? null : email,
-            password: oauth ? null : password,
-            clientId: localStorage.getItem("clipper_client_id"),
-            OAUTH: oauth
-        }, {
-            headers: !oauth
-                ? new HttpHeaders()
-                : new HttpHeaders()
-                    .set("Authorization", oauthAccessToken)
-        })
-            .pipe(catchError(err => {
-            this.loggingIn.set(false);
-            localStorage.removeItem('clipper_login');
-            return throwError(() => err);
-        }), map(r => {
-            this.loggingIn.set(false);
-            if (r.success) {
-                // Store access token
-                this.setToken(r.value.token);
-                const loginInfo = {
-                    context: r.value.context,
-                    userSettings: r.value.settings,
-                    OAUTH: oauth
-                };
-                if (!oauth) {
-                    loginInfo.userCredentials =
-                        SystemUtils.cipher(JSON.stringify({
-                            email: email,
-                            password: password,
-                            remember: remember,
-                        }), loginInfo.context.userId.toString());
-                }
-                // Update info
-                localStorage.setItem('clipper_login', JSON.stringify(loginInfo));
-                this._loginInfo = loginInfo;
-                this.loggedIn.set(true);
-            }
-            return r;
-        }));
-    }
-    /**
-     * Perform login
-     * @param email: the optioanl email if using OAuth2
-     * @parma password: the optional password if using OAuth2
-     * @param remember: remember credentials
-     * @param oauth: the optional open authentication supported
-     * @param oauthAccessToken: the optional OAuth2 access token
-     * @returns: the login result
-     */
-    login2(email = null, password = null, remember = false, oauth = null, oauthAccessToken = null) {
         this.clear();
         this.loggingIn.set(true);
         return this.httpClient
@@ -2087,7 +2003,7 @@ class ClipperService {
             this.loggingIn.set(false);
             if (r.success) {
                 // Store access token
-                this.setToken2(r.value);
+                this.setToken(r.value);
                 const loginInfo = {
                     context: r.value.context,
                     userSettings: r.value.settings,
@@ -2125,12 +2041,6 @@ class ClipperService {
    * Reset login refresh timer and login state
    */
     reset() {
-        // Clear subscriptions
-        if (this.tokenRefreshTimerSubscription) {
-            this.tokenRefreshTimerSubscription.unsubscribe();
-            this.tokenRefreshTimerSubscription = null;
-        }
-        this.tokenRefreshTimer = null;
         // Clear login info
         this._loginInfo = null;
         // Logged out
@@ -2148,22 +2058,13 @@ class ClipperService {
         // Reset login
         this.reset();
     }
-    /**
-     * Perform token refresh
-     */
-    refresh() {
-        return this.httpClient.post(this._serviceUri + '/refresh', {}).pipe(map(r => {
-            // Update token
-            this.setToken(r.value.token);
-        }));
-    }
     /**
    * Perform token refresh
    */
-    refresh2() {
+    refresh() {
         return this.httpClient.get(this._serviceUri + '/refresh2/?token=' + this.getToken(true)).pipe(map(r => {
             // Update token
-            this.setToken2(r.value);
+            this.setToken(r.value);
         }));
     }
     /**
@@ -2189,7 +2090,10 @@ class ClipperService {
      * Get facets for a query
      */
     queryFacets(params) {
-        return this.httpClient.post(this._serviceUri + '/documents/facets', params);
+        return this.httpClient.post(params.model === ClipperModel.Coordinamento ||
+            (params.models?.length === 1 && params.models[0] === ClipperModel.Coordinamento)
+            ? this._serviceUri + '/documents/changes/facets'
+            : this._serviceUri + '/documents/facets', params);
     }
     /**
     * Update document state
@@ -2501,49 +2405,49 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.3", ngImpor
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: () => [] });
+        }] });
 
 class ClipperAuthInterceptor {
     constructor() {
         this.clipperService = inject(ClipperService);
         this.dialogService = inject(DialogService);
+        this.router = inject(Router);
     }
     intercept(request, next) {
         if (request.url.startsWith(this.clipperService.serviceUri)) {
             request = request.clone({ withCredentials: true });
             return next.handle(this.addTokenToRequest(request))
-                .pipe(catchError$1((err) => {
-                // Get the message
-                let message = err.error?.message || err.message || "Impossibile eseguire l'operazione richiesta.";
-                let invalidSession = err.status === 401;
-                switch (err.status) {
-                    case 0:
-                    case 500:
-                    case 502:
-                    case 503:
-                    case 504:
-                        message = null; // No messages
-                        break;
-                    case 403:
-                        message = "<p>Non hai i permessi necessari per eseguire l'operazione richiesta.</p>";
-                        break;
-                    default:
-                        message = '<p>' + message.replaceAll('\r\n', '</p><p>') + '</p>';
-                        break;
+                .pipe(catchError$1(error => {
+                if (error instanceof HttpErrorResponse &&
+                    !request.url.includes(this.clipperService.accessRoute) &&
+                    error.status === 401) {
+                    return this.handle401Error(request, next);
                 }
-                // Display message
-                if (message) {
-                    setTimeout(() => {
-                        this.dialogService.error(message, null, 'Errore in Clipper', 'Ok', 500, invalidSession ? 5000 : null).afterClosed().subscribe(() => {
-                            if (invalidSession) {
-                                if (this.clipperService.loggedIn()) {
-                                    this.clipperService.reset();
-                                }
-                            }
-                        });
-                    }, 250);
+                // Show a message
+                this.dialogService.clearBusy();
+                this.dialogService.error('<p>' + (error.error?.message ?? error.message ?? "Impossibile eseguire l'operazione richiesta.").replaceAll('\r\n', '</p><p>') + '</p>', null, 'Errore in Clipper');
+                return throwError(() => error);
+            }));
+        }
+        return next.handle(request);
+    }
+    /**
+     * Handle 401 error
+     * @param request : the request
+     * @param next : the http handler
+     */
+    handle401Error(request, next) {
+        if (this.clipperService.loggedIn()) {
+            return this.clipperService.refresh().pipe(switchMap(() => {
+                return next.handle(this.addTokenToRequest(request));
+            }), catchError$1(error => {
+                if (error instanceof HttpErrorResponse && error.status === 403) {
+                    this.clipperService.clear();
+                    if (this.clipperService.errorRoute) {
+                        this.router.navigateByUrl(this.clipperService.errorRoute);
+                    }
                 }
-                return throwError(() => err);
+                return throwError(() => error);
             }));
         }
         return next.handle(request);