@arsedizioni/ars-utils 19.3.13 → 19.3.14

package/clipper.common/common/interceptors/auth.interceptor.d.ts

@@ -4,7 +4,6 @@ import * as i0 from "@angular/core";
 export declare class ClipperAuthInterceptor implements HttpInterceptor {
     private clipperService;
     private broadcastService;
-    private dialogService;
     private lastErrorTime;
     intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>>;
     /**

package/core/core.module.d.ts

@@ -15,6 +15,7 @@ export declare class ArsCoreModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<ArsCoreModule>;
 }
 export * from './definitions';
+export * from './messages';
 export * from './selectable';
 export * from './services/broadcast.service';
 export * from './services/environment.service';

package/core/definitions.d.ts

@@ -36,6 +36,12 @@ export declare class FileInfo implements Validated {
     valid: boolean;
     isValid(): boolean;
 }
+export interface ErrorInfo {
+    invalidateSession?: boolean;
+    title?: string;
+    message?: string;
+    errorStatus?: number;
+}
 export interface NameValueItem<T> {
     name: string;
     value: T;

package/core/messages.d.ts

@@ -0,0 +1,7 @@
+export declare const UtilsMessages: {
+    /**
+     * Messages
+     */
+    UTILS_ERROR_MESSAGE: string;
+    UTILS_DIALOGS_SELECT_OPTIONS_CHANGED: string;
+};

package/evolution.common/common/interceptors/auth.interceptor.d.ts

@@ -4,7 +4,6 @@ import * as i0 from "@angular/core";
 export declare class EvolutionAuthInterceptor implements HttpInterceptor {
     private evolutionService;
     private broadcastService;
-    private dialogService;
     private lastErrorTime;
     intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>>;
     /**

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

@@ -1,9 +1,9 @@
 import * as i0 from '@angular/core';
 import { signal, computed, inject, Injectable, NgModule } from '@angular/core';
 import { HttpClient, HttpHeaders, HttpRequest, HttpErrorResponse } from '@angular/common/http';
-import { BroadcastService, SystemUtils } from '@arsedizioni/ars-utils/core';
+import { BroadcastService, SystemUtils, UtilsMessages } from '@arsedizioni/ars-utils/core';
+import { EMPTY, throwError, of, catchError as catchError$1, switchMap } from 'rxjs';
 import { DialogService } from '@arsedizioni/ars-utils/ui';
-import { EMPTY, throwError, of, finalize as finalize$1, catchError as catchError$1, switchMap } from 'rxjs';
 import { catchError, map, finalize } from 'rxjs/operators';
 
 const ClipperMessages = {
@@ -3187,14 +3187,13 @@ class ClipperAuthInterceptor {
     constructor() {
         this.clipperService = inject(ClipperService);
         this.broadcastService = inject(BroadcastService);
-        this.dialogService = inject(DialogService);
         this.lastErrorTime = -1;
     }
     intercept(request, next) {
         if (request.url.startsWith(this.clipperService.serviceUri)) {
             request = request.clone({ withCredentials: true });
             return next.handle(this.addTokenToRequest(request))
-                .pipe(finalize$1(() => this.dialogService.clearBusy()), catchError$1(error => {
+                .pipe(catchError$1(error => {
                 if (error.url.startsWith(this.clipperService.serviceUri)) {
                     if (error instanceof HttpErrorResponse &&
                         error.status === 401 &&
@@ -3218,11 +3217,11 @@ class ClipperAuthInterceptor {
                                     message = (error.error?.message ?? error.message ?? "Impossibile eseguire l'operazione richiesta.").replaceAll("\r\n", "</p><p>");
                                     break;
                             }
-                            const invalidSession = errorStatus === 405 || errorStatus === 410;
-                            this.dialogService.error("<p>" + message + "</p>", null, "Errore in Clipper", undefined, undefined, invalidSession ? 5000 : 15000).afterClosed().subscribe(() => {
-                                if (invalidSession) {
-                                    this.broadcastService.sendMessage(ClipperMessages.LOGOUT);
-                                }
+                            this.broadcastService.sendMessage(UtilsMessages.UTILS_ERROR_MESSAGE, {
+                                invalidateSession: errorStatus === 405 || errorStatus === 410,
+                                message: message,
+                                title: "Errore in Clipper",
+                                errorStatus: errorStatus
                             });
                         }
                     }