@smartbit4all/ng-client 3.3.215 → 3.3.216

package/fesm2020/smartbit4all-ng-client.mjs

@@ -9064,52 +9064,59 @@ class SmartErrorCatchingInterceptor {
         this.session = session;
         this.sessionErrorCodes = [
             {
-                code: "session.expired",
+                code: 'session.expired',
                 behaviour: SessionErrorBehaviour.REFRESH,
             },
             {
-                code: "session.refreshtoken.invalid",
+                code: 'session.refreshtoken.invalid',
                 behaviour: SessionErrorBehaviour.RESTART,
             },
             {
-                code: "session.badrequest.missingtoken",
+                code: 'session.badrequest.missingtoken',
                 behaviour: SessionErrorBehaviour.RESTART,
             },
             {
-                code: "session.security.nocontext",
+                code: 'session.security.nocontext',
                 behaviour: SessionErrorBehaviour.RESTART,
             },
             {
-                code: "session.invalidsessionuri",
+                code: 'session.invalidsessionuri',
                 behaviour: SessionErrorBehaviour.RESTART,
             },
             {
-                code: "session.notinitialized",
+                code: 'session.notinitialized',
                 behaviour: SessionErrorBehaviour.RESTART,
             },
             {
-                code: "session.viewcontext.missing",
+                code: 'session.viewcontext.missing',
                 behaviour: SessionErrorBehaviour.RESTART,
             },
         ];
     }
     intercept(request, next) {
-        return next.handle(request).pipe(catchError$1((error) => {
-            if (error.status === 400 && error.error.code) {
-                let sessionError = this.sessionErrorCodes.find((sessionError) => sessionError.code === error.error.code);
-                if (sessionError) {
-                    return this.resolveError(sessionError).pipe(switchMap(() => {
-                        this.session.headerParams.map((headerParam) => {
-                            request = request.clone({
-                                headers: request.headers.set(headerParam.headerName, headerParam.value),
-                            });
-                        });
-                        return next.handle(request);
-                    }));
-                }
+        return next
+            .handle(request)
+            .pipe(catchError$1((error) => this.handleError(error, request, next)));
+    }
+    handleError(error, request, next) {
+        if (this.isSessionError(error)) {
+            const sessionError = this.getSessionError(error);
+            if (sessionError) {
+                return this.resolveError(sessionError).pipe(switchMap((resolved) => {
+                    if (resolved && sessionError.behaviour !== SessionErrorBehaviour.RESTART) {
+                        return next.handle(this.updateRequestHeaders(request));
+                    }
+                    return throwError(() => error);
+                }));
             }
-            return throwError(error);
-        }));
+        }
+        return throwError(() => error);
+    }
+    isSessionError(error) {
+        return error.status === 400 && error.error.code != null;
+    }
+    getSessionError(error) {
+        return this.sessionErrorCodes.find((sessionError) => sessionError.code === error.error.code);
     }
     resolveError(sessionError) {
         if (sessionError.behaviour === SessionErrorBehaviour.RESTART) {
@@ -9117,6 +9124,14 @@ class SmartErrorCatchingInterceptor {
         }
         return from(this.session.refreshSession());
     }
+    updateRequestHeaders(request) {
+        this.session.headerParams.forEach((headerParam) => {
+            request = request.clone({
+                headers: request.headers.set(headerParam.headerName, headerParam.value),
+            });
+        });
+        return request;
+    }
 }
 SmartErrorCatchingInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartErrorCatchingInterceptor, deps: [{ token: SmartSessionService }], target: i0.ɵɵFactoryTarget.Injectable });
 SmartErrorCatchingInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartErrorCatchingInterceptor });