@dontdrinkandroot/ngx-extensions 0.0.5 → 0.2.0

package/{fesm2015/dontdrinkandroot-ngx-extensions.js → fesm2020/dontdrinkandroot-ngx-extensions.mjs}

@@ -1,10 +1,14 @@
-import { Directive, ElementRef, ChangeDetectorRef, Input, HostBinding, HostListener, EventEmitter, Output, InjectionToken, NgModule, ɵɵdefineInjectable, ɵɵinject, Injectable, Inject } from '@angular/core';
+import * as i0 from '@angular/core';
+import { Directive, Input, HostBinding, HostListener, EventEmitter, Output, InjectionToken, NgModule, Injectable, Inject } from '@angular/core';
 import { __decorate } from 'tslib';
-import { DOCUMENT, ViewportScroller } from '@angular/common';
-import { NavigationStart, Router } from '@angular/router';
-import { merge, fromEvent, throwError, of } from 'rxjs';
+import * as i2 from '@angular/common';
+import { DOCUMENT } from '@angular/common';
+import * as i1 from '@angular/router';
+import { NavigationStart } from '@angular/router';
+import { merge, fromEvent, throwError } from 'rxjs';
 import { debounceTime, startWith, map, distinctUntilChanged, shareReplay, catchError, switchMap } from 'rxjs/operators';
-import { HttpErrorResponse, HttpClient } from '@angular/common/http';
+import * as i2$1 from '@angular/common/http';
+import { HttpErrorResponse } from '@angular/common/http';
 
 class NumberUtils {
     static getNextPowerOfTwo(value) {
@@ -52,26 +56,27 @@ class StringUtils {
 }
 
 function Debounce(delay = 250) {
+    let timeoutReference = undefined;
     return (target, propertyKey, descriptor) => {
         const original = descriptor.value;
-        const key = `__timeout__${propertyKey}`;
         descriptor.value = function (...args) {
-            clearTimeout(this[key]);
-            this[key] = setTimeout(() => original.apply(this, args), delay);
+            if (null != timeoutReference)
+                clearTimeout(timeoutReference);
+            timeoutReference = setTimeout(() => original.apply(this, args), delay);
         };
         return descriptor;
     };
 }
 
 function Limit(rate = 250) {
+    let timeoutReference = undefined;
     return (target, propertyKey, descriptor) => {
         const original = descriptor.value;
-        const key = `__timeout__${propertyKey}`;
         descriptor.value = function (...args) {
-            if (null == this[key]) {
-                this[key] = setTimeout(() => {
+            if (null == timeoutReference) {
+                timeoutReference = setTimeout(() => {
                     original.apply(this, args);
-                    delete this[key];
+                    timeoutReference = undefined;
                 }, rate);
             }
         };
@@ -166,30 +171,43 @@ class LazyImageDirective {
         return window.getComputedStyle(element).display === 'none';
     }
 }
-LazyImageDirective.decorators = [
-    { type: Directive, args: [{ selector: '[ddrLazyImage]' },] }
-];
-LazyImageDirective.ctorParameters = () => [
-    { type: ElementRef },
-    { type: ChangeDetectorRef }
-];
-LazyImageDirective.propDecorators = {
-    src: [{ type: Input, args: ['ddrLazyImage',] }],
-    objectFit: [{ type: Input }],
-    offset: [{ type: Input }],
-    hostSrc: [{ type: HostBinding, args: ['src',] }],
-    hostStyleWidthPx: [{ type: HostBinding, args: ['style.width.px',] }],
-    hostStyleHeightPx: [{ type: HostBinding, args: ['style.height.px',] }],
-    hostStyleObjectFit: [{ type: HostBinding, args: ['style.object-fit',] }],
-    windowResized: [{ type: HostListener, args: ['window:resize', ['$event'],] }],
-    windowScroll: [{ type: HostListener, args: ['window:scroll', ['$event'],] }]
-};
+LazyImageDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: LazyImageDirective, deps: [{ token: i0.ElementRef }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Directive });
+LazyImageDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.2", type: LazyImageDirective, selector: "[ddrLazyImage]", inputs: { src: ["ddrLazyImage", "src"], objectFit: "objectFit", offset: "offset" }, host: { listeners: { "window:resize": "windowResized($event)", "window:scroll": "windowScroll($event)" }, properties: { "src": "this.hostSrc", "style.width.px": "this.hostStyleWidthPx", "style.height.px": "this.hostStyleHeightPx", "style.object-fit": "this.hostStyleObjectFit" } }, usesOnChanges: true, ngImport: i0 });
 __decorate([
     Debounce()
 ], LazyImageDirective.prototype, "windowResized", null);
 __decorate([
     Limit()
 ], LazyImageDirective.prototype, "windowScroll", null);
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: LazyImageDirective, decorators: [{
+            type: Directive,
+            args: [{ selector: '[ddrLazyImage]' }]
+        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: i0.ChangeDetectorRef }]; }, propDecorators: { src: [{
+                type: Input,
+                args: ['ddrLazyImage']
+            }], objectFit: [{
+                type: Input
+            }], offset: [{
+                type: Input
+            }], hostSrc: [{
+                type: HostBinding,
+                args: ['src']
+            }], hostStyleWidthPx: [{
+                type: HostBinding,
+                args: ['style.width.px']
+            }], hostStyleHeightPx: [{
+                type: HostBinding,
+                args: ['style.height.px']
+            }], hostStyleObjectFit: [{
+                type: HostBinding,
+                args: ['style.object-fit']
+            }], windowResized: [{
+                type: HostListener,
+                args: ['window:resize', ['$event']]
+            }], windowScroll: [{
+                type: HostListener,
+                args: ['window:scroll', ['$event']]
+            }] } });
 
 class BottomHitDirective {
     constructor() {
@@ -222,58 +240,70 @@ class BottomHitDirective {
         }
     }
 }
-BottomHitDirective.decorators = [
-    { type: Directive, args: [{
-                selector: '[ddrBottomHit]'
-            },] }
-];
-BottomHitDirective.ctorParameters = () => [];
-BottomHitDirective.propDecorators = {
-    onWindowBottomHit: [{ type: Output }],
-    onElementBottomHit: [{ type: Output }],
-    scrolled: [{ type: HostListener, args: ['scroll', ['$event'],] }],
-    windowScrolled: [{ type: HostListener, args: ['window:scroll', ['$event'],] }]
-};
+BottomHitDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: BottomHitDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+BottomHitDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.2", type: BottomHitDirective, selector: "[ddrBottomHit]", outputs: { onWindowBottomHit: "onWindowBottomHit", onElementBottomHit: "onElementBottomHit" }, host: { listeners: { "scroll": "scrolled($event)", "window:scroll": "windowScrolled($event)" } }, ngImport: i0 });
 __decorate([
     Limit()
 ], BottomHitDirective.prototype, "scrolled", null);
 __decorate([
     Limit()
 ], BottomHitDirective.prototype, "windowScrolled", null);
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: BottomHitDirective, decorators: [{
+            type: Directive,
+            args: [{
+                    selector: '[ddrBottomHit]'
+                }]
+        }], ctorParameters: function () { return []; }, propDecorators: { onWindowBottomHit: [{
+                type: Output
+            }], onElementBottomHit: [{
+                type: Output
+            }], scrolled: [{
+                type: HostListener,
+                args: ['scroll', ['$event']]
+            }], windowScrolled: [{
+                type: HostListener,
+                args: ['window:scroll', ['$event']]
+            }] } });
 
 const DDR_STORAGE_PREFIX = new InjectionToken('DDR_STORAGE_PREFIX');
 const DDR_JWT_REFRESH_TOKEN_URL = new InjectionToken('DDR_JWT_REFRESH_TOKEN_URL');
 const DDR_LOGIN_PATH = new InjectionToken('DDR_LOGIN_PATH');
 class DdrExtensionsModule {
 }
-DdrExtensionsModule.decorators = [
-    { type: NgModule, args: [{
-                declarations: [
-                    LazyImageDirective,
-                    BottomHitDirective
-                ],
-                imports: [],
-                providers: [
-                    {
-                        provide: DDR_LOGIN_PATH,
-                        useValue: '/login'
-                    }
-                ],
-                exports: [
-                    LazyImageDirective,
-                    BottomHitDirective
-                ]
-            },] }
-];
+DdrExtensionsModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: DdrExtensionsModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+DdrExtensionsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.2", ngImport: i0, type: DdrExtensionsModule, declarations: [LazyImageDirective,
+        BottomHitDirective], exports: [LazyImageDirective,
+        BottomHitDirective] });
+DdrExtensionsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: DdrExtensionsModule, providers: [
+        {
+            provide: DDR_LOGIN_PATH,
+            useValue: '/login'
+        }
+    ] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: DdrExtensionsModule, decorators: [{
+            type: NgModule,
+            args: [{
+                    declarations: [
+                        LazyImageDirective,
+                        BottomHitDirective
+                    ],
+                    imports: [],
+                    providers: [
+                        {
+                            provide: DDR_LOGIN_PATH,
+                            useValue: '/login'
+                        }
+                    ],
+                    exports: [
+                        LazyImageDirective,
+                        BottomHitDirective
+                    ]
+                }]
+        }] });
 
 // This service is based on the `ng2-cookies` package which sadly is not a service and does
 class CookieService {
-    constructor(
-    // The type `Document` may not be used here. Although a fix is on its way,
-    // we will go with `any` for now to support Angular 2.4.x projects.
-    // Issue: https://github.com/angular/angular/issues/12631
-    // Fix: https://github.com/angular/angular/pull/14894
-    document) {
+    constructor(document) {
         this.document = document;
         // To avoid issues with server side prerendering, check if `document` is defined.
         this.documentIsAccessible = document !== undefined;
@@ -297,6 +327,8 @@ class CookieService {
             name = encodeURIComponent(name);
             const regExp = this.getCookieRegExp(name);
             const result = regExp.exec(this.document.cookie);
+            if (null == result)
+                return '';
             return decodeURIComponent(result[1]);
         }
         else {
@@ -314,6 +346,7 @@ class CookieService {
             for (let i = 0; i < split.length; i += 1) {
                 const currentCookie = split[i].split('=');
                 currentCookie[0] = currentCookie[0].replace(/^ /, '');
+                // @ts-ignore
                 cookies[decodeURIComponent(currentCookie[0])] = decodeURIComponent(currentCookie[1]);
             }
         }
@@ -382,52 +415,63 @@ class CookieService {
      * @param name Cookie name
      */
     getCookieRegExp(name) {
-        const escapedName = name.replace(/([\[\]\{\}\(\)\|\=\;\+\?\,\.\*\^\$])/ig, '\\$1');
+        const escapedName = name.replace(/([\[\]{}()|=;+?,.*^$])/ig, '\\$1');
         return new RegExp('(?:^' + escapedName + '|;\\s*' + escapedName + ')=(.*?)(?:;|$)', 'g');
     }
 }
-CookieService.ɵprov = ɵɵdefineInjectable({ factory: function CookieService_Factory() { return new CookieService(ɵɵinject(DOCUMENT)); }, token: CookieService, providedIn: "root" });
-CookieService.decorators = [
-    { type: Injectable, args: [{
-                providedIn: 'root'
-            },] }
-];
-CookieService.ctorParameters = () => [
-    { type: undefined, decorators: [{ type: Inject, args: [DOCUMENT,] }] }
-];
+CookieService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: CookieService, deps: [{ token: DOCUMENT }], target: i0.ɵɵFactoryTarget.Injectable });
+CookieService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: CookieService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: CookieService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: Document, decorators: [{
+                    type: Inject,
+                    args: [DOCUMENT]
+                }] }]; } });
+
+class ObjectUtils {
+    static deepCopy(value) {
+        return JSON.parse(JSON.stringify(value));
+    }
+    static getProperty(o, propertyName) {
+        return o[propertyName];
+    }
+}
 
 class CollectionUtils {
     /**
      * Maps an array into a Map by a specific property which should be unique.
-     * TODO: Maybe there is something like that in typescript, couldn't find it yet.
      */
     static mapByProperty(entries, property) {
         const map = new Map();
         for (const entry of entries) {
-            map.set(entry[property], entry);
+            map.set(ObjectUtils.getProperty(entry, property), entry);
         }
         return map;
     }
     /**
      * Maps an array into a Map by a specified property and aggregates them into an array.
-     * TODO: Maybe there is something like that in typescript, couldn't find it yet.
      */
     static mapArrayByProperty(entries, property) {
         const map = new Map();
         for (const entry of entries) {
-            const value = entry[property];
-            if (!map.has(value)) {
-                map.set(value, []);
-            }
-            map.get(value).push(entry);
+            const value = ObjectUtils.getProperty(entry, property);
+            const existingEntries = map.get(value) ?? [];
+            existingEntries.push(entry);
+            map.set(value, existingEntries);
         }
         return map;
     }
 }
 
-class ObjectUtils {
-    static deepCopy(value) {
-        return JSON.parse(JSON.stringify(value));
+class TypeUtils {
+    static notNull(value, message = 'Value must not be null') {
+        if (null == value) {
+            throw new Error(message);
+        }
+        return value;
     }
 }
 
@@ -448,21 +492,21 @@ class ScrollService {
         if (this.scrollPositionMap.has(url)) {
             /* Restore after timeout so rendering was completed */
             setTimeout(() => {
-                this.viewportScroller.scrollToPosition(this.scrollPositionMap.get(url));
+                let scrollPosition = this.scrollPositionMap.get(url);
+                if (null != scrollPosition)
+                    this.viewportScroller.scrollToPosition(scrollPosition);
             }, 1);
         }
     }
 }
-ScrollService.ɵprov = ɵɵdefineInjectable({ factory: function ScrollService_Factory() { return new ScrollService(ɵɵinject(Router), ɵɵinject(ViewportScroller)); }, token: ScrollService, providedIn: "root" });
-ScrollService.decorators = [
-    { type: Injectable, args: [{
-                providedIn: 'root'
-            },] }
-];
-ScrollService.ctorParameters = () => [
-    { type: Router },
-    { type: ViewportScroller }
-];
+ScrollService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: ScrollService, deps: [{ token: i1.Router }, { token: i2.ViewportScroller }], target: i0.ɵɵFactoryTarget.Injectable });
+ScrollService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: ScrollService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: ScrollService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: i1.Router }, { type: i2.ViewportScroller }]; } });
 
 class VisibilityService {
     constructor() {
@@ -472,11 +516,12 @@ class VisibilityService {
         return this.visibility$;
     }
 }
-VisibilityService.ɵprov = ɵɵdefineInjectable({ factory: function VisibilityService_Factory() { return new VisibilityService(); }, token: VisibilityService, providedIn: "root" });
-VisibilityService.decorators = [
-    { type: Injectable, args: [{ providedIn: 'root' },] }
-];
-VisibilityService.ctorParameters = () => [];
+VisibilityService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: VisibilityService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+VisibilityService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: VisibilityService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: VisibilityService, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }], ctorParameters: function () { return []; } });
 
 class WithCredentialsInterceptor {
     /**
@@ -489,29 +534,31 @@ class WithCredentialsInterceptor {
         return next.handle(cloned);
     }
 }
-WithCredentialsInterceptor.decorators = [
-    { type: Injectable }
-];
+WithCredentialsInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: WithCredentialsInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+WithCredentialsInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: WithCredentialsInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: WithCredentialsInterceptor, decorators: [{
+            type: Injectable
+        }] });
 
 class UrlInfo {
+    constructor(protocol, host, hostname, port, pathname, hash, search) {
+        this.protocol = protocol;
+        this.host = host;
+        this.hostname = hostname;
+        this.port = port;
+        this.pathname = pathname;
+        this.hash = hash;
+        this.search = search;
+    }
     static parse(urlString) {
         const parser = document.createElement('a');
         parser.href = urlString;
-        const urlInfo = new UrlInfo();
-        urlInfo.protocol = parser.protocol;
-        urlInfo.host = parser.host;
-        urlInfo.hostname = parser.hostname;
-        urlInfo.port = parser.port;
-        urlInfo.pathname = parser.pathname;
-        urlInfo.hash = parser.hash;
-        urlInfo.search = parser.search;
-        return urlInfo;
+        return new UrlInfo(parser.protocol, parser.host, parser.hostname, parser.port === '' ? 80 : +parser.port, parser.pathname, parser.hash, parser.search);
     }
     getRoot() {
         let root = this.protocol + '//' + this.hostname;
-        if (this.port != null && this.port !== '' && this.port !== '80') {
+        if (this.port !== 80)
             root += ':' + this.port;
-        }
         return root;
     }
     getUrl() {
@@ -538,17 +585,26 @@ class RedirectToLoginInterceptor {
         }));
     }
 }
-RedirectToLoginInterceptor.decorators = [
-    { type: Injectable }
-];
-RedirectToLoginInterceptor.ctorParameters = () => [
-    { type: Router },
-    { type: undefined, decorators: [{ type: Inject, args: [DDR_LOGIN_PATH,] }] }
-];
+RedirectToLoginInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: RedirectToLoginInterceptor, deps: [{ token: i1.Router }, { token: DDR_LOGIN_PATH }], target: i0.ɵɵFactoryTarget.Injectable });
+RedirectToLoginInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: RedirectToLoginInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: RedirectToLoginInterceptor, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: i1.Router }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: [DDR_LOGIN_PATH]
+                }] }]; } });
 
 class JwtService {
     constructor(storagePrefix) {
         this.storagePrefix = storagePrefix;
+        /**
+         * The current token.
+         */
+        this.token = null;
+        /**
+         * The expiry of the current token.
+         */
+        this.tokenExpiry = null;
     }
     /**
      * Sets the current token and a refresh token.
@@ -605,15 +661,17 @@ class JwtService {
         return this.storagePrefix + '.jwt.refresh_token';
     }
 }
-JwtService.ɵprov = ɵɵdefineInjectable({ factory: function JwtService_Factory() { return new JwtService(ɵɵinject(DDR_STORAGE_PREFIX)); }, token: JwtService, providedIn: "root" });
-JwtService.decorators = [
-    { type: Injectable, args: [{
-                providedIn: 'root'
-            },] }
-];
-JwtService.ctorParameters = () => [
-    { type: String, decorators: [{ type: Inject, args: [DDR_STORAGE_PREFIX,] }] }
-];
+JwtService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: JwtService, deps: [{ token: DDR_STORAGE_PREFIX }], target: i0.ɵɵFactoryTarget.Injectable });
+JwtService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: JwtService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: JwtService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [DDR_STORAGE_PREFIX]
+                }] }]; } });
 
 class JwtInterceptor {
     constructor(jwtService) {
@@ -632,18 +690,18 @@ class JwtInterceptor {
         return next.handle(req);
     }
 }
-JwtInterceptor.decorators = [
-    { type: Injectable }
-];
-JwtInterceptor.ctorParameters = () => [
-    { type: JwtService }
-];
+JwtInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: JwtInterceptor, deps: [{ token: JwtService }], target: i0.ɵɵFactoryTarget.Injectable });
+JwtInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: JwtInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: JwtInterceptor, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: JwtService }]; } });
 
 class JwtRefreshTokenInterceptor {
     constructor(jwtService, httpClient, jwtRefreshTokenUrl) {
         this.jwtService = jwtService;
         this.httpClient = httpClient;
         this.jwtRefreshTokenUrl = jwtRefreshTokenUrl;
+        this.refreshTokenRequest$ = null;
     }
     /**
      * @override
@@ -659,29 +717,27 @@ class JwtRefreshTokenInterceptor {
     }
     getRefreshTokenRequest(refreshToken) {
         if (null == this.refreshTokenRequest$) {
-            const refreshTokenRequest = this.httpClient.post(this.jwtRefreshTokenUrl, { refresh_token: refreshToken }).pipe(map(response => {
+            this.refreshTokenRequest$ = this.httpClient.post(this.jwtRefreshTokenUrl, { refresh_token: refreshToken }).pipe(map(response => {
                 this.jwtService.setTokens(response.token, response.refresh_token);
                 this.refreshTokenRequest$ = null;
                 return response;
             }), catchError(error => {
                 this.jwtService.clear();
                 this.refreshTokenRequest$ = null;
-                return of(null);
+                return throwError(error);
             }), shareReplay(1));
-            this.refreshTokenRequest$ = refreshTokenRequest;
-            return refreshTokenRequest;
         }
         return this.refreshTokenRequest$;
     }
 }
-JwtRefreshTokenInterceptor.decorators = [
-    { type: Injectable }
-];
-JwtRefreshTokenInterceptor.ctorParameters = () => [
-    { type: JwtService },
-    { type: HttpClient },
-    { type: String, decorators: [{ type: Inject, args: [DDR_JWT_REFRESH_TOKEN_URL,] }] }
-];
+JwtRefreshTokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: JwtRefreshTokenInterceptor, deps: [{ token: JwtService }, { token: i2$1.HttpClient }, { token: DDR_JWT_REFRESH_TOKEN_URL }], target: i0.ɵɵFactoryTarget.Injectable });
+JwtRefreshTokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: JwtRefreshTokenInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: JwtRefreshTokenInterceptor, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: JwtService }, { type: i2$1.HttpClient }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: [DDR_JWT_REFRESH_TOKEN_URL]
+                }] }]; } });
 
 /*
  * Public API Surface of ngx-extensions
@@ -691,5 +747,5 @@ JwtRefreshTokenInterceptor.ctorParameters = () => [
  * Generated bundle index. Do not edit.
  */
 
-export { BottomHitDirective, CollectionUtils, CookieService, DDR_JWT_REFRESH_TOKEN_URL, DDR_LOGIN_PATH, DDR_STORAGE_PREFIX, DdrExtensionsModule, Debounce, JwtInterceptor, JwtRefreshTokenInterceptor, JwtService, LazyImageDirective, Limit, NumberUtils, ObjectUtils, RedirectToLoginInterceptor, ScrollService, StringUtils, UrlInfo, VisibilityService, WithCredentialsInterceptor };
-//# sourceMappingURL=dontdrinkandroot-ngx-extensions.js.map
+export { BottomHitDirective, CollectionUtils, CookieService, DDR_JWT_REFRESH_TOKEN_URL, DDR_LOGIN_PATH, DDR_STORAGE_PREFIX, DdrExtensionsModule, Debounce, JwtInterceptor, JwtRefreshTokenInterceptor, JwtService, LazyImageDirective, Limit, NumberUtils, ObjectUtils, RedirectToLoginInterceptor, ScrollService, StringUtils, TypeUtils, UrlInfo, VisibilityService, WithCredentialsInterceptor };
+//# sourceMappingURL=dontdrinkandroot-ngx-extensions.mjs.map