taxtank-core 0.31.12 → 0.31.13

package/fesm2020/taxtank-core.mjs

@@ -1,11 +1,11 @@
 import * as i0 from '@angular/core';
-import { Injectable, Inject, inject, EventEmitter, NgModule } from '@angular/core';
+import { Injectable, Inject, EventEmitter, NgModule } from '@angular/core';
 import * as i1$1 from '@angular/common';
 import { CommonModule, DatePipe } from '@angular/common';
 import * as i1 from '@angular/common/http';
 import { HttpParams, HttpErrorResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { map, mergeMap, filter, first as first$1, catchError, skip, take, switchMap, finalize, debounceTime, distinctUntilChanged } from 'rxjs/operators';
-import { ReplaySubject, BehaviorSubject, Subject, Observable, throwError, combineLatest, forkJoin, of, from, merge as merge$1 } from 'rxjs';
+import { ReplaySubject, Subject, Observable, throwError, combineLatest, BehaviorSubject, forkJoin, of, from, merge as merge$1 } from 'rxjs';
 import { plainToClass, Type, Transform, Exclude, Expose, classToPlain } from 'class-transformer';
 import get from 'lodash/get';
 import { __decorate } from 'tslib';
@@ -27,8 +27,8 @@ import compact from 'lodash/compact';
 import concat from 'lodash/concat';
 import cloneDeep$1 from 'lodash/cloneDeep';
 import clone from 'lodash/clone';
-import { JwtHelperService } from '@auth0/angular-jwt';
 import { EventSourcePolyfill } from 'event-source-polyfill/src/eventsource.min.js';
+import { JwtHelperService } from '@auth0/angular-jwt';
 import * as i4 from '@angular/router';
 import { NavigationEnd } from '@angular/router';
 import _ from 'lodash';
@@ -10149,83 +10149,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImpor
                 }]
         }] });
 
-const NAME_TOKEN = 'token';
-const NAME_REFRESH_TOKEN = 'refreshToken';
-class JwtService extends JwtHelperService {
-    getToken() {
-        return localStorage[NAME_TOKEN];
-    }
-    getRefreshToken() {
-        return localStorage[NAME_REFRESH_TOKEN];
-    }
-    saveTokens(tokens) {
-        localStorage[NAME_TOKEN] = tokens.token;
-        localStorage[NAME_REFRESH_TOKEN] = tokens.refreshToken;
-    }
-    destroyTokens() {
-        localStorage.removeItem(NAME_TOKEN);
-        localStorage.removeItem(NAME_REFRESH_TOKEN);
-    }
-    getUser() {
-        const token = this.decodeToken();
-        if (!token) {
-            return null;
-        }
-        return plainToClass(User, { id: token.id, roles: token.roles, email: token.username, status: token.status });
-    }
-    isMe(userId) {
-        return this.getUser().id === userId;
-    }
-}
-JwtService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: JwtService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-JwtService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: JwtService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: JwtService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
-class AuthService {
-    constructor(http, jwtService, environment) {
-        this.http = http;
-        this.jwtService = jwtService;
-        this.environment = environment;
-        this.isLoggedInSubject = new BehaviorSubject(!this.jwtService.isTokenExpired());
-    }
-    setAuth(response) {
-        this.jwtService.saveTokens(response);
-        this.isLoggedInSubject.next(true);
-    }
-    login(username, password) {
-        return this.http.post(`${this.environment.apiV2}/login`, { username, password }).pipe(map((response) => {
-            this.setAuth(response);
-            return response;
-        }));
-    }
-    refresh(refreshToken) {
-        return this.http.post(`${this.environment.apiV2}/token/refresh`, { refreshToken }).pipe(map((response) => {
-            this.setAuth(response);
-            return response;
-        }));
-    }
-    logoutFront(url = '/login') {
-        localStorage.clear();
-        location.replace(url);
-    }
-}
-AuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AuthService, deps: [{ token: i1.HttpClient }, { token: JwtService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-AuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AuthService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AuthService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: JwtService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
-
 /**
  * @TODO Alex (TT-1777): replace old logic with the new when all services ready
  * @TODO Alex (TT-1777): rename old logic and keep it for custom events
@@ -10263,6 +10186,43 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImpor
                 }]
         }] });
 
+const NAME_TOKEN = 'token';
+const NAME_REFRESH_TOKEN = 'refreshToken';
+class JwtService extends JwtHelperService {
+    getToken() {
+        return localStorage[NAME_TOKEN];
+    }
+    getRefreshToken() {
+        return localStorage[NAME_REFRESH_TOKEN];
+    }
+    saveTokens(tokens) {
+        localStorage[NAME_TOKEN] = tokens.token;
+        localStorage[NAME_REFRESH_TOKEN] = tokens.refreshToken;
+    }
+    destroyTokens() {
+        localStorage.removeItem(NAME_TOKEN);
+        localStorage.removeItem(NAME_REFRESH_TOKEN);
+    }
+    getUser() {
+        const token = this.decodeToken();
+        if (!token) {
+            return null;
+        }
+        return plainToClass(User, { id: token.id, roles: token.roles, email: token.username, status: token.status });
+    }
+    isMe(userId) {
+        return this.getUser().id === userId;
+    }
+}
+JwtService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: JwtService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+JwtService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: JwtService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: JwtService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
 /**
  * server sent events service
  * https://symfony.com/doc/current/mercure.html
@@ -10318,7 +10278,6 @@ let RestService$1 = class RestService extends DataService {
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;
         this.environment = environment;
-        this.jwtService = inject(JwtService);
         /**
          * Subject for service cache
          */
@@ -10330,6 +10289,9 @@ let RestService$1 = class RestService extends DataService {
          */
         this.disabledMethods = [];
         this.roles = [];
+        this.eventDispatcherService.on2(User.getEventName('get')).subscribe((data) => {
+            this.user = data[0];
+        });
         // @TODO Alex remove, bad idea to call empty method overrided in child (because it will be called with parent context)
         this.listenEvents();
     }
@@ -10358,13 +10320,14 @@ let RestService$1 = class RestService extends DataService {
         this.setCache([]);
         return this.http.get(path)
             .pipe(map((response) => this.isApiPlatform ? response['hydra:member'] : toArray(response)), map((response) => {
-            this.setCache(response, true);
+            const result = response.map((item) => this.createModelInstance(item));
+            this.handleResponse(result, 'get');
             return this.cache;
         }));
     }
     get(path = this.apiUrl) {
         if (!this.cache) {
-            this.jwtService.getUser().hasRoles(this.roles) ? this.fetch(path).pipe(first$1()).subscribe() : this.setCache([], true);
+            (!this.user || this.user.hasRoles(this.roles)) ? this.fetch(path).pipe(first$1()).subscribe() : this.setCache([], true);
         }
         return this.cacheSubject.asObservable();
     }
@@ -10459,24 +10422,24 @@ let RestService$1 = class RestService extends DataService {
      * Update cache with passed items. Add/Update detects automatically, Delete via optional flag
      */
     updateCache(items, method) {
+        let cache;
         switch (method) {
             case 'post':
-                this.cache = this.cache.push(...items);
+                cache = this.cache.push(...items);
                 break;
             case 'put':
                 // @TODO Alex old instance
                 items.forEach((item) => {
-                    this.cache = this.cache.replaceBy('id', item.id, item);
+                    cache = this.cache.replaceBy('id', item.id, item);
                 });
                 break;
             case 'delete':
-                this.cache = this.cache.removeBy('id', items.map((item) => item.id));
+                cache = this.cache.removeBy('id', items.map((item) => item.id));
                 break;
             case 'get':
-                this.cache = this.createCollectionInstance(this.collectionClass, items);
+                cache = this.createCollectionInstance(this.collectionClass, items);
         }
-        // @TODO Alex replace with setCache
-        this.cacheSubject.next(this.cache);
+        this.setCache(cache.toArray(), true);
     }
     /**
      * Generate and dispatch rest event
@@ -11649,6 +11612,46 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImpor
                     args: ['environment']
                 }] }]; } });
 
+class AuthService {
+    constructor(http, jwtService, environment) {
+        this.http = http;
+        this.jwtService = jwtService;
+        this.environment = environment;
+        this.isLoggedInSubject = new BehaviorSubject(!this.jwtService.isTokenExpired());
+    }
+    setAuth(response) {
+        this.jwtService.saveTokens(response);
+        this.isLoggedInSubject.next(true);
+    }
+    login(username, password) {
+        return this.http.post(`${this.environment.apiV2}/login`, { username, password }).pipe(map((response) => {
+            this.setAuth(response);
+            return response;
+        }));
+    }
+    refresh(refreshToken) {
+        return this.http.post(`${this.environment.apiV2}/token/refresh`, { refreshToken }).pipe(map((response) => {
+            this.setAuth(response);
+            return response;
+        }));
+    }
+    logoutFront(url = '/login') {
+        localStorage.clear();
+        location.replace(url);
+    }
+}
+AuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AuthService, deps: [{ token: i1.HttpClient }, { token: JwtService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+AuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AuthService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AuthService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: JwtService }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
+
 /**
  * Google instance
  * https://developers.google.com/identity/oauth2/web/guides/overview
@@ -11784,10 +11787,12 @@ class RestService {
         this.eventDispatcherService = eventDispatcherService;
         this.environment = environment;
         this.toastService = toastService;
-        this.jwtService = inject(JwtService);
         // subject for service cache
         this.cacheSubject = new ReplaySubject(1);
         this.roles = [];
+        this.eventDispatcherService.on2(User.getEventName('get')).subscribe((data) => {
+            this.user = data[0];
+        });
         this.listenEvents();
     }
     /**
@@ -11808,7 +11813,7 @@ class RestService {
      */
     get() {
         if (!this.cache) {
-            this.jwtService.getUser().hasRoles(this.roles) ? this.fetch().pipe(first$1()).subscribe() : this.setCache([], true);
+            (!this.user || this.user.hasRoles(this.roles)) ? this.fetch().pipe(first$1()).subscribe() : this.setCache([], true);
         }
         return this.cacheSubject.asObservable();
     }
@@ -15228,7 +15233,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImpor
 
 class UserService extends RestService$1 {
     constructor(http, eventDispatcherService, environment) {
-        console.log('userService');
         super(http, eventDispatcherService, environment);
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;