taxtank-core 0.22.1 → 0.22.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -21,7 +21,8 @@ export class FinancialYearInterceptor {
21
21
  });
22
22
  // clone request to add new parameters
23
23
  let clonedReq = request.clone();
24
- if (!params.get('financialYear') && !request.urlWithParams.includes('?financialYear')) {
24
+ // @TODO query params should be passed using second param of get request and HttpParams object
25
+ if (!params.get('financialYear') && !request.urlWithParams.includes('?financialYear') && !request.urlWithParams.includes('&financialYear')) {
25
26
  params = params.set('financialYear', localStorage.getItem('financialYear'));
26
27
  clonedReq = request.clone({
27
28
  params: params
@@ -38,4 +39,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
38
39
  type: Inject,
39
40
  args: ['environment']
40
41
  }] }]; } });
41
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmluYW5jaWFsLXllYXItaW50ZXJjZXB0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvaW50ZXJjZXB0b3JzL2ZpbmFuY2lhbC15ZWFyLWludGVyY2VwdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ25ELE9BQU8sRUFLTCxVQUFVLEVBQ1gsTUFBTSxzQkFBc0IsQ0FBQzs7QUFFOUI7OztHQUdHO0FBRUgsTUFBTSxPQUFPLHdCQUF3QjtJQUNuQyxZQUNpQyxXQUFnQjtRQUFoQixnQkFBVyxHQUFYLFdBQVcsQ0FBSztJQUM5QyxDQUFDO0lBRUosU0FBUyxDQUFDLE9BQXlCLEVBQUUsSUFBaUI7UUFDcEQsNEJBQTRCO1FBQzVCLDBFQUEwRTtRQUMxRSxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsRUFBRTtZQUNuRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7U0FDN0I7UUFFRCwyQ0FBMkM7UUFDM0MsSUFBSSxNQUFNLEdBQWUsSUFBSSxVQUFVLENBQUM7WUFDdEMsVUFBVSxFQUFFLE9BQU8sQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFO1NBQ3RDLENBQUMsQ0FBQztRQUVILHNDQUFzQztRQUN0QyxJQUFJLFNBQVMsR0FBcUIsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBRWxELElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLENBQUMsRUFBRTtZQUNyRixNQUFNLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxlQUFlLEVBQUUsWUFBWSxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDO1lBQzVFLFNBQVMsR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDO2dCQUN4QixNQUFNLEVBQUUsTUFBTTthQUNmLENBQUMsQ0FBQztTQUNKO1FBRUQsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ2hDLENBQUM7O3NIQTVCVSx3QkFBd0Isa0JBRXpCLGFBQWE7MEhBRlosd0JBQXdCOzRGQUF4Qix3QkFBd0I7a0JBRHBDLFVBQVU7OzBCQUdOLE1BQU07MkJBQUMsYUFBYSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcclxuaW1wb3J0IHsgSW5qZWN0LCBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcbmltcG9ydCB7XHJcbiAgSHR0cFJlcXVlc3QsXHJcbiAgSHR0cEhhbmRsZXIsXHJcbiAgSHR0cEV2ZW50LFxyXG4gIEh0dHBJbnRlcmNlcHRvcixcclxuICBIdHRwUGFyYW1zXHJcbn0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xyXG5cclxuLyoqXHJcbiAqIEZpbmFuY2lhbCBZZWFyIGludGVyY2VwdG9yIGFkZCBmaW5hbmNpYWxZZWFyIHBhcmFtZXRlciB0byByZXF1ZXN0cyBiZWNhdXNlIGEgbG90IG9mIFBPU1QgYW5kIEdFVCByZXF1ZXN0cyByZXF1aXJlIHRoaXMgcGFyYW1ldGVyXHJcbiAqIEBUT0RPIG5vdyB3ZSBjYW4gZ2V0IGN1cnJlbnQgZmluIHllYXIgZnJvbSB1c2VyIG9uIGJhY2tlbmQuIFNvIHdlIGNhbiByZW1vdmUgdGhpcyBpbnRlcmNlcHRvclxyXG4gKi9cclxuQEluamVjdGFibGUoKVxyXG5leHBvcnQgY2xhc3MgRmluYW5jaWFsWWVhckludGVyY2VwdG9yIGltcGxlbWVudHMgSHR0cEludGVyY2VwdG9yIHtcclxuICBjb25zdHJ1Y3RvcihcclxuICAgIEBJbmplY3QoJ2Vudmlyb25tZW50JykgcHJpdmF0ZSBlbnZpcm9ubWVudDogYW55XHJcbiAgKSB7fVxyXG5cclxuICBpbnRlcmNlcHQocmVxdWVzdDogSHR0cFJlcXVlc3Q8YW55PiwgbmV4dDogSHR0cEhhbmRsZXIpOiBPYnNlcnZhYmxlPEh0dHBFdmVudDxhbnk+PiB7XHJcbiAgICAvLyBza2lwIHRoaXJkIHBhcnR5IHJlcXVlc3RzXHJcbiAgICAvLyBAVE9ETyBBbGV4OiBBbHNvIGNoZWNrIGFuZCBpZ25vcmUgcmVxdWVzdHMgd2UgZG9uJ3QgbmVlZCBmaW5hbmNpYWwgeWVhclxyXG4gICAgaWYgKCFyZXF1ZXN0LnVybC5pbmNsdWRlcyh0aGlzLmVudmlyb25tZW50LmFwaV91cmkpKSB7XHJcbiAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXF1ZXN0KTtcclxuICAgIH1cclxuXHJcbiAgICAvLyBTZXQgZmluYW5jaWFsIHllYXIgcGFyYW1ldGVyIHRvIHJlcXVlc3RzXHJcbiAgICBsZXQgcGFyYW1zOiBIdHRwUGFyYW1zID0gbmV3IEh0dHBQYXJhbXMoe1xyXG4gICAgICBmcm9tU3RyaW5nOiByZXF1ZXN0LnBhcmFtcy50b1N0cmluZygpXHJcbiAgICB9KTtcclxuXHJcbiAgICAvLyBjbG9uZSByZXF1ZXN0IHRvIGFkZCBuZXcgcGFyYW1ldGVyc1xyXG4gICAgbGV0IGNsb25lZFJlcTogSHR0cFJlcXVlc3Q8YW55PiA9IHJlcXVlc3QuY2xvbmUoKTtcclxuXHJcbiAgICBpZiAoIXBhcmFtcy5nZXQoJ2ZpbmFuY2lhbFllYXInKSAmJiAhcmVxdWVzdC51cmxXaXRoUGFyYW1zLmluY2x1ZGVzKCc/ZmluYW5jaWFsWWVhcicpKSB7XHJcbiAgICAgIHBhcmFtcyA9IHBhcmFtcy5zZXQoJ2ZpbmFuY2lhbFllYXInLCBsb2NhbFN0b3JhZ2UuZ2V0SXRlbSgnZmluYW5jaWFsWWVhcicpKTtcclxuICAgICAgY2xvbmVkUmVxID0gcmVxdWVzdC5jbG9uZSh7XHJcbiAgICAgICAgcGFyYW1zOiBwYXJhbXNcclxuICAgICAgfSk7XHJcbiAgICB9XHJcblxyXG4gICAgcmV0dXJuIG5leHQuaGFuZGxlKGNsb25lZFJlcSk7XHJcbiAgfVxyXG59XHJcbiJdfQ==
42
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmluYW5jaWFsLXllYXItaW50ZXJjZXB0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvaW50ZXJjZXB0b3JzL2ZpbmFuY2lhbC15ZWFyLWludGVyY2VwdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ25ELE9BQU8sRUFLTCxVQUFVLEVBQ1gsTUFBTSxzQkFBc0IsQ0FBQzs7QUFFOUI7OztHQUdHO0FBRUgsTUFBTSxPQUFPLHdCQUF3QjtJQUNuQyxZQUNpQyxXQUFnQjtRQUFoQixnQkFBVyxHQUFYLFdBQVcsQ0FBSztJQUM5QyxDQUFDO0lBRUosU0FBUyxDQUFDLE9BQXlCLEVBQUUsSUFBaUI7UUFDcEQsNEJBQTRCO1FBQzVCLDBFQUEwRTtRQUMxRSxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsRUFBRTtZQUNuRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7U0FDN0I7UUFFRCwyQ0FBMkM7UUFDM0MsSUFBSSxNQUFNLEdBQWUsSUFBSSxVQUFVLENBQUM7WUFDdEMsVUFBVSxFQUFFLE9BQU8sQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFO1NBQ3RDLENBQUMsQ0FBQztRQUVILHNDQUFzQztRQUN0QyxJQUFJLFNBQVMsR0FBcUIsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBRWxELDhGQUE4RjtRQUM5RixJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFO1lBQzFJLE1BQU0sR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLGVBQWUsRUFBRSxZQUFZLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUM7WUFDNUUsU0FBUyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUM7Z0JBQ3hCLE1BQU0sRUFBRSxNQUFNO2FBQ2YsQ0FBQyxDQUFDO1NBQ0o7UUFFRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDaEMsQ0FBQzs7c0hBN0JVLHdCQUF3QixrQkFFekIsYUFBYTswSEFGWix3QkFBd0I7NEZBQXhCLHdCQUF3QjtrQkFEcEMsVUFBVTs7MEJBR04sTUFBTTsyQkFBQyxhQUFhIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xyXG5pbXBvcnQgeyBJbmplY3QsIEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHtcclxuICBIdHRwUmVxdWVzdCxcclxuICBIdHRwSGFuZGxlcixcclxuICBIdHRwRXZlbnQsXHJcbiAgSHR0cEludGVyY2VwdG9yLFxyXG4gIEh0dHBQYXJhbXNcclxufSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XHJcblxyXG4vKipcclxuICogRmluYW5jaWFsIFllYXIgaW50ZXJjZXB0b3IgYWRkIGZpbmFuY2lhbFllYXIgcGFyYW1ldGVyIHRvIHJlcXVlc3RzIGJlY2F1c2UgYSBsb3Qgb2YgUE9TVCBhbmQgR0VUIHJlcXVlc3RzIHJlcXVpcmUgdGhpcyBwYXJhbWV0ZXJcclxuICogQFRPRE8gbm93IHdlIGNhbiBnZXQgY3VycmVudCBmaW4geWVhciBmcm9tIHVzZXIgb24gYmFja2VuZC4gU28gd2UgY2FuIHJlbW92ZSB0aGlzIGludGVyY2VwdG9yXHJcbiAqL1xyXG5ASW5qZWN0YWJsZSgpXHJcbmV4cG9ydCBjbGFzcyBGaW5hbmNpYWxZZWFySW50ZXJjZXB0b3IgaW1wbGVtZW50cyBIdHRwSW50ZXJjZXB0b3Ige1xyXG4gIGNvbnN0cnVjdG9yKFxyXG4gICAgQEluamVjdCgnZW52aXJvbm1lbnQnKSBwcml2YXRlIGVudmlyb25tZW50OiBhbnlcclxuICApIHt9XHJcblxyXG4gIGludGVyY2VwdChyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+LCBuZXh0OiBIdHRwSGFuZGxlcik6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+IHtcclxuICAgIC8vIHNraXAgdGhpcmQgcGFydHkgcmVxdWVzdHNcclxuICAgIC8vIEBUT0RPIEFsZXg6IEFsc28gY2hlY2sgYW5kIGlnbm9yZSByZXF1ZXN0cyB3ZSBkb24ndCBuZWVkIGZpbmFuY2lhbCB5ZWFyXHJcbiAgICBpZiAoIXJlcXVlc3QudXJsLmluY2x1ZGVzKHRoaXMuZW52aXJvbm1lbnQuYXBpX3VyaSkpIHtcclxuICAgICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcXVlc3QpO1xyXG4gICAgfVxyXG5cclxuICAgIC8vIFNldCBmaW5hbmNpYWwgeWVhciBwYXJhbWV0ZXIgdG8gcmVxdWVzdHNcclxuICAgIGxldCBwYXJhbXM6IEh0dHBQYXJhbXMgPSBuZXcgSHR0cFBhcmFtcyh7XHJcbiAgICAgIGZyb21TdHJpbmc6IHJlcXVlc3QucGFyYW1zLnRvU3RyaW5nKClcclxuICAgIH0pO1xyXG5cclxuICAgIC8vIGNsb25lIHJlcXVlc3QgdG8gYWRkIG5ldyBwYXJhbWV0ZXJzXHJcbiAgICBsZXQgY2xvbmVkUmVxOiBIdHRwUmVxdWVzdDxhbnk+ID0gcmVxdWVzdC5jbG9uZSgpO1xyXG5cclxuICAgIC8vIEBUT0RPIHF1ZXJ5IHBhcmFtcyBzaG91bGQgYmUgcGFzc2VkIHVzaW5nIHNlY29uZCBwYXJhbSBvZiBnZXQgcmVxdWVzdCBhbmQgSHR0cFBhcmFtcyBvYmplY3RcclxuICAgIGlmICghcGFyYW1zLmdldCgnZmluYW5jaWFsWWVhcicpICYmICFyZXF1ZXN0LnVybFdpdGhQYXJhbXMuaW5jbHVkZXMoJz9maW5hbmNpYWxZZWFyJykgJiYgIXJlcXVlc3QudXJsV2l0aFBhcmFtcy5pbmNsdWRlcygnJmZpbmFuY2lhbFllYXInKSkge1xyXG4gICAgICBwYXJhbXMgPSBwYXJhbXMuc2V0KCdmaW5hbmNpYWxZZWFyJywgbG9jYWxTdG9yYWdlLmdldEl0ZW0oJ2ZpbmFuY2lhbFllYXInKSk7XHJcbiAgICAgIGNsb25lZFJlcSA9IHJlcXVlc3QuY2xvbmUoe1xyXG4gICAgICAgIHBhcmFtczogcGFyYW1zXHJcbiAgICAgIH0pO1xyXG4gICAgfVxyXG5cclxuICAgIHJldHVybiBuZXh0LmhhbmRsZShjbG9uZWRSZXEpO1xyXG4gIH1cclxufVxyXG4iXX0=
@@ -142,7 +142,8 @@ class FinancialYearInterceptor {
142
142
  });
143
143
  // clone request to add new parameters
144
144
  let clonedReq = request.clone();
145
- if (!params.get('financialYear') && !request.urlWithParams.includes('?financialYear')) {
145
+ // @TODO query params should be passed using second param of get request and HttpParams object
146
+ if (!params.get('financialYear') && !request.urlWithParams.includes('?financialYear') && !request.urlWithParams.includes('&financialYear')) {
146
147
  params = params.set('financialYear', localStorage.getItem('financialYear'));
147
148
  clonedReq = request.clone({
148
149
  params: params