taxtank-core 0.30.88 → 0.30.89

package/fesm2020/taxtank-core.mjs

@@ -9797,6 +9797,7 @@ let RestService$1 = class RestService extends DataService {
             .pipe(map((response) => this.isApiPlatform ? response['hydra:member'] : toArray(response)), map((response) => {
             this.setCache(response);
             this.cacheSubject.next(this.cache);
+            this.isPending = false;
             return this.cache;
         }));
     }
@@ -10260,20 +10261,14 @@ class BasiqTokenService extends RestService$1 {
      * Access token to use basiq flow
      */
     get() {
-        // @TODO Alex move isPending to restService
-        if ((!this.cache || this.cache.first.isExpired()) && !this.isPending) {
-            this.isPending = true;
-            this.http.get(this.apiUrl)
-                .pipe(map((response) => {
-                const now = new Date().getTime();
-                return new BasiqToken(response.access_token, new Date(now + response.expires_in * 1000));
-            }))
-                .subscribe((token) => {
-                this.isPending = false;
-                this.updateCache([token], 'get');
-            });
+        if (this.cache && this.cache.first.isExpired()) {
+            this.setCache([]);
         }
-        return this.cacheSubject.asObservable();
+        return super.get();
+    }
+    createModelInstance(tokenResponse) {
+        const now = new Date().getTime();
+        return new BasiqToken(tokenResponse['access_token'], new Date(now + tokenResponse['expires_in'] * 1000));
     }
 }
 BasiqTokenService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BasiqTokenService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });