taxtank-core 0.16.2 → 0.16.5

package/bundles/taxtank-core.umd.js

@@ -831,7 +831,8 @@
         BANK_TRANSACTIONS_GET: new Endpoint('GET', '\\/bank-transactions'),
         BANK_TRANSACTIONS_DELETE: new Endpoint('DELETE', '\\/bank-transactions\\/\\d+'),
         BANK_TRANSACTIONS_IMPORT_POST: new Endpoint('POST', '\\/bank-transactions\\/\\d+\\/import'),
-        BASIQ_ACCOUNTS_GET: new Endpoint('GET', '\\/basiq\\/\\accounts'),
+        BASIQ_ACCOUNTS_GET: new Endpoint('GET', '\\/basiq\\/accounts'),
+        BASIQ_TOKEN_GET: new Endpoint('GET', '\\/basiq\\/tokens'),
         CHARTS_INCOME_GET: new Endpoint('GET', '\\/charts\\/\\incomes'),
         CHARTS_EXPENSES_GET: new Endpoint('GET', '\\/charts\\/\\expenses'),
         CHART_ACCOUNTS_GET: new Endpoint('GET', '\\/chart-accounts'),
@@ -9266,7 +9267,6 @@
         }
         PropertyService.prototype.listenEvents = function () {
             this.listenShareInviteAccepted();
-            this.listenServiceSubscriptionUpdated();
             // @TODO Alex: consider to refactor property movements logic similar to client-movements
             this.listenMovementsChanged();
         };
@@ -9277,13 +9277,6 @@
             var _this = this;
             this.eventDispatcherService.on(exports.AppEventTypeEnum.PROPERTY_SHARE_UPDATED).subscribe(function () { return _this.resetCache(); });
         };
-        /**
-         * Update cache when user's service subscription is updated
-         */
-        PropertyService.prototype.listenServiceSubscriptionUpdated = function () {
-            var _this = this;
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.SERVICE_SUBSCRIPTION_UPDATED).subscribe(function () { return _this.resetCache(); });
-        };
         /**
          * Update cache when property category changed
          */
@@ -10494,8 +10487,7 @@
          */
         BasiqService.prototype.confirmConsents = function () {
             var _this = this;
-            return this.http.put(this.environment.apiV2 + "/basiq/consents", {}).pipe(operators.map(function (response) {
-                var isConfirmed = !!Object.values(response).length;
+            return this.http.put(this.environment.apiV2 + "/basiq/consents", {}).pipe(operators.map(function (isConfirmed) {
                 _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.BASIQ_CONSENT_UPDATED, isConfirmed));
                 return isConfirmed;
             }));
@@ -10518,6 +10510,7 @@
                     return new BasiqToken(response['access_token'], new Date(now + response['expires_in'] * 1000));
                 }))
                     .subscribe(function (token) {
+                    _this.token = token;
                     _this.tokenSubject.next(token);
                 });
             }
@@ -13330,34 +13323,41 @@
      * Service to work with user
      */
     var UserService = /** @class */ (function () {
-        function UserService(http, jwtService, eventDispatcherService, environment) {
+        function UserService(http, jwtService, eventDispatcherService, sseService, environment) {
             this.http = http;
             this.jwtService = jwtService;
             this.eventDispatcherService = eventDispatcherService;
+            this.sseService = sseService;
             this.environment = environment;
             this.cacheSubject = new rxjs.ReplaySubject(1);
             this.listenEvents();
         }
-        /**
-         * Get current user
-         */
+        UserService.prototype.listenEvents = function () {
+            this.listenServiceSubscriptionUpdated();
+            this.listenBasiqConcentUpdated();
+        };
         UserService.prototype.get = function () {
-            var _this = this;
             if (!this.cache) {
-                this.http.get(this.environment.apiV2 + "/users/current")
-                    .pipe(operators.map(function (userBase) {
-                    return classTransformer.plainToClass(User, userBase);
-                }))
-                    .subscribe(function (user) {
-                    localStorage.setItem('userId', user.id.toString());
-                    // @TODO remove
-                    localStorage.setItem('financialYear', user.financialYear.toString());
-                    _this.cache = user;
-                    _this.cacheSubject.next(_this.cache);
-                });
+                this.fetch().subscribe();
             }
             return this.cacheSubject.asObservable();
         };
+        /**
+         * Get current user
+         */
+        UserService.prototype.fetch = function () {
+            var _this = this;
+            return this.http.get(this.environment.apiV2 + "/users/current")
+                .pipe(operators.map(function (userBase) {
+                var user = classTransformer.plainToClass(User, userBase);
+                localStorage.setItem('userId', user.id.toString());
+                // @TODO remove
+                localStorage.setItem('financialYear', user.financialYear.toString());
+                _this.cache = user;
+                _this.cacheSubject.next(_this.cache);
+                return user;
+            }));
+        };
         /**
          * Register new user
          */
@@ -13431,7 +13431,20 @@
         UserService.prototype.switchFinancialYear = function () {
             return this.http.get(this.environment.apiV2 + "/financial-year/switch");
         };
-        UserService.prototype.listenEvents = function () {
+        /**
+         * clear service cache
+         */
+        UserService.prototype.resetCache = function () {
+            this.fetch().subscribe();
+        };
+        /**
+         * Update cache when user's service subscription is updated
+         */
+        UserService.prototype.listenServiceSubscriptionUpdated = function () {
+            var _this = this;
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.SERVICE_SUBSCRIPTION_UPDATED).subscribe(function () { return _this.resetCache(); });
+        };
+        UserService.prototype.listenBasiqConcentUpdated = function () {
             var _this = this;
             this.eventDispatcherService.on(exports.AppEventTypeEnum.BASIQ_CONSENT_UPDATED).subscribe(function (isConfirmed) {
                 if (!isConfirmed) {
@@ -13439,13 +13452,13 @@
                 }
                 var user = clone__default["default"](_this.cache);
                 user.clientDetails.basiqConsentExist = true;
-                _this.cache = classTransformer.plainToClass(User, user);
+                _this.cache = user;
                 _this.cacheSubject.next(_this.cache);
             });
         };
         return UserService;
     }());
-    UserService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserService, deps: [{ token: i1__namespace.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    UserService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserService, deps: [{ token: i1__namespace.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
     UserService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserService, decorators: [{
                 type: i0.Injectable,
@@ -13453,7 +13466,7 @@
                         providedIn: 'root'
                     }]
             }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: JwtService }, { type: EventDispatcherService }, { type: undefined, decorators: [{
+            return [{ type: i1__namespace.HttpClient }, { type: JwtService }, { type: EventDispatcherService }, { type: SseService }, { type: undefined, decorators: [{
                             type: i0.Inject,
                             args: ['environment']
                         }] }];