@smartbit4all/ng-client 3.3.216 → 3.3.217

package/fesm2020/smartbit4all-ng-client.mjs

@@ -1,8 +1,8 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, Injectable, Optional, Inject, PLATFORM_ID, NgModule, SkipSelf, Component, RendererStyleFlags2, Input, Directive, HostBinding, HostListener, ViewChild, forwardRef, EventEmitter, Output, Pipe, ViewContainerRef, ViewEncapsulation, ChangeDetectionStrategy, ViewChildren, CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA, ChangeDetectorRef } from '@angular/core';
-import { Subject, takeUntil, startWith, map, distinctUntilChanged, catchError, throwError, from, lastValueFrom } from 'rxjs';
 import * as i1 from '@angular/common/http';
-import { HttpHeaders, HttpContext, HttpParams, HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HttpHeaders, HttpContext, HttpErrorResponse, HttpParams, HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { Subject, lastValueFrom, takeUntil, startWith, map, distinctUntilChanged, catchError, throwError, from } from 'rxjs';
 import * as i3 from '@angular/common';
 import { isPlatformBrowser, DOCUMENT, DatePipe, CommonModule } from '@angular/common';
 import * as i2 from '@angular/material/button';
@@ -829,7 +829,7 @@ class SmartSessionService {
     }
     async handleSessionError(sessionError) {
         if (this.sessionHandlerService) {
-            await this.sessionHandlerService.handleSessionError(sessionError);
+            return await this.sessionHandlerService.handleSessionError(sessionError);
         }
         throw new Error(`sessionHandlerService was not initialized. Error: ${sessionError.code}`);
     }
@@ -924,11 +924,7 @@ class SmartSessionService {
     async startSession() {
         let sessionInfo = await this.apiService.startSession().toPromise();
         if (sessionInfo) {
-            this.sessionInfoData = sessionInfo;
-            this.token = sessionInfo.sid;
-            this.saveTokenToLocalStorage();
-            this.setAuthenticationStatus();
-            this.setUpTokenForSessionService();
+            this.updateSessionInfo(sessionInfo);
         }
         return this.sessionInfoData;
     }
@@ -947,26 +943,34 @@ class SmartSessionService {
         if (!refreshToken) {
             return await this.startSession();
         }
-        let sessionInfo = await this.apiService
-            .refreshSession({
-            refreshToken,
-        })
-            .toPromise()
-            .catch(async (error) => {
-            if (error.error &&
-                error.error.code &&
-                error.error.code === 'session.refreshtoken.invalid') {
-                await this.startSession();
+        try {
+            const sessionInfo = await lastValueFrom(this.apiService.refreshSession({ refreshToken }));
+            if (sessionInfo) {
+                this.updateSessionInfo(sessionInfo);
+                return sessionInfo;
             }
-        });
-        if (sessionInfo) {
-            this.sessionInfoData = sessionInfo;
-            this.token = sessionInfo.sid;
-            this.saveTokenToLocalStorage();
-            this.setAuthenticationStatus();
-            this.setUpTokenForSessionService();
         }
-        return this.sessionInfoData;
+        catch (error) {
+            if (this.isInvalidRefreshTokenError(error)) {
+                this.clearAndStartNewSession();
+                // still throw the error, so the error can be handled in the caller
+            }
+            throw error;
+        }
+        // no sessionInfo returned
+        throw new Error('Unable to refresh session');
+    }
+    updateSessionInfo(sessionInfo) {
+        this.sessionInfoData = sessionInfo;
+        this.token = sessionInfo.sid;
+        this.saveTokenToLocalStorage();
+        this.setAuthenticationStatus();
+        this.setUpTokenForSessionService();
+    }
+    isInvalidRefreshTokenError(error) {
+        return (error instanceof HttpErrorResponse &&
+            error.error &&
+            error.error.code === 'session.refreshtoken.invalid');
     }
     async getAuthenticationProviders() {
         let providers = await this.apiService
@@ -9103,10 +9107,19 @@ class SmartErrorCatchingInterceptor {
             const sessionError = this.getSessionError(error);
             if (sessionError) {
                 return this.resolveError(sessionError).pipe(switchMap((resolved) => {
-                    if (resolved && sessionError.behaviour !== SessionErrorBehaviour.RESTART) {
+                    if (resolved && sessionError.behaviour === SessionErrorBehaviour.REFRESH) {
                         return next.handle(this.updateRequestHeaders(request));
                     }
                     return throwError(() => error);
+                }), catchError$1((resolveError) => {
+                    // when the resolveError throws a restart error (in the refreshSession), rethrow the original error
+                    if (this.isSessionError(resolveError)) {
+                        const resolveSessionError = this.getSessionError(resolveError);
+                        if (resolveSessionError?.behaviour === SessionErrorBehaviour.RESTART) {
+                            return throwError(() => error);
+                        }
+                    }
+                    return throwError(() => resolveError);
                 }));
             }
         }