@openmfp/portal-ui-lib 0.187.2 → 0.189.0

package/README.md

@@ -34,6 +34,7 @@ The main features of this library are:
       - [The luigiAuthEventsCallbacksService Option](#the-luigiautheventscallbacksservice-option)
       - [The customMessageListeners Option](#the-custommessagelisteners-option)
       - [The customGlobalNodesService Option](#the-customglobalnodesservice-option)
+      - [The navigationRedirectStrategy Option](#the-navigationredirectstrategy-option)
     - [Listen and react to Authentication Events](#listen-and-react-to-authentication-events)
     - [Configure Proxy for Backend REST Calls](#configure-proxy-for-backend-rest-calls)
     - [Start your Project](#start-your-project)
@@ -634,6 +635,39 @@ const portalOptions: PortalOptions = {
 }
 ```
 
+#### The navigationRedirectStrategy Option
+
+This option allows you to customize where and how the portal stores the URL to redirect the user to after login (for example after session expiry or logout). By default the library uses `localStorage`. You can provide your own implementation of `NavigationRedirectStrategy` to use session storage, a backend, or custom logic.
+
+```ts
+import { Injectable } from '@angular/core';
+import { NavigationRedirectStrategy } from '@openmfp/portal-ui-lib';
+
+@Injectable()
+export class CustomNavigationRedirectStrategy implements NavigationRedirectStrategy {
+  getRedirectUrl(): string {
+    return sessionStorage.getItem('returnUrl') || '/';
+  }
+
+  saveRedirectUrl(url: string): void {
+    sessionStorage.setItem('returnUrl', url);
+  }
+
+  clearRedirectUrl(): void {
+    sessionStorage.removeItem('returnUrl');
+  }
+}
+```
+
+In your `main.ts` you can provide your custom implementation like so:
+
+```ts
+const portalOptions: PortalOptions = {
+  navigationRedirectStrategy: CustomNavigationRedirectStrategy,
+  // ... other portal options
+}
+```
+
 ### Listen and react to Authentication Events
 
 There are following Authentication Events, to which the library consuming application can subscribe and react upon, in case required.

package/fesm2022/openmfp-portal-ui-lib.mjs

@@ -4,7 +4,7 @@ import * as i1 from '@angular/common/http';
 import { HttpHeaders, HttpErrorResponse, HttpClient, provideHttpClient } from '@angular/common/http';
 import { firstValueFrom, Subject, lastValueFrom, tap, filter } from 'rxjs';
 import * as i1$1 from '@angular/router';
-import { ActivatedRoute, NavigationEnd, NavigationStart, RouterOutlet, RouteReuseStrategy, provideRouter } from '@angular/router';
+import { ActivatedRoute, NavigationEnd, RouterOutlet, RouteReuseStrategy, provideRouter } from '@angular/router';
 import { jwtDecode } from 'jwt-decode';
 import isEqual from 'lodash.isequal';
 import oAuth2 from '@luigi-project/plugin-auth-oauth2';
@@ -406,6 +406,7 @@ const LUIGI_CUSTOM_NODE_CONTEXT_PROCESSING_SERVICE_INJECTION_TOKEN = 'OPENMFP_LU
 const LUIGI_AUTH_EVENTS_CALLBACKS_SERVICE_INJECTION_TOKEN = 'OPENMFP_LUIGI_AUTH_EVENTS_CALLBACKS_SERVICE';
 const HEADER_BAR_CONFIG_SERVICE_INJECTION_TOKEN = 'OPENMFP_HEADER_BAR_CONFIG_SERVICE';
 const LUIGI_ROUTING_CONFIG_SERVICE_INJECTION_TOKEN = 'OPENMFP_LUIGI_ROUTING_CONFIG_SERVICE';
+const NAVIGATION_REDIRECT_STRATEGY_INJECTION_TOKEN = 'OPENMFP_NAVIGATION_REDIRECT_STRATEGY';
 
 class GlobalContextConfigService {
     constructor() {
@@ -774,6 +775,23 @@ const featureToggleLocalStorage = {
     },
 };
 
+class DefaultNavigationRedirectStrategy {
+    getRedirectUrl() {
+        return localStorage.getItem(LocalStorageKeys.LAST_NAVIGATION_URL) || '/';
+    }
+    saveRedirectUrl(url) {
+        localStorage.setItem(LocalStorageKeys.LAST_NAVIGATION_URL, url);
+    }
+    clearRedirectUrl() {
+        localStorage.setItem(LocalStorageKeys.LAST_NAVIGATION_URL, '');
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.2", ngImport: i0, type: DefaultNavigationRedirectStrategy, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.1.2", ngImport: i0, type: DefaultNavigationRedirectStrategy }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.2", ngImport: i0, type: DefaultNavigationRedirectStrategy, decorators: [{
+            type: Injectable
+        }] });
+
 class IframeService {
     constructor() {
         this.luigiCoreService = inject(LuigiCoreService);
@@ -1772,56 +1790,43 @@ async function initializeAutomaticSessionRefresh(sessionRefreshService, authServ
 const provideSessionRefresh = () => provideAppInitializer(() => initializeAutomaticSessionRefresh(inject(SessionRefreshService), inject(AuthService)));
 
 class NavigationService {
-    constructor(router, authService, loginEventService) {
+    constructor(router, authService, loginEventService, navigationRedirectStrategy) {
         this.router = router;
         this.authService = authService;
         this.loginEventService = loginEventService;
+        this.navigationRedirectStrategy = navigationRedirectStrategy;
+        this.lastUrl = '/';
     }
     track() {
         this.router.events
             .pipe(filter$1((event) => event instanceof NavigationEnd))
             .subscribe((event) => {
-            this.currentUrl = event.url;
-        });
-        this.router.events
-            .pipe(filter$1((event) => event instanceof NavigationStart))
-            .subscribe((event) => {
-            this.previousUrl = event.url;
+            this.lastUrl = event.url;
         });
         this.authService.authEvents
-            .pipe(filter$1((event) => event === AuthEvent.AUTH_EXPIRED))
-            .subscribe({ next: () => this.saveCurrentUrl() });
-        this.authService.authEvents
-            .pipe(filter$1((event) => event === AuthEvent.LOGOUT))
-            .subscribe({
-            next: () => {
-                this.saveLastNavigationUrl();
-            },
+            .pipe(filter$1((event) => event === AuthEvent.AUTH_EXPIRED || event === AuthEvent.LOGOUT))
+            .subscribe(() => {
+            this.saveRedirectUrl();
         });
         this.loginEventService.loginEvents
             .pipe(filter$1((event) => event.type === LoginEventType.LOGIN_TRIGGERED))
-            .subscribe({
-            next: (event) => {
-                this.router.navigate([this.getRedirectUrl()], {
-                    queryParams: event.queryParams,
-                });
-                this.clearCurrentUrl();
-            },
+            .subscribe((event) => {
+            this.router.navigate([this.getRedirectUrl()], {
+                queryParams: event.queryParams,
+            });
+            this.clearRedirectUrl();
         });
     }
-    clearCurrentUrl() {
-        localStorage.setItem(LocalStorageKeys.LAST_NAVIGATION_URL, '');
-    }
-    saveCurrentUrl() {
-        localStorage.setItem(LocalStorageKeys.LAST_NAVIGATION_URL, this.currentUrl);
+    saveRedirectUrl() {
+        this.navigationRedirectStrategy.saveRedirectUrl(this.lastUrl);
     }
-    saveLastNavigationUrl() {
-        localStorage.setItem(LocalStorageKeys.LAST_NAVIGATION_URL, this.previousUrl);
+    clearRedirectUrl() {
+        this.navigationRedirectStrategy.clearRedirectUrl();
     }
     getRedirectUrl() {
-        return localStorage.getItem(LocalStorageKeys.LAST_NAVIGATION_URL) || '/';
+        return this.navigationRedirectStrategy.getRedirectUrl();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.2", ngImport: i0, type: NavigationService, deps: [{ token: i1$1.Router }, { token: AuthService }, { token: LoginEventService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.2", ngImport: i0, type: NavigationService, deps: [{ token: i1$1.Router }, { token: AuthService }, { token: LoginEventService }, { token: NAVIGATION_REDIRECT_STRATEGY_INJECTION_TOKEN }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.1.2", ngImport: i0, type: NavigationService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.2", ngImport: i0, type: NavigationService, decorators: [{
@@ -1829,7 +1834,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.2", ngImpor
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: () => [{ type: i1$1.Router }, { type: AuthService }, { type: LoginEventService }] });
+        }], ctorParameters: () => [{ type: i1$1.Router }, { type: AuthService }, { type: LoginEventService }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: [NAVIGATION_REDIRECT_STRATEGY_INJECTION_TOKEN]
+                }] }] });
 
 async function track(navigationService) {
     navigationService.track();
@@ -2447,8 +2455,8 @@ class NavigationConfigService {
             nodeAccessibilityResolver: this.luigiNodesService.nodePolicyResolver,
             validWebcomponentUrls: envConfig.validWebcomponentUrls,
             intentMapping: this.intentNavigationService.buildIntentMappings(allNodes),
-            nodeChangeHook: function (prevNode, nextNode) {
-                this.nodeChangeHookConfigService?.nodeChangeHook(prevNode, nextNode);
+            nodeChangeHook: function (prevNode, nextNode, ctx) {
+                this.nodeChangeHookConfigService?.nodeChangeHook(prevNode, nextNode, ctx.currentContext);
             }.bind(this),
             breadcrumbs: await this.headerBarService.getConfig(),
         };
@@ -2726,6 +2734,10 @@ const addOptionalProviders = (options) => {
             useClass: options.routingConfigService,
         });
     }
+    providers.push({
+        provide: NAVIGATION_REDIRECT_STRATEGY_INJECTION_TOKEN,
+        useClass: options.navigationRedirectStrategy || DefaultNavigationRedirectStrategy,
+    });
     return providers;
 };
 
@@ -2737,5 +2749,5 @@ const addOptionalProviders = (options) => {
  * Generated bundle index. Do not edit.
  */
 
-export { AppSwitcherConfigServiceImpl, AuthConfigService, AuthEvent, AuthService, ConfigService, CustomMessageListenersService, CustomReuseStrategy, DefaultUserProfileConfigService, ERROR_COMPONENT_CONFIG, EntityType, EnvConfigService, GlobalContextConfigService, HEADER_BAR_CONFIG_SERVICE_INJECTION_TOKEN, HeaderBarService, I18nService, IframeService, LOCAL_CONFIGURATION_SERVICE_INJECTION_TOKEN, LUIGI_APP_SWITCHER_CONFIG_SERVICE_INJECTION_TOKEN, LUIGI_AUTH_EVENTS_CALLBACKS_SERVICE_INJECTION_TOKEN, LUIGI_BREADCRUMB_CONFIG_SERVICE_INJECTION_TOKEN, LUIGI_CUSTOM_MESSAGE_LISTENERS_INJECTION_TOKEN, LUIGI_CUSTOM_NODE_CONTEXT_PROCESSING_SERVICE_INJECTION_TOKEN, LUIGI_CUSTOM_NODE_PROCESSING_SERVICE_INJECTION_TOKEN, LUIGI_EXTENDED_GLOBAL_CONTEXT_CONFIG_SERVICE_INJECTION_TOKEN, LUIGI_GLOBAL_SEARCH_CONFIG_SERVICE_INJECTION_TOKEN, LUIGI_NODES_CUSTOM_GLOBAL_SERVICE_INJECTION_TOKEN, LUIGI_NODE_CHANGE_HOOK_SERVICE_INJECTION_TOKEN, LUIGI_ROUTING_CONFIG_SERVICE_INJECTION_TOKEN, LUIGI_STATIC_SETTINGS_CONFIG_SERVICE_INJECTION_TOKEN, LUIGI_USER_PROFILE_CONFIG_SERVICE_INJECTION_TOKEN, LocalConfigurationServiceImpl, LocalNodesService, LocalStorageKeys, LoginEventService, LoginEventType, LuigiCoreService, LuigiNodesService, NetworkVisibility, NodeContextProcessingServiceImpl, NodeUtilsService, PortalComponent, RequestHeadersService, RoutingConfigServiceImpl, SessionRefreshService, StaticSettingsConfigServiceImpl, THEMING_SERVICE, UserSettingsConfigService, featureToggleLocalStorage, localDevelopmentSettingsLocalStorage, matchesJMESPath, providePortal, userSettingsLocalStorage };
+export { AppSwitcherConfigServiceImpl, AuthConfigService, AuthEvent, AuthService, ConfigService, CustomMessageListenersService, CustomReuseStrategy, DefaultNavigationRedirectStrategy, DefaultUserProfileConfigService, ERROR_COMPONENT_CONFIG, EntityType, EnvConfigService, GlobalContextConfigService, HEADER_BAR_CONFIG_SERVICE_INJECTION_TOKEN, HeaderBarService, I18nService, IframeService, LOCAL_CONFIGURATION_SERVICE_INJECTION_TOKEN, LUIGI_APP_SWITCHER_CONFIG_SERVICE_INJECTION_TOKEN, LUIGI_AUTH_EVENTS_CALLBACKS_SERVICE_INJECTION_TOKEN, LUIGI_BREADCRUMB_CONFIG_SERVICE_INJECTION_TOKEN, LUIGI_CUSTOM_MESSAGE_LISTENERS_INJECTION_TOKEN, LUIGI_CUSTOM_NODE_CONTEXT_PROCESSING_SERVICE_INJECTION_TOKEN, LUIGI_CUSTOM_NODE_PROCESSING_SERVICE_INJECTION_TOKEN, LUIGI_EXTENDED_GLOBAL_CONTEXT_CONFIG_SERVICE_INJECTION_TOKEN, LUIGI_GLOBAL_SEARCH_CONFIG_SERVICE_INJECTION_TOKEN, LUIGI_NODES_CUSTOM_GLOBAL_SERVICE_INJECTION_TOKEN, LUIGI_NODE_CHANGE_HOOK_SERVICE_INJECTION_TOKEN, LUIGI_ROUTING_CONFIG_SERVICE_INJECTION_TOKEN, LUIGI_STATIC_SETTINGS_CONFIG_SERVICE_INJECTION_TOKEN, LUIGI_USER_PROFILE_CONFIG_SERVICE_INJECTION_TOKEN, LocalConfigurationServiceImpl, LocalNodesService, LocalStorageKeys, LoginEventService, LoginEventType, LuigiCoreService, LuigiNodesService, NAVIGATION_REDIRECT_STRATEGY_INJECTION_TOKEN, NetworkVisibility, NodeContextProcessingServiceImpl, NodeUtilsService, PortalComponent, RequestHeadersService, RoutingConfigServiceImpl, SessionRefreshService, StaticSettingsConfigServiceImpl, THEMING_SERVICE, UserSettingsConfigService, featureToggleLocalStorage, localDevelopmentSettingsLocalStorage, matchesJMESPath, providePortal, userSettingsLocalStorage };
 //# sourceMappingURL=openmfp-portal-ui-lib.mjs.map