@valtimo/keycloak 10.4.0 → 10.5.1

package/fesm2020/valtimo-keycloak.mjs

@@ -1,24 +1,24 @@
 import * as i0 from '@angular/core';
 import { Injectable, Component, NgModule } from '@angular/core';
 import * as i2 from 'keycloak-angular';
-import { KeycloakAngularModule, KeycloakAuthGuard, KeycloakEventType, KeycloakService } from 'keycloak-angular';
-import * as i1$1 from '@angular/router';
+import { KeycloakAuthGuard, KeycloakEventType, KeycloakAngularModule, KeycloakService } from 'keycloak-angular';
+import * as i1 from '@angular/router';
 import { RouterModule } from '@angular/router';
-import * as i1 from '@valtimo/config';
-import { ValtimoUserIdentity } from '@valtimo/config';
 import * as i3 from 'ngx-logger';
 import { NGXLogger } from 'ngx-logger';
-import * as i6 from '@angular/common';
-import { CommonModule, DatePipe } from '@angular/common';
-import * as i5 from '@ngx-translate/core';
-import { TranslateModule } from '@ngx-translate/core';
+import * as i1$1 from '@valtimo/config';
+import { ValtimoUserIdentity } from '@valtimo/config';
 import { Subject, ReplaySubject, timer, map, switchMap, combineLatest } from 'rxjs';
 import jwt_decode from 'jwt-decode';
 import { take } from 'rxjs/operators';
 import * as i4 from '@valtimo/user-interface';
+import * as i5 from '@ngx-translate/core';
+import { TranslateModule } from '@ngx-translate/core';
+import * as i6 from '@angular/common';
+import { CommonModule, DatePipe } from '@angular/common';
 
 /*
- * Copyright 2015-2020 Ritense BV, the Netherlands.
+ * Copyright 2015-2023 Ritense BV, the Netherlands.
  *
  * Licensed under EUPL, Version 1.2 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ import * as i4 from '@valtimo/user-interface';
  */
 
 /*
- * Copyright 2015-2020 Ritense BV, the Netherlands.
+ * Copyright 2015-2023 Ritense BV, the Netherlands.
  *
  * Licensed under EUPL, Version 1.2 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,81 +49,8 @@ import * as i4 from '@valtimo/user-interface';
  * limitations under the License.
  */
 
-class KeycloakOptionsService {
-    constructor(configService) {
-        this.configService = configService;
-        this.valtimoKeycloakOptions = configService.config.authentication.options;
-    }
-    get keycloakOptions() {
-        return this.valtimoKeycloakOptions.keycloakOptions;
-    }
-    get logoutRedirectUri() {
-        return this.valtimoKeycloakOptions.logoutRedirectUri;
-    }
-}
-KeycloakOptionsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakOptionsService, deps: [{ token: i1.ConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
-KeycloakOptionsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakOptionsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakOptionsService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: function () { return [{ type: i1.ConfigService }]; } });
-
-/*
- * Copyright 2015-2020 Ritense BV, the Netherlands.
- *
- * Licensed under EUPL, Version 1.2 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-class CallbackComponent {
-    constructor(router, keycloakOptionsService, logger) {
-        this.router = router;
-        this.keycloakOptionsService = keycloakOptionsService;
-        this.logger = logger;
-        logger.debug('callback');
-        const savedRedirectTo = window.sessionStorage.getItem('redirectTo');
-        const savedRedirectToParams = window.sessionStorage.getItem('redirectToParams');
-        const parsedSavedRedirectToParams = typeof savedRedirectToParams === 'string' &&
-            savedRedirectToParams.length > 2 &&
-            JSON.parse(savedRedirectToParams);
-        let redirectTo;
-        let redirectToParams;
-        if (savedRedirectTo) {
-            redirectTo = savedRedirectTo;
-        }
-        else {
-            redirectTo = '/';
-        }
-        if (savedRedirectToParams && parsedSavedRedirectToParams) {
-            redirectToParams = parsedSavedRedirectToParams;
-        }
-        logger.debug('keycloak callback redirect =', redirectTo);
-        logger.debug('keycloak callback redirect params =', savedRedirectToParams);
-        this.router.navigate([redirectTo], { queryParams: redirectToParams || {} });
-    }
-}
-CallbackComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: CallbackComponent, deps: [{ token: i1$1.Router }, { token: KeycloakOptionsService }, { token: i3.NGXLogger }], target: i0.ɵɵFactoryTarget.Component });
-CallbackComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.12", type: CallbackComponent, selector: "valtimo-keycloak-callback", ngImport: i0, template: '', isInline: true });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: CallbackComponent, decorators: [{
-            type: Component,
-            args: [{
-                    selector: 'valtimo-keycloak-callback',
-                    template: '',
-                }]
-        }], ctorParameters: function () { return [{ type: i1$1.Router }, { type: KeycloakOptionsService }, { type: i3.NGXLogger }]; } });
-
 /*
- * Copyright 2015-2020 Ritense BV, the Netherlands.
+ * Copyright 2015-2023 Ritense BV, the Netherlands.
  *
  * Licensed under EUPL, Version 1.2 (the "License");
  * you may not use this file except in compliance with the License.
@@ -137,28 +64,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const routes = [
-    {
-        path: 'keycloak/callback',
-        component: CallbackComponent,
-        data: { title: 'Loading...' },
-    },
-];
-class KeycloakRoutingModule {
-}
-KeycloakRoutingModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakRoutingModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-KeycloakRoutingModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.12", ngImport: i0, type: KeycloakRoutingModule, imports: [CommonModule, i1$1.RouterModule], exports: [RouterModule] });
-KeycloakRoutingModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakRoutingModule, imports: [CommonModule, RouterModule.forChild(routes), RouterModule] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakRoutingModule, decorators: [{
-            type: NgModule,
-            args: [{
-                    imports: [CommonModule, RouterModule.forChild(routes)],
-                    exports: [RouterModule],
-                }]
-        }] });
+const STORAGE_KEYS = {
+    urlBeforeExpiration: 'urlBeforeExpiration',
+    urlBeforeExpirationParams: 'urlBeforeExpirationParams',
+    redirectTo: 'redirectTo',
+    redirectToParams: 'redirectToParams',
+};
 
 /*
- * Copyright 2015-2020 Ritense BV, the Netherlands.
+ * Copyright 2015-2023 Ritense BV, the Netherlands.
  *
  * Licensed under EUPL, Version 1.2 (the "License");
  * you may not use this file except in compliance with the License.
@@ -172,23 +86,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-class KeycloakModule {
-}
-KeycloakModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-KeycloakModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.12", ngImport: i0, type: KeycloakModule, declarations: [CallbackComponent], imports: [KeycloakRoutingModule, KeycloakAngularModule, TranslateModule], exports: [CallbackComponent] });
-KeycloakModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakModule, providers: [DatePipe], imports: [KeycloakRoutingModule, KeycloakAngularModule, TranslateModule] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakModule, decorators: [{
-            type: NgModule,
-            args: [{
-                    declarations: [CallbackComponent],
-                    imports: [KeycloakRoutingModule, KeycloakAngularModule, TranslateModule],
-                    exports: [CallbackComponent],
-                    providers: [DatePipe],
-                }]
-        }] });
 
 /*
- * Copyright 2015-2020 Ritense BV, the Netherlands.
+ * Copyright 2015-2023 Ritense BV, the Netherlands.
  *
  * Licensed under EUPL, Version 1.2 (the "License");
  * you may not use this file except in compliance with the License.
@@ -233,17 +133,79 @@ class KeycloakAuthGuardService extends KeycloakAuthGuard {
         });
     }
 }
-KeycloakAuthGuardService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakAuthGuardService, deps: [{ token: i1$1.Router }, { token: i2.KeycloakService }, { token: i3.NGXLogger }], target: i0.ɵɵFactoryTarget.Injectable });
+KeycloakAuthGuardService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakAuthGuardService, deps: [{ token: i1.Router }, { token: i2.KeycloakService }, { token: i3.NGXLogger }], target: i0.ɵɵFactoryTarget.Injectable });
 KeycloakAuthGuardService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakAuthGuardService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakAuthGuardService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: i1$1.Router }, { type: i2.KeycloakService }, { type: i3.NGXLogger }]; } });
+        }], ctorParameters: function () { return [{ type: i1.Router }, { type: i2.KeycloakService }, { type: i3.NGXLogger }]; } });
+
+class KeycloakOptionsService {
+    constructor(configService) {
+        this.configService = configService;
+        this.valtimoKeycloakOptions = configService.config.authentication.options;
+    }
+    get keycloakOptions() {
+        return this.valtimoKeycloakOptions.keycloakOptions;
+    }
+    get logoutRedirectUri() {
+        return this.valtimoKeycloakOptions.logoutRedirectUri;
+    }
+}
+KeycloakOptionsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakOptionsService, deps: [{ token: i1$1.ConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
+KeycloakOptionsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakOptionsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakOptionsService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: function () { return [{ type: i1$1.ConfigService }]; } });
 
 /*
- * Copyright 2015-2020 Ritense BV, the Netherlands.
+ * Copyright 2015-2023 Ritense BV, the Netherlands.
+ *
+ * Licensed under EUPL, Version 1.2 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class KeycloakStorageService {
+    getCurrentUrlParams() {
+        const urlSearchParams = new URLSearchParams(window.location.search);
+        const params = Object.fromEntries(urlSearchParams.entries());
+        return JSON.stringify(params);
+    }
+    getCurrentUrl() {
+        return window.location.pathname;
+    }
+    parseSavedParams(savedParams) {
+        return ((savedParams &&
+            typeof savedParams === 'string' &&
+            savedParams.length > 2 &&
+            JSON.parse(savedParams)) ||
+            {});
+    }
+}
+KeycloakStorageService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakStorageService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+KeycloakStorageService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakStorageService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakStorageService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }] });
+
+/*
+ * Copyright 2015-2023 Ritense BV, the Netherlands.
  *
  * Licensed under EUPL, Version 1.2 (the "License");
  * you may not use this file except in compliance with the License.
@@ -258,13 +220,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
  * limitations under the License.
  */
 class KeycloakUserService {
-    constructor(keycloakService, keycloakOptionsService, logger, promptService, translateService, datePipe) {
+    constructor(keycloakService, keycloakOptionsService, logger, promptService, translateService, datePipe, configService, router, keycloakStorageService) {
         this.keycloakService = keycloakService;
         this.keycloakOptionsService = keycloakOptionsService;
         this.logger = logger;
         this.promptService = promptService;
         this.translateService = translateService;
         this.datePipe = datePipe;
+        this.configService = configService;
+        this.router = router;
+        this.keycloakStorageService = keycloakStorageService;
         this._refreshToken$ = new Subject();
         this.FIVE_MINUTES_MS = 300000;
         this.EXPIRE_TOKEN_CONFIRMATION = 'EXPIRE_TOKEN_CONFIRMATION';
@@ -350,30 +315,14 @@ class KeycloakUserService {
             this.promptService.identifier$.pipe(take(1)).subscribe(identifier => {
                 if ((!promptVisible || identifier !== this.EXPIRE_TOKEN_CONFIRMATION) &&
                     this._expiryTimeMs <= this.FIVE_MINUTES_MS) {
-                    this.promptService.openPrompt({
-                        identifier: this.EXPIRE_TOKEN_CONFIRMATION,
-                        headerText,
-                        bodyText,
-                        cancelButtonText,
-                        confirmButtonText,
-                        cancelMdiIcon: 'logout',
-                        confirmMdiIcon: 'check',
-                        closeOnConfirm: true,
-                        closeOnCancel: false,
-                        cancelCallbackFunction: () => {
-                            this.keycloakService.logout();
-                        },
-                        confirmCallBackFunction: () => {
-                            this.closeExpiryTimerSubscription();
-                            this.updateToken(20);
-                        },
-                    });
+                    this.openConfirmationPrompt(headerText, bodyText, cancelButtonText, confirmButtonText);
                 }
                 if (promptVisible && identifier === this.EXPIRE_TOKEN_CONFIRMATION) {
                     this.promptService.setBodyText(bodyText);
                 }
             });
             if (this._expiryTimeMs < 2000) {
+                this.saveUrl();
                 this.logout();
             }
         });
@@ -381,18 +330,183 @@ class KeycloakUserService {
     closeExpiryTimerSubscription() {
         this.expiryTimerSubscription?.unsubscribe();
     }
+    openConfirmationPrompt(headerText, bodyText, cancelButtonText, confirmButtonText) {
+        this.promptService.openPrompt({
+            identifier: this.EXPIRE_TOKEN_CONFIRMATION,
+            headerText,
+            bodyText,
+            cancelButtonText,
+            confirmButtonText,
+            cancelMdiIcon: 'logout',
+            confirmMdiIcon: 'check',
+            closeOnConfirm: true,
+            closeOnCancel: false,
+            cancelCallbackFunction: () => {
+                this.keycloakService.logout();
+            },
+            confirmCallBackFunction: () => {
+                this.closeExpiryTimerSubscription();
+                this.updateToken(20);
+            },
+        });
+    }
+    saveUrl() {
+        const returnToLastUrlAfterTokenExpiration = this.configService?.config?.featureToggles?.returnToLastUrlAfterTokenExpiration;
+        if (returnToLastUrlAfterTokenExpiration) {
+            sessionStorage.setItem(STORAGE_KEYS.urlBeforeExpiration, this.keycloakStorageService.getCurrentUrl());
+            sessionStorage.setItem(STORAGE_KEYS.urlBeforeExpirationParams, this.keycloakStorageService.getCurrentUrlParams());
+        }
+    }
 }
-KeycloakUserService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakUserService, deps: [{ token: i2.KeycloakService }, { token: KeycloakOptionsService }, { token: i3.NGXLogger }, { token: i4.PromptService }, { token: i5.TranslateService }, { token: i6.DatePipe }], target: i0.ɵɵFactoryTarget.Injectable });
+KeycloakUserService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakUserService, deps: [{ token: i2.KeycloakService }, { token: KeycloakOptionsService }, { token: i3.NGXLogger }, { token: i4.PromptService }, { token: i5.TranslateService }, { token: i6.DatePipe }, { token: i1$1.ConfigService }, { token: i1.Router }, { token: KeycloakStorageService }], target: i0.ɵɵFactoryTarget.Injectable });
 KeycloakUserService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakUserService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakUserService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: i2.KeycloakService }, { type: KeycloakOptionsService }, { type: i3.NGXLogger }, { type: i4.PromptService }, { type: i5.TranslateService }, { type: i6.DatePipe }]; } });
+        }], ctorParameters: function () { return [{ type: i2.KeycloakService }, { type: KeycloakOptionsService }, { type: i3.NGXLogger }, { type: i4.PromptService }, { type: i5.TranslateService }, { type: i6.DatePipe }, { type: i1$1.ConfigService }, { type: i1.Router }, { type: KeycloakStorageService }]; } });
+
+/*
+ * Copyright 2015-2023 Ritense BV, the Netherlands.
+ *
+ * Licensed under EUPL, Version 1.2 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Copyright 2015-2023 Ritense BV, the Netherlands.
+ *
+ * Licensed under EUPL, Version 1.2 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class CallbackComponent {
+    constructor(router, keycloakOptionsService, logger, keycloakStorageService) {
+        this.router = router;
+        this.keycloakOptionsService = keycloakOptionsService;
+        this.logger = logger;
+        this.keycloakStorageService = keycloakStorageService;
+        logger.debug('callback');
+        const savedRedirectTo = window.sessionStorage.getItem(STORAGE_KEYS.redirectTo);
+        const savedRedirectToParams = window.sessionStorage.getItem(STORAGE_KEYS.redirectToParams);
+        const parsedSavedRedirectToParams = this.keycloakStorageService.parseSavedParams(savedRedirectToParams);
+        const urlBeforeExpiration = sessionStorage.getItem(STORAGE_KEYS.urlBeforeExpiration);
+        const paramsBeforeExpiration = sessionStorage.getItem(STORAGE_KEYS.urlBeforeExpirationParams);
+        const parsedParamsBeforeExpiration = this.keycloakStorageService.parseSavedParams(paramsBeforeExpiration);
+        let redirectTo;
+        if (savedRedirectTo) {
+            redirectTo = savedRedirectTo;
+        }
+        else {
+            redirectTo = '/';
+        }
+        logger.debug('keycloak callback redirect =', redirectTo);
+        logger.debug('keycloak callback redirect params =', savedRedirectToParams);
+        if (STORAGE_KEYS.urlBeforeExpiration in sessionStorage) {
+            this.router.navigate([urlBeforeExpiration], { queryParams: parsedParamsBeforeExpiration });
+            sessionStorage.removeItem(STORAGE_KEYS.urlBeforeExpiration);
+            sessionStorage.removeItem(STORAGE_KEYS.urlBeforeExpirationParams);
+        }
+        else {
+            this.router.navigate([redirectTo], { queryParams: parsedSavedRedirectToParams });
+        }
+    }
+}
+CallbackComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: CallbackComponent, deps: [{ token: i1.Router }, { token: KeycloakOptionsService }, { token: i3.NGXLogger }, { token: KeycloakStorageService }], target: i0.ɵɵFactoryTarget.Component });
+CallbackComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.12", type: CallbackComponent, selector: "valtimo-keycloak-callback", ngImport: i0, template: '', isInline: true });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: CallbackComponent, decorators: [{
+            type: Component,
+            args: [{
+                    selector: 'valtimo-keycloak-callback',
+                    template: '',
+                }]
+        }], ctorParameters: function () { return [{ type: i1.Router }, { type: KeycloakOptionsService }, { type: i3.NGXLogger }, { type: KeycloakStorageService }]; } });
+
+/*
+ * Copyright 2015-2023 Ritense BV, the Netherlands.
+ *
+ * Licensed under EUPL, Version 1.2 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const routes = [
+    {
+        path: 'keycloak/callback',
+        component: CallbackComponent,
+        data: { title: 'Loading...' },
+    },
+];
+class KeycloakRoutingModule {
+}
+KeycloakRoutingModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakRoutingModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+KeycloakRoutingModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.12", ngImport: i0, type: KeycloakRoutingModule, imports: [CommonModule, i1.RouterModule], exports: [RouterModule] });
+KeycloakRoutingModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakRoutingModule, imports: [CommonModule, RouterModule.forChild(routes), RouterModule] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakRoutingModule, decorators: [{
+            type: NgModule,
+            args: [{
+                    imports: [CommonModule, RouterModule.forChild(routes)],
+                    exports: [RouterModule],
+                }]
+        }] });
+
+/*
+ * Copyright 2015-2023 Ritense BV, the Netherlands.
+ *
+ * Licensed under EUPL, Version 1.2 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class KeycloakModule {
+}
+KeycloakModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+KeycloakModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.12", ngImport: i0, type: KeycloakModule, declarations: [CallbackComponent], imports: [KeycloakRoutingModule, KeycloakAngularModule, TranslateModule], exports: [CallbackComponent] });
+KeycloakModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakModule, providers: [DatePipe], imports: [KeycloakRoutingModule, KeycloakAngularModule, TranslateModule] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: KeycloakModule, decorators: [{
+            type: NgModule,
+            args: [{
+                    declarations: [CallbackComponent],
+                    imports: [KeycloakRoutingModule, KeycloakAngularModule, TranslateModule],
+                    exports: [CallbackComponent],
+                    providers: [DatePipe],
+                }]
+        }] });
 
 /*
- * Copyright 2015-2020 Ritense BV, the Netherlands.
+ * Copyright 2015-2023 Ritense BV, the Netherlands.
  *
  * Licensed under EUPL, Version 1.2 (the "License");
  * you may not use this file except in compliance with the License.
@@ -410,6 +524,7 @@ function keycloakInitializer(injector) {
     const keycloakService = injector.get(KeycloakService);
     const keycloakUserService = injector.get(KeycloakUserService);
     const optionsService = injector.get(KeycloakOptionsService); // TODO possible removal of abstraction
+    const storageService = injector.get(KeycloakStorageService);
     const logger = injector.get(NGXLogger);
     return async () => {
         try {
@@ -417,12 +532,10 @@ function keycloakInitializer(injector) {
             const keycloakOptions = optionsService.keycloakOptions;
             const currentUrl = window.location.href.split('#')[0];
             if (keycloakOptions.initOptions.redirectUri !== currentUrl) {
-                const redirectTo = window.location.pathname;
-                const urlSearchParams = new URLSearchParams(window.location.search);
-                const params = Object.fromEntries(urlSearchParams.entries());
+                const redirectTo = storageService.getCurrentUrl();
                 logger.debug('Setting redirectTo =', redirectTo);
-                window.sessionStorage.setItem('redirectTo', redirectTo);
-                window.sessionStorage.setItem('redirectToParams', JSON.stringify(params));
+                window.sessionStorage.setItem(STORAGE_KEYS.redirectTo, redirectTo);
+                window.sessionStorage.setItem(STORAGE_KEYS.redirectToParams, storageService.getCurrentUrlParams());
             }
             const initResult = await keycloakService.init(keycloakOptions);
             logger.debug('Keycloak initializer after init');
@@ -437,7 +550,7 @@ function keycloakInitializer(injector) {
 }
 
 /*
- * Copyright 2015-2020 Ritense BV, the Netherlands.
+ * Copyright 2015-2023 Ritense BV, the Netherlands.
  *
  * Licensed under EUPL, Version 1.2 (the "License");
  * you may not use this file except in compliance with the License.
@@ -456,5 +569,5 @@ function keycloakInitializer(injector) {
  * Generated bundle index. Do not edit.
  */
 
-export { CallbackComponent, KeycloakAuthGuardService, KeycloakModule, KeycloakOptionsService, KeycloakUserService, keycloakInitializer };
+export { CallbackComponent, KeycloakAuthGuardService, KeycloakModule, KeycloakOptionsService, KeycloakUserService, STORAGE_KEYS, keycloakInitializer };
 //# sourceMappingURL=valtimo-keycloak.mjs.map