@smartbit4all/ng-client 2.0.10 → 2.0.12

package/esm2020/lib/smart-client/smart.service.mjs

@@ -1,5 +1,5 @@
 import { Inject, Injectable } from '@angular/core';
-import { SmartAuthService } from './smart-authentication.service';
+import { SmartAuthService, } from './smart-authentication.service';
 import { SmartComponentApiClient } from './smart-component-api-client';
 import * as i0 from "@angular/core";
 export class SmartService extends SmartComponentApiClient {
@@ -12,6 +12,9 @@ export class SmartService extends SmartComponentApiClient {
     ngOnDestroy() {
         this._ngOnDestroy();
     }
+    ngAfterViewInit() {
+        this._ngAfterViewInit();
+    }
 }
 SmartService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartService, deps: [{ token: i0.Injector }, { token: SmartAuthService }, { token: 'pageName' }], target: i0.ɵɵFactoryTarget.Injectable });
 SmartService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartService, providedIn: 'root' });
@@ -27,4 +30,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImpor
                     type: Inject,
                     args: ['pageName']
                 }] }]; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnQuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3NtYXJ0LW5nLWNsaWVudC9zcmMvbGliL3NtYXJ0LWNsaWVudC9zbWFydC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUErQixNQUFNLGVBQWUsQ0FBQztBQUNoRixPQUFPLEVBQUUsZ0JBQWdCLEVBQXVDLE1BQU0sZ0NBQWdDLENBQUM7QUFDdkcsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sOEJBQThCLENBQUM7O0FBS3ZFLE1BQU0sT0FBZ0IsWUFBZ0IsU0FBUSx1QkFBMEI7SUFDdkUsWUFDQyxNQUFnQixFQUNVLElBQXlDLEVBQy9DLFFBQWdCO1FBRXBDLEtBQUssQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQy9CLENBQUM7SUFDRCxRQUFRO1FBQ1AsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO0lBQ2xCLENBQUM7SUFDRCxXQUFXO1FBQ1YsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQ3JCLENBQUM7O3lHQWJvQixZQUFZLDBDQUd4QixnQkFBZ0IsYUFDaEIsVUFBVTs2R0FKRSxZQUFZLGNBRnJCLE1BQU07MkZBRUcsWUFBWTtrQkFIakMsVUFBVTttQkFBQztvQkFDWCxVQUFVLEVBQUUsTUFBTTtpQkFDbEI7OzBCQUlFLE1BQU07MkJBQUMsZ0JBQWdCOzswQkFDdkIsTUFBTTsyQkFBQyxVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0LCBJbmplY3RhYmxlLCBJbmplY3RvciwgT25EZXN0cm95LCBPbkluaXQgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHsgU21hcnRBdXRoU2VydmljZSwgU21hcnRBdXRoZW50aWNhdGlvblNlcnZpY2VJbnRlcmZhY2UgfSBmcm9tICcuL3NtYXJ0LWF1dGhlbnRpY2F0aW9uLnNlcnZpY2UnO1xyXG5pbXBvcnQgeyBTbWFydENvbXBvbmVudEFwaUNsaWVudCB9IGZyb20gJy4vc21hcnQtY29tcG9uZW50LWFwaS1jbGllbnQnO1xyXG5cclxuQEluamVjdGFibGUoe1xyXG5cdHByb3ZpZGVkSW46ICdyb290JyxcclxufSlcclxuZXhwb3J0IGFic3RyYWN0IGNsYXNzIFNtYXJ0U2VydmljZTxUPiBleHRlbmRzIFNtYXJ0Q29tcG9uZW50QXBpQ2xpZW50PFQ+IGltcGxlbWVudHMgT25Jbml0LCBPbkRlc3Ryb3kge1xyXG5cdGNvbnN0cnVjdG9yKFxyXG5cdFx0aW5qZWN0OiBJbmplY3RvcixcclxuXHRcdEBJbmplY3QoU21hcnRBdXRoU2VydmljZSkgYXV0aDogU21hcnRBdXRoZW50aWNhdGlvblNlcnZpY2VJbnRlcmZhY2UsXHJcblx0XHRASW5qZWN0KCdwYWdlTmFtZScpIHBhZ2VOYW1lOiBzdHJpbmdcclxuXHQpIHtcclxuXHRcdHN1cGVyKGluamVjdCwgYXV0aCwgcGFnZU5hbWUpO1xyXG5cdH1cclxuXHRuZ09uSW5pdCgpOiB2b2lkIHtcclxuXHRcdHRoaXMuX25nT25Jbml0KCk7XHJcblx0fVxyXG5cdG5nT25EZXN0cm95KCk6IHZvaWQge1xyXG5cdFx0dGhpcy5fbmdPbkRlc3Ryb3koKTtcclxuXHR9XHJcbn1cclxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnQuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3NtYXJ0LW5nLWNsaWVudC9zcmMvbGliL3NtYXJ0LWNsaWVudC9zbWFydC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBaUIsTUFBTSxFQUFFLFVBQVUsRUFBK0IsTUFBTSxlQUFlLENBQUM7QUFDL0YsT0FBTyxFQUNMLGdCQUFnQixHQUVqQixNQUFNLGdDQUFnQyxDQUFDO0FBQ3hDLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDOztBQUt2RSxNQUFNLE9BQWdCLFlBQ3BCLFNBQVEsdUJBQTBCO0lBR2xDLFlBQ0UsTUFBZ0IsRUFDVSxJQUF5QyxFQUMvQyxRQUFnQjtRQUVwQyxLQUFLLENBQUMsTUFBTSxFQUFFLElBQUksRUFBRSxRQUFRLENBQUMsQ0FBQztJQUNoQyxDQUFDO0lBQ0QsUUFBUTtRQUNOLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztJQUNuQixDQUFDO0lBQ0QsV0FBVztRQUNULElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztJQUN0QixDQUFDO0lBRUQsZUFBZTtRQUNiLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO0lBQzFCLENBQUM7O3lHQXBCbUIsWUFBWSwwQ0FNdEIsZ0JBQWdCLGFBQ2hCLFVBQVU7NkdBUEEsWUFBWSxjQUZwQixNQUFNOzJGQUVFLFlBQVk7a0JBSGpDLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25COzswQkFPSSxNQUFNOzJCQUFDLGdCQUFnQjs7MEJBQ3ZCLE1BQU07MkJBQUMsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFmdGVyVmlld0luaXQsIEluamVjdCwgSW5qZWN0YWJsZSwgSW5qZWN0b3IsIE9uRGVzdHJveSwgT25Jbml0IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcbmltcG9ydCB7XHJcbiAgU21hcnRBdXRoU2VydmljZSxcclxuICBTbWFydEF1dGhlbnRpY2F0aW9uU2VydmljZUludGVyZmFjZSxcclxufSBmcm9tICcuL3NtYXJ0LWF1dGhlbnRpY2F0aW9uLnNlcnZpY2UnO1xyXG5pbXBvcnQgeyBTbWFydENvbXBvbmVudEFwaUNsaWVudCB9IGZyb20gJy4vc21hcnQtY29tcG9uZW50LWFwaS1jbGllbnQnO1xyXG5cclxuQEluamVjdGFibGUoe1xyXG4gIHByb3ZpZGVkSW46ICdyb290JyxcclxufSlcclxuZXhwb3J0IGFic3RyYWN0IGNsYXNzIFNtYXJ0U2VydmljZTxUPlxyXG4gIGV4dGVuZHMgU21hcnRDb21wb25lbnRBcGlDbGllbnQ8VD5cclxuICBpbXBsZW1lbnRzIE9uSW5pdCwgT25EZXN0cm95LCBBZnRlclZpZXdJbml0XHJcbntcclxuICBjb25zdHJ1Y3RvcihcclxuICAgIGluamVjdDogSW5qZWN0b3IsXHJcbiAgICBASW5qZWN0KFNtYXJ0QXV0aFNlcnZpY2UpIGF1dGg6IFNtYXJ0QXV0aGVudGljYXRpb25TZXJ2aWNlSW50ZXJmYWNlLFxyXG4gICAgQEluamVjdCgncGFnZU5hbWUnKSBwYWdlTmFtZTogc3RyaW5nXHJcbiAgKSB7XHJcbiAgICBzdXBlcihpbmplY3QsIGF1dGgsIHBhZ2VOYW1lKTtcclxuICB9XHJcbiAgbmdPbkluaXQoKTogdm9pZCB7XHJcbiAgICB0aGlzLl9uZ09uSW5pdCgpO1xyXG4gIH1cclxuICBuZ09uRGVzdHJveSgpOiB2b2lkIHtcclxuICAgIHRoaXMuX25nT25EZXN0cm95KCk7XHJcbiAgfVxyXG5cclxuICBuZ0FmdGVyVmlld0luaXQoKTogdm9pZCB7XHJcbiAgICB0aGlzLl9uZ0FmdGVyVmlld0luaXQoKTtcclxuICB9XHJcbn1cclxuIl19

package/fesm2015/smartbit4all-ng-client.mjs

@@ -1,10 +1,10 @@
 import * as i0 from '@angular/core';
-import { InjectionToken, Injectable, Optional, Inject, PLATFORM_ID, NgModule, SkipSelf, Component, Pipe, CUSTOM_ELEMENTS_SCHEMA, ViewChild, Input, ViewChildren } from '@angular/core';
+import { InjectionToken, Injectable, Optional, Inject, PLATFORM_ID, NgModule, SkipSelf, Component, Pipe, CUSTOM_ELEMENTS_SCHEMA, ViewChild, Input, ViewChildren, ChangeDetectorRef } from '@angular/core';
 import { __awaiter, __decorate, __param } from 'tslib';
-import { Subject, takeUntil, map, catchError, throwError, from } from 'rxjs';
-import { SmartSubject } from '@smartbit4all/subject';
 import * as i1 from '@angular/common/http';
-import { HttpHeaders, HttpContext, HttpParams, HttpEventType, HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
+import { HttpHeaders, HttpContext, HttpErrorResponse, HttpParams, HttpEventType, HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
+import { Subject, lastValueFrom, takeUntil, map, catchError, throwError, from } from 'rxjs';
+import { SmartSubject } from '@smartbit4all/subject';
 import * as i4 from '@angular/common';
 import { isPlatformBrowser, DOCUMENT, DatePipe, CommonModule } from '@angular/common';
 import * as i2 from '@angular/material/button';
@@ -711,7 +711,7 @@ class SmartSessionService {
     handleSessionError(sessionError) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.sessionHandlerService) {
-                yield this.sessionHandlerService.handleSessionError(sessionError);
+                return yield this.sessionHandlerService.handleSessionError(sessionError);
             }
             throw new Error(`sessionHandlerService was not initialized. Error: ${sessionError.code}`);
         });
@@ -810,11 +810,7 @@ class SmartSessionService {
         return __awaiter(this, void 0, void 0, function* () {
             let sessionInfo = yield 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;
         });
@@ -837,28 +833,36 @@ class SmartSessionService {
             if (!refreshToken) {
                 return yield this.startSession();
             }
-            let sessionInfo = yield this.apiService
-                .refreshSession({
-                refreshToken,
-            })
-                .toPromise()
-                .catch((error) => __awaiter(this, void 0, void 0, function* () {
-                if (error.error &&
-                    error.error.code &&
-                    error.error.code === 'session.refreshtoken.invalid') {
-                    yield this.startSession();
+            try {
+                const sessionInfo = yield 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');
+    }
     getAuthenticationProviders() {
         return __awaiter(this, void 0, void 0, function* () {
             let providers = yield this.apiService
@@ -3233,52 +3237,68 @@ 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.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 === null || resolveSessionError === void 0 ? void 0 : resolveSessionError.behaviour) === SessionErrorBehaviour.RESTART) {
+                            return throwError(() => error);
+                        }
+                    }
+                    return throwError(() => resolveError);
+                }));
             }
-            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) {
@@ -3286,6 +3306,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 });
@@ -5970,8 +5998,13 @@ let SmartComponentApiClient = class SmartComponentApiClient {
         this._destroy$.next();
         this._destroy$.complete();
     }
+    _ngAfterViewInit() {
+        this.changeDetector = this.inject.get(ChangeDetectorRef);
+    }
     initComponentByModel() {
+        var _a;
         this.initData();
+        (_a = this.changeDetector) === null || _a === void 0 ? void 0 : _a.detectChanges();
         this.initActions();
         // TODO: layout, valueSet, widgets
     }
@@ -6255,6 +6288,9 @@ class SmartComponent extends SmartComponentApiClient {
     ngOnDestroy() {
         this._ngOnDestroy();
     }
+    ngAfterViewInit() {
+        this._ngAfterViewInit();
+    }
 }
 SmartComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartComponent, deps: [{ token: i0.Injector }, { token: SmartAuthService }, { token: 'pageName' }], target: i0.ɵɵFactoryTarget.Component });
 SmartComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.4.0", type: SmartComponent, selector: "ng-component", usesInheritance: true, ngImport: i0, template: '', isInline: true });
@@ -6283,6 +6319,9 @@ class SmartService extends SmartComponentApiClient {
     ngOnDestroy() {
         this._ngOnDestroy();
     }
+    ngAfterViewInit() {
+        this._ngAfterViewInit();
+    }
 }
 SmartService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartService, deps: [{ token: i0.Injector }, { token: SmartAuthService }, { token: 'pageName' }], target: i0.ɵɵFactoryTarget.Injectable });
 SmartService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartService, providedIn: 'root' });