ngx-vector-components 4.11.0 → 4.11.1

package/fesm2020/ngx-vector-components.mjs

@@ -53,7 +53,7 @@ import * as i2$2 from 'primeng/api';
 import { DateTime } from 'luxon';
 import * as i1$2 from '@angular/common/http';
 import { HttpHeaders, HttpClient, HttpResponse } from '@angular/common/http';
-import { tap, map, debounceTime, catchError, switchMap, filter, take } from 'rxjs/operators';
+import { tap, map, debounceTime, switchMap, catchError, filter, take } from 'rxjs/operators';
 import * as i1$3 from '@ngx-translate/core';
 import * as i1$b from 'primeng/accordion';
 import { AccordionModule } from 'primeng/accordion';
@@ -1285,7 +1285,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.3", ngImpor
         }] });
 
 class StorageService {
-    constructor() { }
+    constructor(http) {
+        this.http = http;
+    }
     clear() {
         sessionStorage.clear();
         localStorage.clear();
@@ -1351,7 +1353,7 @@ class StorageService {
         sessionStorage.removeItem('username');
     }
     getUserId() {
-        const userId = sessionStorage.getItem('userId') || '';
+        const userId = sessionStorage.getItem('userId');
         return userId ? +atob(userId) : 0;
     }
     setUserId(userId) {
@@ -1380,12 +1382,12 @@ class StorageService {
         sessionStorage.removeItem('profile');
     }
 }
-StorageService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: StorageService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+StorageService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: StorageService, deps: [{ token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
 StorageService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: StorageService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: StorageService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
-        }], ctorParameters: function () { return []; } });
+        }], ctorParameters: function () { return [{ type: i1$2.HttpClient }]; } });
 
 class ProfileService {
     constructor(http, storageService) {
@@ -1467,6 +1469,9 @@ class ProfileService {
         }
         return false;
     }
+    getUserInfo() {
+        return this.http.get(`connect/userinfo`);
+    }
 }
 ProfileService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: ProfileService, deps: [{ token: i1$2.HttpClient }, { token: StorageService }], target: i0.ɵɵFactoryTarget.Injectable });
 ProfileService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: ProfileService, providedIn: 'root' });
@@ -3588,10 +3593,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.3", ngImpor
         }], ctorParameters: function () { return [{ type: i0.Injector }]; } });
 
 class GetTokenByGuidGuard {
-    constructor(authService, storageService, router, appName) {
+    constructor(authService, storageService, router, profileService, appName) {
         this.authService = authService;
         this.storageService = storageService;
         this.router = router;
+        this.profileService = profileService;
         this.appName = appName;
     }
     canActivate(route) {
@@ -3602,11 +3608,16 @@ class GetTokenByGuidGuard {
             this.storageService.clear();
             this.storageService.setRole(route.queryParams['role']);
             this.storageService.setUserId(route.queryParams['userId']);
-            return this.authService.getTokenByGuid(paramTokenGuid).pipe(map((token) => {
+            return this.authService.getTokenByGuid(paramTokenGuid).pipe(switchMap((token) => {
                 if (token && role !== Role.ADMIN) {
-                    return this.router.createUrlTree([this.appName.toLowerCase()]);
+                    this.router.createUrlTree([this.appName.toLowerCase()]);
                 }
-                return true;
+                return this.profileService.getUserInfo().pipe(map((response) => {
+                    if (response.id) {
+                        this.storageService.setUserId(response.id);
+                    }
+                    return true;
+                }));
             }));
         }
         else if (this.storageService.getToken()) {
@@ -3619,11 +3630,11 @@ class GetTokenByGuidGuard {
         return false;
     }
 }
-GetTokenByGuidGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: GetTokenByGuidGuard, deps: [{ token: AuthService }, { token: StorageService }, { token: i2$1.Router }, { token: 'appName' }], target: i0.ɵɵFactoryTarget.Injectable });
+GetTokenByGuidGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: GetTokenByGuidGuard, deps: [{ token: AuthService }, { token: StorageService }, { token: i2$1.Router }, { token: ProfileService }, { token: 'appName' }], target: i0.ɵɵFactoryTarget.Injectable });
 GetTokenByGuidGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: GetTokenByGuidGuard });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: GetTokenByGuidGuard, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: AuthService }, { type: StorageService }, { type: i2$1.Router }, { type: AppName, decorators: [{
+        }], ctorParameters: function () { return [{ type: AuthService }, { type: StorageService }, { type: i2$1.Router }, { type: ProfileService }, { type: AppName, decorators: [{
                     type: Inject,
                     args: ['appName']
                 }] }]; } });