@dontdrinkandroot/ngx-extensions 0.2.0 → 0.2.2

package/fesm2020/dontdrinkandroot-ngx-extensions.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { Directive, Input, HostBinding, HostListener, EventEmitter, Output, InjectionToken, NgModule, Injectable, Inject } from '@angular/core';
+import { Directive, Input, HostBinding, HostListener, EventEmitter, Output, Injectable, InjectionToken, Inject, NgModule } from '@angular/core';
 import { __decorate } from 'tslib';
 import * as i2 from '@angular/common';
 import { DOCUMENT } from '@angular/common';
@@ -8,7 +8,7 @@ import { NavigationStart } from '@angular/router';
 import { merge, fromEvent, throwError } from 'rxjs';
 import { debounceTime, startWith, map, distinctUntilChanged, shareReplay, catchError, switchMap } from 'rxjs/operators';
 import * as i2$1 from '@angular/common/http';
-import { HttpErrorResponse } from '@angular/common/http';
+import { HttpErrorResponse, HttpParams, HTTP_INTERCEPTORS } from '@angular/common/http';
 
 class NumberUtils {
     static getNextPowerOfTwo(value) {
@@ -171,15 +171,15 @@ class LazyImageDirective {
         return window.getComputedStyle(element).display === 'none';
     }
 }
-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 });
+LazyImageDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", 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.12", 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: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: LazyImageDirective, decorators: [{
             type: Directive,
             args: [{ selector: '[ddrLazyImage]' }]
         }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: i0.ChangeDetectorRef }]; }, propDecorators: { src: [{
@@ -240,15 +240,15 @@ class BottomHitDirective {
         }
     }
 }
-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 });
+BottomHitDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: BottomHitDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+BottomHitDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.12", 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: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: BottomHitDirective, decorators: [{
             type: Directive,
             args: [{
                     selector: '[ddrBottomHit]'
@@ -265,22 +265,135 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImpor
                 args: ['window:scroll', ['$event']]
             }] } });
 
-const DDR_STORAGE_PREFIX = new InjectionToken('DDR_STORAGE_PREFIX');
+class LoggerService {
+    constructor() {
+        this.debugEnabled = false;
+        this.infoEnabled = true;
+        this.warnEnabled = true;
+        this.errorEnabled = true;
+    }
+}
+
+class ConsoleLoggerService extends LoggerService {
+    /**
+     * @override
+     */
+    debug(message, ...optionalParams) {
+        if (this.debugEnabled) {
+            console.debug(message, optionalParams);
+        }
+    }
+    /**
+     * @override
+     */
+    info(message, ...optionalParams) {
+        if (this.infoEnabled) {
+            console.info(message, optionalParams);
+        }
+    }
+    /**
+     * @override
+     */
+    warn(message, ...optionalParams) {
+        if (this.warnEnabled) {
+            console.warn(message, optionalParams);
+        }
+    }
+    /**
+     * @override
+     */
+    error(message, ...optionalParams) {
+        if (this.errorEnabled) {
+            console.error(message, optionalParams);
+        }
+    }
+}
+ConsoleLoggerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: ConsoleLoggerService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+ConsoleLoggerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: ConsoleLoggerService });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: ConsoleLoggerService, decorators: [{
+            type: Injectable
+        }] });
+
+const DDR_STORAGE_PREFIX = new InjectionToken('storage-prefix');
+class StorageService {
+}
+
+class LocalStorageService extends StorageService {
+    constructor(storagePrefix, logger) {
+        super();
+        this.storagePrefix = storagePrefix;
+        this.logger = logger;
+    }
+    /**
+     * @override
+     */
+    retrieve(key, defaultValue = null) {
+        let fullKey = this.getFullKey(key);
+        let valueJson = localStorage.getItem(fullKey);
+        if (null == valueJson) {
+            return defaultValue;
+        }
+        try {
+            return JSON.parse(valueJson);
+        }
+        catch (e) {
+            this.logger.warn('Could not parse json value', valueJson, e);
+            localStorage.removeItem(fullKey);
+            return null;
+        }
+    }
+    /**
+     * @override
+     */
+    store(key, value) {
+        localStorage.setItem(this.getFullKey(key), JSON.stringify(value));
+    }
+    /**
+     * @override
+     */
+    remove(key) {
+        localStorage.removeItem(this.getFullKey(key));
+    }
+    getFullKey(key) {
+        return this.storagePrefix + '.' + key;
+    }
+}
+LocalStorageService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: LocalStorageService, deps: [{ token: DDR_STORAGE_PREFIX }, { token: LoggerService }], target: i0.ɵɵFactoryTarget.Injectable });
+LocalStorageService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: LocalStorageService });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: LocalStorageService, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [DDR_STORAGE_PREFIX]
+                }] }, { type: LoggerService }]; } });
+
 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.ɵ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,
+DdrExtensionsModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DdrExtensionsModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+DdrExtensionsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.12", 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: [
+DdrExtensionsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DdrExtensionsModule, providers: [
         {
             provide: DDR_LOGIN_PATH,
             useValue: '/login'
-        }
+        },
+        {
+            provide: LoggerService,
+            useClass: ConsoleLoggerService
+        },
+        {
+            provide: DDR_STORAGE_PREFIX,
+            useValue: 'ddr'
+        },
+        {
+            provide: StorageService,
+            useClass: LocalStorageService
+        },
     ] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: DdrExtensionsModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DdrExtensionsModule, decorators: [{
             type: NgModule,
             args: [{
                     declarations: [
@@ -292,7 +405,19 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImpor
                         {
                             provide: DDR_LOGIN_PATH,
                             useValue: '/login'
-                        }
+                        },
+                        {
+                            provide: LoggerService,
+                            useClass: ConsoleLoggerService
+                        },
+                        {
+                            provide: DDR_STORAGE_PREFIX,
+                            useValue: 'ddr'
+                        },
+                        {
+                            provide: StorageService,
+                            useClass: LocalStorageService
+                        },
                     ],
                     exports: [
                         LazyImageDirective,
@@ -419,9 +544,9 @@ class CookieService {
         return new RegExp('(?:^' + escapedName + '|;\\s*' + escapedName + ')=(.*?)(?:;|$)', 'g');
     }
 }
-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: [{
+CookieService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: CookieService, deps: [{ token: DOCUMENT }], target: i0.ɵɵFactoryTarget.Injectable });
+CookieService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: CookieService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: CookieService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -499,9 +624,9 @@ class ScrollService {
         }
     }
 }
-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: [{
+ScrollService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", 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.12", ngImport: i0, type: ScrollService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: ScrollService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -516,9 +641,9 @@ class VisibilityService {
         return this.visibility$;
     }
 }
-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: [{
+VisibilityService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: VisibilityService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+VisibilityService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: VisibilityService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: VisibilityService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: function () { return []; } });
@@ -534,9 +659,9 @@ class WithCredentialsInterceptor {
         return next.handle(cloned);
     }
 }
-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: [{
+WithCredentialsInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: WithCredentialsInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+WithCredentialsInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: WithCredentialsInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: WithCredentialsInterceptor, decorators: [{
             type: Injectable
         }] });
 
@@ -585,18 +710,254 @@ class RedirectToLoginInterceptor {
         }));
     }
 }
-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: [{
+RedirectToLoginInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", 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.12", ngImport: i0, type: RedirectToLoginInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: RedirectToLoginInterceptor, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: i1.Router }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [DDR_LOGIN_PATH]
                 }] }]; } });
 
+const DDR_OAUTH2_CONFIG = new InjectionToken('DDR_OAUTH2_CONFIG');
+class OAuth2Config {
+    constructor(clientId, redirectUri, authorizeUri, tokenUri) {
+        this.clientId = clientId;
+        this.redirectUri = redirectUri;
+        this.authorizeUri = authorizeUri;
+        this.tokenUri = tokenUri;
+    }
+}
+
+class OAuth2Error extends Error {
+    constructor(error) {
+        super(error);
+    }
+}
+OAuth2Error.CODE_NOT_FOUND = 'code_not_found';
+OAuth2Error.ACCESS_DENIED = 'access_denied';
+
+class OAuth2Service {
+    constructor(route, httpClient, config) {
+        this.route = route;
+        this.httpClient = httpClient;
+        this.config = config;
+        this.accessTokenString = null;
+        this.accessToken = null;
+        this.REFRESH_MARGIN_SECONDS = 60 * 10;
+        this.refreshTokenRequest$ = null;
+    }
+    redirectToLogin() {
+        const challenge = this.createChallenge();
+        localStorage.setItem(OAuth2Service.STORAGE_KEY_CHALLENGE, challenge);
+        const params = new HttpParams()
+            .set('client_id', this.config.clientId)
+            .set('response_type', 'code')
+            .set('redirect_uri', this.config.redirectUri)
+            .set('code_challenge', challenge)
+            .set('code_challenge_method', 'plain');
+        window.location.href = this.config.authorizeUri + '?' + params.toString();
+    }
+    handleCode() {
+        if (this.route.snapshot.queryParamMap.has('error')) {
+            const error = this.route.snapshot.queryParamMap.get('error');
+            return throwError(() => new OAuth2Error(error ?? 'Unknown error'));
+        }
+        if (!this.route.snapshot.queryParamMap.has('code')) {
+            return throwError(() => new OAuth2Error(OAuth2Error.CODE_NOT_FOUND));
+        }
+        const code = TypeUtils.notNull(this.route.snapshot.queryParamMap.get('code'));
+        const params = new HttpParams()
+            .set('grant_type', 'authorization_code')
+            .set('code', code)
+            .set('redirect_uri', this.config.redirectUri)
+            .set('code_verifier', TypeUtils.notNull(localStorage.getItem(OAuth2Service.STORAGE_KEY_CHALLENGE)))
+            .set('client_id', this.config.clientId);
+        return this.httpClient.post(this.config.tokenUri, params).pipe(map(tokenResponse => this.processTokenResponse(tokenResponse)));
+    }
+    createChallenge() {
+        return StringUtils.createRandomString(64, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-._~');
+    }
+    getRefreshToken() {
+        return localStorage.getItem(OAuth2Service.STORAGE_KEY_REFRESH_TOKEN);
+    }
+    getAccessTokenString() {
+        return this.accessTokenString;
+    }
+    isAccessTokenExpired() {
+        return (null == this.accessToken
+            || this.accessToken.exp * 1000 < Date.now());
+    }
+    isRefreshPossibleAndRequired(req = null) {
+        return ((null == req || !req.url.endsWith(this.config.tokenUri))
+            && null != this.getRefreshToken()
+            && (null == this.accessToken
+                || (this.accessToken.exp - this.REFRESH_MARGIN_SECONDS) * 1000 < Date.now()));
+    }
+    performRefresh() {
+        if (null == this.refreshTokenRequest$) {
+            console.log('Performing token refesh');
+            const params = new HttpParams()
+                .set('grant_type', 'refresh_token')
+                .set('refresh_token', TypeUtils.notNull(this.getRefreshToken()))
+                .set('client_id', this.config.clientId);
+            this.refreshTokenRequest$ = this.httpClient.post(this.config.tokenUri, params).pipe(map(tokenResponse => this.processTokenResponse(tokenResponse)), catchError(error => {
+                this.accessTokenString = null;
+                this.accessToken = null;
+                localStorage.removeItem(OAuth2Service.STORAGE_KEY_REFRESH_TOKEN);
+                this.refreshTokenRequest$ = null;
+                return throwError(error);
+            }), shareReplay(1));
+        }
+        return this.refreshTokenRequest$;
+    }
+    processTokenResponse(tokenResponse) {
+        localStorage.removeItem(OAuth2Service.STORAGE_KEY_CHALLENGE);
+        this.accessTokenString = tokenResponse.access_token;
+        this.accessToken = JSON.parse(atob(tokenResponse.access_token.split('.')[1]));
+        console.log('Access Token Expiry', new Date(this.accessToken.exp * 1000));
+        localStorage.setItem(OAuth2Service.STORAGE_KEY_REFRESH_TOKEN, tokenResponse.refresh_token);
+        return this.accessToken;
+    }
+    clear() {
+        this.accessToken = null;
+        this.accessTokenString = null;
+        localStorage.removeItem(OAuth2Service.STORAGE_KEY_REFRESH_TOKEN);
+        localStorage.removeItem(OAuth2Service.STORAGE_KEY_RETURN_URL);
+    }
+    setReturnUrl(url) {
+        localStorage.setItem(OAuth2Service.STORAGE_KEY_RETURN_URL, url);
+    }
+    getReturnUrl() {
+        return localStorage.getItem(OAuth2Service.STORAGE_KEY_RETURN_URL);
+    }
+}
+OAuth2Service.STORAGE_KEY_CHALLENGE = 'ddr_oauth2_challenge';
+OAuth2Service.STORAGE_KEY_REFRESH_TOKEN = 'ddr_oauth2_refresh_token';
+OAuth2Service.STORAGE_KEY_RETURN_URL = 'ddr_oauth2_return_url';
+OAuth2Service.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: OAuth2Service, deps: [{ token: i1.ActivatedRoute }, { token: i2$1.HttpClient }, { token: DDR_OAUTH2_CONFIG }], target: i0.ɵɵFactoryTarget.Injectable });
+OAuth2Service.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: OAuth2Service });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: OAuth2Service, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: i1.ActivatedRoute }, { type: i2$1.HttpClient }, { type: OAuth2Config, decorators: [{
+                    type: Inject,
+                    args: [DDR_OAUTH2_CONFIG]
+                }] }]; } });
+
+class OAuth2RefreshTokenInterceptor {
+    constructor(oAuth2Service) {
+        this.oAuth2Service = oAuth2Service;
+    }
+    /**
+     * @override
+     */
+    intercept(req, next) {
+        if (this.oAuth2Service.isRefreshPossibleAndRequired(req)) {
+            return this.oAuth2Service.performRefresh().pipe(switchMap(() => next.handle(req)));
+        }
+        return next.handle(req);
+    }
+}
+OAuth2RefreshTokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: OAuth2RefreshTokenInterceptor, deps: [{ token: OAuth2Service }], target: i0.ɵɵFactoryTarget.Injectable });
+OAuth2RefreshTokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: OAuth2RefreshTokenInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: OAuth2RefreshTokenInterceptor, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: OAuth2Service }]; } });
+
+class RedirectToOAuth2LoginInterceptor {
+    constructor(oAuth2Service, router, oAuth2Config) {
+        this.oAuth2Service = oAuth2Service;
+        this.router = router;
+        this.oAuth2Config = oAuth2Config;
+    }
+    /**
+     * @override
+     */
+    intercept(req, next) {
+        return next.handle(req).pipe(catchError((err) => {
+            if (err instanceof HttpErrorResponse) {
+                if (err.status === 401) {
+                    if (!window.location.href.startsWith(this.oAuth2Config.redirectUri)) {
+                        this.oAuth2Service.setReturnUrl(this.router.routerState.snapshot.url);
+                        this.oAuth2Service.redirectToLogin();
+                    }
+                }
+            }
+            return throwError(err);
+        }));
+    }
+}
+RedirectToOAuth2LoginInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: RedirectToOAuth2LoginInterceptor, deps: [{ token: OAuth2Service }, { token: i1.Router }, { token: DDR_OAUTH2_CONFIG }], target: i0.ɵɵFactoryTarget.Injectable });
+RedirectToOAuth2LoginInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: RedirectToOAuth2LoginInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: RedirectToOAuth2LoginInterceptor, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: OAuth2Service }, { type: i1.Router }, { type: OAuth2Config, decorators: [{
+                    type: Inject,
+                    args: [DDR_OAUTH2_CONFIG]
+                }] }]; } });
+
+class OAuth2AccessTokenInterceptor {
+    constructor(oAuth2Service) {
+        this.oAuth2Service = oAuth2Service;
+    }
+    /**
+     * @override
+     */
+    intercept(req, next) {
+        const accessTokenString = this.oAuth2Service.getAccessTokenString();
+        if (null !== accessTokenString && !this.oAuth2Service.isAccessTokenExpired()) {
+            req = req.clone({
+                headers: req.headers.set('Authorization', 'Bearer ' + accessTokenString)
+            });
+        }
+        return next.handle(req);
+    }
+}
+OAuth2AccessTokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: OAuth2AccessTokenInterceptor, deps: [{ token: OAuth2Service }], target: i0.ɵɵFactoryTarget.Injectable });
+OAuth2AccessTokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: OAuth2AccessTokenInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: OAuth2AccessTokenInterceptor, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: OAuth2Service }]; } });
+
+class OAuth2Module {
+    static forRoot(config) {
+        return {
+            ngModule: OAuth2Module,
+            providers: [
+                OAuth2Service,
+                {
+                    provide: DDR_OAUTH2_CONFIG,
+                    useValue: config
+                },
+                {
+                    provide: HTTP_INTERCEPTORS,
+                    useClass: OAuth2RefreshTokenInterceptor,
+                    multi: true
+                },
+                {
+                    provide: HTTP_INTERCEPTORS,
+                    useClass: RedirectToOAuth2LoginInterceptor,
+                    multi: true
+                },
+                {
+                    provide: HTTP_INTERCEPTORS,
+                    useClass: OAuth2AccessTokenInterceptor,
+                    multi: true
+                }
+            ],
+        };
+    }
+}
+OAuth2Module.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: OAuth2Module, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+OAuth2Module.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.12", ngImport: i0, type: OAuth2Module });
+OAuth2Module.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: OAuth2Module });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: OAuth2Module, decorators: [{
+            type: NgModule
+        }] });
+
 class JwtService {
-    constructor(storagePrefix) {
-        this.storagePrefix = storagePrefix;
+    constructor(storageService) {
+        this.storageService = storageService;
         /**
          * The current token.
          */
@@ -611,7 +972,7 @@ class JwtService {
      */
     setTokens(token, refreshToken) {
         this.setToken(token);
-        localStorage.setItem(this.getRefreshTokenStorageKey(), refreshToken);
+        this.storageService.store(this.getRefreshTokenStorageKey(), refreshToken);
     }
     /**
      * Sets the current token.
@@ -632,7 +993,7 @@ class JwtService {
      * Gets the refresh token.
      */
     getRefreshToken() {
-        return localStorage.getItem(this.getRefreshTokenStorageKey());
+        return this.storageService.retrieve(this.getRefreshTokenStorageKey());
     }
     /**
      * Checks if the current token expired.
@@ -655,23 +1016,20 @@ class JwtService {
     clear() {
         this.token = null;
         this.tokenExpiry = null;
-        localStorage.removeItem(this.getRefreshTokenStorageKey());
+        this.storageService.remove(this.getRefreshTokenStorageKey());
     }
     getRefreshTokenStorageKey() {
-        return this.storagePrefix + '.jwt.refresh_token';
+        return 'jwt.refresh_token';
     }
 }
-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: [{
+JwtService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: JwtService, deps: [{ token: StorageService }], target: i0.ɵɵFactoryTarget.Injectable });
+JwtService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: JwtService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: JwtService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [DDR_STORAGE_PREFIX]
-                }] }]; } });
+        }], ctorParameters: function () { return [{ type: StorageService }]; } });
 
 class JwtInterceptor {
     constructor(jwtService) {
@@ -690,9 +1048,9 @@ class JwtInterceptor {
         return next.handle(req);
     }
 }
-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: [{
+JwtInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: JwtInterceptor, deps: [{ token: JwtService }], target: i0.ɵɵFactoryTarget.Injectable });
+JwtInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: JwtInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: JwtInterceptor, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: JwtService }]; } });
 
@@ -730,9 +1088,9 @@ class JwtRefreshTokenInterceptor {
         return this.refreshTokenRequest$;
     }
 }
-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: [{
+JwtRefreshTokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", 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.12", ngImport: i0, type: JwtRefreshTokenInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: JwtRefreshTokenInterceptor, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: JwtService }, { type: i2$1.HttpClient }, { type: undefined, decorators: [{
                     type: Inject,
@@ -747,5 +1105,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImpor
  * 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, TypeUtils, UrlInfo, VisibilityService, WithCredentialsInterceptor };
+export { BottomHitDirective, CollectionUtils, CookieService, DDR_JWT_REFRESH_TOKEN_URL, DDR_LOGIN_PATH, DDR_STORAGE_PREFIX, DdrExtensionsModule, Debounce, JwtInterceptor, JwtRefreshTokenInterceptor, JwtService, LazyImageDirective, Limit, NumberUtils, OAuth2Error, OAuth2Module, OAuth2Service, ObjectUtils, RedirectToLoginInterceptor, ScrollService, StorageService, StringUtils, TypeUtils, UrlInfo, VisibilityService, WithCredentialsInterceptor };
 //# sourceMappingURL=dontdrinkandroot-ngx-extensions.mjs.map