@arsedizioni/ars-utils 18.2.505 → 18.2.507
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/clipper.common/common/interceptors/auth.interceptor.mjs +19 -17
- package/esm2022/evolution.common/common/interceptors/auth.interceptor.mjs +1 -2
- package/esm2022/support.common/common/interceptors/auth.interceptor.mjs +19 -17
- package/esm2022/ui.application/ui/components/filter-bar/filter-bar.component.mjs +3 -3
- package/fesm2022/arsedizioni-ars-utils-clipper.common.mjs +18 -16
- package/fesm2022/arsedizioni-ars-utils-clipper.common.mjs.map +1 -1
- package/fesm2022/arsedizioni-ars-utils-evolution.common.mjs +0 -1
- package/fesm2022/arsedizioni-ars-utils-evolution.common.mjs.map +1 -1
- package/fesm2022/arsedizioni-ars-utils-support.common.mjs +18 -16
- package/fesm2022/arsedizioni-ars-utils-support.common.mjs.map +1 -1
- package/fesm2022/arsedizioni-ars-utils-ui.application.mjs +2 -2
- package/fesm2022/arsedizioni-ars-utils-ui.application.mjs.map +1 -1
- package/package.json +11 -11
|
@@ -19,22 +19,24 @@ export class ClipperAuthInterceptor {
|
|
|
19
19
|
request = request.clone({ withCredentials: true });
|
|
20
20
|
return next.handle(this.addTokenToRequest(request))
|
|
21
21
|
.pipe(finalize(() => this.dialogService.clearBusy()), catchError(error => {
|
|
22
|
-
if (error
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
this.lastErrorTime
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
22
|
+
if (error.url.startsWith(this.clipperService.serviceUri)) {
|
|
23
|
+
if (error instanceof HttpErrorResponse &&
|
|
24
|
+
!request.url.includes("/login") &&
|
|
25
|
+
error.status === 401) {
|
|
26
|
+
return this.handle401Error(request, next);
|
|
27
|
+
}
|
|
28
|
+
const errorStatus = parseInt(error.status ?? "0");
|
|
29
|
+
if ((errorStatus > 0 && errorStatus < 500) || (this.clipperService.flags & ClipperServiceFlags.NotifySystemErrors) > 0) {
|
|
30
|
+
const errorTime = new Date().getTime();
|
|
31
|
+
if (errorTime - this.lastErrorTime > 5000) {
|
|
32
|
+
this.lastErrorTime = errorTime;
|
|
33
|
+
const invalidSession = errorStatus === 403;
|
|
34
|
+
this.dialogService.error("<p>" + (error.error?.message ?? error.message ?? "Impossibile eseguire l'operazione richiesta.").replaceAll("\r\n", "</p><p>") + "</p>", null, "Errore in Clipper", undefined, undefined, invalidSession ? 5000 : 15000).afterClosed().subscribe(() => {
|
|
35
|
+
if (invalidSession) {
|
|
36
|
+
this.broadcastService.sendMessage(ClipperMessages.LOGOUT);
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
}
|
|
38
40
|
}
|
|
39
41
|
}
|
|
40
42
|
return throwError(() => error);
|
|
@@ -83,4 +85,4 @@ export class ClipperAuthInterceptor {
|
|
|
83
85
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.4", ngImport: i0, type: ClipperAuthInterceptor, decorators: [{
|
|
84
86
|
type: Injectable
|
|
85
87
|
}] });
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.interceptor.js","sourceRoot":"","sources":["../../../../../../projects/ars-utils/clipper.common/common/interceptors/auth.interceptor.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';\r\nimport { Injectable, inject } from '@angular/core';\r\nimport { BroadcastService } from '@arsedizioni/ars-utils/core';\r\nimport { DialogService } from '@arsedizioni/ars-utils/ui';\r\nimport { Observable, catchError, finalize, switchMap, throwError } from 'rxjs';\r\nimport { ClipperServiceFlags } from '../definitions';\r\nimport { ClipperMessages } from '../messages';\r\nimport { ClipperService } from '../services/clipper.service';\r\n\r\n@Injectable()\r\nexport class ClipperAuthInterceptor implements HttpInterceptor {\r\n  private clipperService = inject(ClipperService);\r\n  private broadcastService = inject(BroadcastService);\r\n  private dialogService = inject(DialogService);\r\n  private lastErrorTime: number = -1;\r\n\r\n  intercept(\r\n    request: HttpRequest<any>,\r\n    next: HttpHandler\r\n  ): Observable<HttpEvent<any>> {\r\n    if (request.url.startsWith(this.clipperService.serviceUri)) {\r\n      request = request.clone({ withCredentials: true });\r\n      return next.handle(this.addTokenToRequest(request))\r\n        .pipe(\r\n          finalize(() => this.dialogService.clearBusy()),\r\n          catchError(error => {\r\n            if (error.url.startsWith(this.clipperService.serviceUri)) {\r\n              if (\r\n                error instanceof HttpErrorResponse &&\r\n                !request.url.includes(\"/login\") &&\r\n                error.status === 401\r\n              ) {\r\n                return this.handle401Error(request, next);\r\n              }\r\n              const errorStatus = parseInt(error.status ?? \"0\");\r\n              if ((errorStatus > 0 && errorStatus < 500) || (this.clipperService.flags & ClipperServiceFlags.NotifySystemErrors) > 0) {\r\n                const errorTime = new Date().getTime();\r\n                if (errorTime - this.lastErrorTime > 5000) {\r\n                  this.lastErrorTime = errorTime;\r\n                  const invalidSession = errorStatus === 403;\r\n                  this.dialogService.error(\r\n                    \"<p>\" + (error.error?.message ?? error.message ?? \"Impossibile eseguire l'operazione richiesta.\").replaceAll(\"\\r\\n\", \"</p><p>\") + \"</p>\",\r\n                    null,\r\n                    \"Errore in Clipper\",\r\n                    undefined,\r\n                    undefined,\r\n                    invalidSession ? 5000 : 15000).afterClosed().subscribe(() => {\r\n                      if (invalidSession) {\r\n                        this.broadcastService.sendMessage(ClipperMessages.LOGOUT);\r\n                      }\r\n                    });\r\n                }\r\n              }\r\n            }\r\n            return throwError(() => error);\r\n          }));\r\n    }\r\n    return next.handle(request);\r\n  }\r\n\r\n  /**\r\n   * Handle 401 error\r\n   * @param request : the request\r\n   * @param next : the http handler\r\n   */\r\n  private handle401Error(request: HttpRequest<any>, next: HttpHandler) {\r\n    if (this.clipperService.loggedIn()) {\r\n      return this.clipperService.refresh().pipe(\r\n        switchMap(() => {\r\n          return next.handle(this.addTokenToRequest(request));\r\n        }),\r\n        catchError(error => {\r\n          return throwError(() => error);\r\n        })\r\n      );\r\n    }\r\n    return next.handle(request);\r\n  }\r\n\r\n  /**\r\n   * Add token to request\r\n   * @param request : the request\r\n   * @param token: the token or null to use curre3nt\r\n   */\r\n  private addTokenToRequest(\r\n    request: HttpRequest<any>,\r\n    token: string | null = null\r\n  ): HttpRequest<any> {\r\n    if (request.url.startsWith(this.clipperService.serviceUri)) {\r\n      if (!token) token = this.clipperService.getToken();\r\n      if (token) {\r\n        return request.clone({\r\n          setHeaders: {\r\n            Authorization: 'Bearer ' + token,\r\n            'ngsw-bypass': 'ngsw-bypass'\r\n          },\r\n        });\r\n      }\r\n    }\r\n    return request;\r\n  }\r\n\r\n}\r\n"]}
|
|
@@ -63,7 +63,6 @@ export class EvolutionAuthInterceptor {
|
|
|
63
63
|
* @param token: the token or null to use curre3nt
|
|
64
64
|
*/
|
|
65
65
|
addTokenToRequest(request, token = null) {
|
|
66
|
-
console.log(this.evolutionService.serviceUri + " - " + request.url);
|
|
67
66
|
if (request.url.startsWith(this.evolutionService.serviceUri)) {
|
|
68
67
|
if (!token)
|
|
69
68
|
token = this.evolutionService.getToken();
|
|
@@ -84,4 +83,4 @@ export class EvolutionAuthInterceptor {
|
|
|
84
83
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.4", ngImport: i0, type: EvolutionAuthInterceptor, decorators: [{
|
|
85
84
|
type: Injectable
|
|
86
85
|
}] });
|
|
87
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
86
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.interceptor.js","sourceRoot":"","sources":["../../../../../../projects/ars-utils/evolution.common/common/interceptors/auth.interceptor.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';\r\nimport { Injectable, inject } from '@angular/core';\r\nimport { BroadcastService } from '@arsedizioni/ars-utils/core';\r\nimport { DialogService } from '@arsedizioni/ars-utils/ui';\r\nimport { Observable, catchError, finalize, switchMap, throwError } from 'rxjs';\r\nimport { EvolutionService } from '../services/evolution.service';\r\nimport { EvolutionMessages } from '../messages';\r\nimport { EvolutionServiceFlags } from '../definitions';\r\n\r\n\r\n@Injectable()\r\nexport class EvolutionAuthInterceptor implements HttpInterceptor {\r\n  private evolutionService = inject(EvolutionService);\r\n  private broadcastService = inject(BroadcastService);\r\n  private dialogService = inject(DialogService);\r\n  private lastErrorTime: number = -1;\r\n\r\n  intercept(\r\n    request: HttpRequest<any>,\r\n    next: HttpHandler\r\n  ): Observable<HttpEvent<any>> {\r\n    if (request.url.startsWith(this.evolutionService.serviceUri)) {\r\n      request = request.clone({ withCredentials: true });\r\n      return next.handle(this.addTokenToRequest(request))\r\n        .pipe(\r\n          finalize(() =>this.dialogService.clearBusy()),\r\n          catchError(error => {\r\n            if (\r\n              error instanceof HttpErrorResponse &&\r\n              !request.url.includes(\"/login\") &&\r\n              error.status === 401\r\n            ) {\r\n              return this.handle401Error(request, next);\r\n            }\r\n            const errorStatus = parseInt(error.status ?? \"0\");\r\n            if ((errorStatus > 0 && errorStatus < 500) || (this.evolutionService.flags & EvolutionServiceFlags.NotifySystemErrors) > 0) {\r\n              const errorTime = new Date().getTime();\r\n              if (errorTime - this.lastErrorTime > 5000) {\r\n                this.lastErrorTime = errorTime;\r\n                const invalidSession = errorStatus === 403;\r\n                this.dialogService.error(\r\n                  \"<p>\" + (error.error?.message ?? error.message ?? \"Impossibile eseguire l'operazione richiesta.\").replaceAll(\"\\r\\n\", \"</p><p>\") + \"</p>\",\r\n                  null,\r\n                  \"Errore in Evolution\",\r\n                  undefined,\r\n                  undefined,\r\n                  invalidSession ? 5000 : 15000).afterClosed().subscribe(() => {\r\n                    if (invalidSession) {\r\n                      this.broadcastService.sendMessage(EvolutionMessages.LOGOUT);\r\n                    }\r\n                  });\r\n              }\r\n            }\r\n            return throwError(() => error);\r\n          }));\r\n    }\r\n    return next.handle(request);\r\n  }\r\n\r\n  /**\r\n   * Handle 401 error\r\n   * @param request : the request\r\n   * @param next : the http handler\r\n   */\r\n  private handle401Error(request: HttpRequest<any>, next: HttpHandler) {\r\n    if (this.evolutionService.loggedIn()) {\r\n      return this.evolutionService.refresh().pipe(\r\n        switchMap(() => {\r\n          return next.handle(this.addTokenToRequest(request));\r\n        }),\r\n        catchError(error => {\r\n          return throwError(() => error);\r\n        })\r\n      );\r\n    }\r\n    return next.handle(request);\r\n  }\r\n\r\n  /**\r\n   * Add token to request\r\n   * @param request : the request\r\n   * @param token: the token or null to use curre3nt\r\n   */\r\n  private addTokenToRequest(\r\n    request: HttpRequest<any>,\r\n    token: string | null = null\r\n  ): HttpRequest<any> {\r\n    if (request.url.startsWith(this.evolutionService.serviceUri)) {\r\n      if (!token) token = this.evolutionService.getToken();\r\n      if (token) {\r\n        return request.clone({\r\n          setHeaders: {\r\n            Authorization: 'Bearer ' + token,\r\n            'ngsw-bypass': 'ngsw-bypass'\r\n          },\r\n        });\r\n      }\r\n    }\r\n    return request;\r\n  }\r\n\r\n}\r\n"]}
|
|
@@ -19,22 +19,24 @@ export class SupportAuthInterceptor {
|
|
|
19
19
|
request = request.clone({ withCredentials: true });
|
|
20
20
|
return next.handle(this.addTokenToRequest(request))
|
|
21
21
|
.pipe(finalize(() => this.dialogService.clearBusy()), catchError(error => {
|
|
22
|
-
if (error
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
this.lastErrorTime
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
22
|
+
if (error.url.startsWith(this.supportService.serviceUri)) {
|
|
23
|
+
if (error instanceof HttpErrorResponse &&
|
|
24
|
+
!request.url.includes("/login") &&
|
|
25
|
+
error.status === 401) {
|
|
26
|
+
return this.handle401Error(request, next);
|
|
27
|
+
}
|
|
28
|
+
const errorStatus = parseInt(error.status ?? "0");
|
|
29
|
+
if ((errorStatus > 0 && errorStatus < 500) || (this.supportService.flags & SupportServiceFlags.NotifySystemErrors) > 0) {
|
|
30
|
+
const errorTime = new Date().getTime();
|
|
31
|
+
if (errorTime - this.lastErrorTime > 5000) {
|
|
32
|
+
this.lastErrorTime = errorTime;
|
|
33
|
+
const invalidSession = errorStatus === 403;
|
|
34
|
+
this.dialogService.error("<p>" + (error.error?.message ?? error.message ?? "Impossibile eseguire l'operazione richiesta.").replaceAll("\r\n", "</p><p>") + "</p>", null, "Errore in ARS Support", undefined, undefined, invalidSession ? 5000 : 15000).afterClosed().subscribe(() => {
|
|
35
|
+
if (invalidSession) {
|
|
36
|
+
this.broadcastService.sendMessage(SupportMessages.LOGOUT);
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
}
|
|
38
40
|
}
|
|
39
41
|
}
|
|
40
42
|
return throwError(() => error);
|
|
@@ -83,4 +85,4 @@ export class SupportAuthInterceptor {
|
|
|
83
85
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.4", ngImport: i0, type: SupportAuthInterceptor, decorators: [{
|
|
84
86
|
type: Injectable
|
|
85
87
|
}] });
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.interceptor.js","sourceRoot":"","sources":["../../../../../../projects/ars-utils/support.common/common/interceptors/auth.interceptor.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';\r\nimport { Injectable, inject } from '@angular/core';\r\nimport { Observable, catchError, finalize, switchMap, throwError } from 'rxjs';\r\nimport { SupportService } from '../services/support.service';\r\nimport { DialogService } from '@arsedizioni/ars-utils/ui';\r\nimport { BroadcastService } from '@arsedizioni/ars-utils/core';\r\nimport { SupportMessages } from '../messages';\r\nimport { SupportServiceFlags } from '../definitions';\r\n\r\n@Injectable()\r\nexport class SupportAuthInterceptor implements HttpInterceptor {\r\n\r\n  private supportService = inject(SupportService);\r\n  private broadcastService = inject(BroadcastService);\r\n  private dialogService = inject(DialogService);\r\n  private lastErrorTime: number = -1;\r\n\r\n  intercept(\r\n    request: HttpRequest<any>,\r\n    next: HttpHandler\r\n  ): Observable<HttpEvent<any>> {\r\n    if (request.url.startsWith(this.supportService.serviceUri)) {\r\n      request = request.clone({ withCredentials: true });\r\n      return next.handle(this.addTokenToRequest(request))\r\n        .pipe(\r\n          finalize(() => this.dialogService.clearBusy()),\r\n          catchError(error => {\r\n            if (error.url.startsWith(this.supportService.serviceUri)) {\r\n              if (\r\n                error instanceof HttpErrorResponse &&\r\n                !request.url.includes(\"/login\") &&\r\n                error.status === 401\r\n              ) {\r\n                return this.handle401Error(request, next);\r\n              }\r\n              const errorStatus = parseInt(error.status ?? \"0\");\r\n              if ((errorStatus > 0 && errorStatus < 500) || (this.supportService.flags & SupportServiceFlags.NotifySystemErrors) > 0) {\r\n                const errorTime = new Date().getTime();\r\n                if (errorTime - this.lastErrorTime > 5000) {\r\n                  this.lastErrorTime = errorTime;\r\n                  const invalidSession = errorStatus === 403;\r\n                  this.dialogService.error(\r\n                    \"<p>\" + (error.error?.message ?? error.message ?? \"Impossibile eseguire l'operazione richiesta.\").replaceAll(\"\\r\\n\", \"</p><p>\") + \"</p>\",\r\n                    null,\r\n                    \"Errore in ARS Support\",\r\n                    undefined,\r\n                    undefined,\r\n                    invalidSession ? 5000 : 15000).afterClosed().subscribe(() => {\r\n                      if (invalidSession) {\r\n                        this.broadcastService.sendMessage(SupportMessages.LOGOUT);\r\n                      }\r\n                    });\r\n                }\r\n              }\r\n            }\r\n            return throwError(() => error);\r\n          }));\r\n    }\r\n    return next.handle(request);\r\n  }\r\n\r\n  /**\r\n * Handle 401 error\r\n * @param request : the request\r\n * @param next : the http handler\r\n */\r\n  private handle401Error(request: HttpRequest<any>, next: HttpHandler) {\r\n    if (this.supportService.loggedIn()) {\r\n      return this.supportService.refresh().pipe(\r\n        switchMap(() => {\r\n          return next.handle(this.addTokenToRequest(request));\r\n        }),\r\n        catchError(error => {\r\n          return throwError(() => error);\r\n        })\r\n      );\r\n    }\r\n    return next.handle(request);\r\n  }\r\n\r\n  /**\r\n   * Add token to request\r\n   * @param request : the request\r\n   * @param token: the token or null to use curre3nt\r\n   */\r\n  private addTokenToRequest(\r\n    request: HttpRequest<any>,\r\n    token: string = null\r\n  ): HttpRequest<any> {\r\n    if (request.url.startsWith(this.supportService.serviceUri)) {\r\n      if (!token) token = this.supportService.getToken();\r\n      if (token) {\r\n        return request.clone({\r\n          setHeaders: {\r\n            Authorization: 'Bearer ' + token,\r\n            'ngsw-bypass': 'ngsw-bypass'\r\n          },\r\n        });\r\n      }\r\n    }\r\n    return request;\r\n  }\r\n\r\n}\r\n"]}
|