@softheon/armature 15.23.7 → 15.23.8

package/fesm2020/softheon-armature.mjs

@@ -14,11 +14,11 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import * as i3 from '@angular/flex-layout/flex';
 import * as i4 from '@angular/flex-layout/extended';
 import { BehaviorSubject, of, Subscription, lastValueFrom, throwError, ReplaySubject } from 'rxjs';
+import * as i1$1 from 'angular-oauth2-oidc';
+import { AuthConfig } from 'angular-oauth2-oidc';
 import { STEPPER_GLOBAL_OPTIONS } from '@angular/cdk/stepper';
 import { map, catchError, filter, switchMap, take, share, first } from 'rxjs/operators';
 import * as i1$2 from '@angular/cdk/layout';
-import * as i1$1 from 'angular-oauth2-oidc';
-import { AuthConfig } from 'angular-oauth2-oidc';
 import { JwksValidationHandler } from 'angular-oauth2-oidc-jwks';
 import * as i9 from '@angular/material/sidenav';
 import { MatSidenavModule } from '@angular/material/sidenav';
@@ -532,6 +532,34 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
                     type: Optional
                 }] }]; } });
 
+// Injection tokens
+/** The session configs */
+const SESSION_CONFIG = new InjectionToken('SessionConfig');
+/** The window interface */
+const WINDOW = new InjectionToken('Window');
+/** The user entity service configs */
+const USER_ENTITY_SERVICE_CONFIG = new InjectionToken('UserEntityServiceConfig');
+/** The pre sign in route storage key */
+const preSignInRouteStorageKey = 'preSignInRoute';
+/** The language storage key */
+const languageStorageKey = 'language';
+/** The federated module configuration storage key */
+const federatedModuleConfigStorageKey = 'sofAr-federatedModule-config';
+/** The federated module id of the application, this should be set when the application is allowed to run as a federated module */
+const FEDERATED_MODULE_ID = new InjectionToken('FederatedModuleId');
+
+/**
+ * Routes to the pre login in route
+ * @param router The router
+ */
+const routeToPreLoginRoute = (router) => {
+    const preservedRoute = window.sessionStorage.getItem(preSignInRouteStorageKey);
+    if (preservedRoute) {
+        router.navigateByUrl(preservedRoute);
+        window.sessionStorage.removeItem(preSignInRouteStorageKey);
+    }
+};
+
 /** The base config service */
 class BaseConfigService {
     /** Gets the configurations */
@@ -561,22 +589,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
                 }]
         }], ctorParameters: function () { return []; } });
 
-// Injection tokens
-/** The session configs */
-const SESSION_CONFIG = new InjectionToken('SessionConfig');
-/** The window interface */
-const WINDOW = new InjectionToken('Window');
-/** The user entity service configs */
-const USER_ENTITY_SERVICE_CONFIG = new InjectionToken('UserEntityServiceConfig');
-/** The pre sign in route storage key */
-const preSignInRouteStorageKey = 'preSignInRoute';
-/** The language storage key */
-const languageStorageKey = 'language';
-/** The federated module configuration storage key */
-const federatedModuleConfigStorageKey = 'sofAr-federatedModule-config';
-/** The federated module id of the application, this should be set when the application is allowed to run as a federated module */
-const FEDERATED_MODULE_ID = new InjectionToken('FederatedModuleId');
-
 /** The federated module service */
 class FederatedModuleService {
     /** The federated module configuration */
@@ -1967,10 +1979,12 @@ class AppTemplateComponent {
      * @param translateService The translate service
      * @param federatedModuleService The federated module service
      */
-    constructor(configService, translateService, federatedModuleService) {
+    constructor(configService, translateService, federatedModuleService, router, oauthService) {
         this.configService = configService;
         this.translateService = translateService;
         this.federatedModuleService = federatedModuleService;
+        this.router = router;
+        this.oauthService = oauthService;
         /** The header settings */
         this.headerSettings = {};
         /** The header theme settings */
@@ -1996,6 +2010,9 @@ class AppTemplateComponent {
         this.config$ = this.configService.config$;
         this.setDefaults();
         this.configService.config$.subscribe(config => {
+            if (config.oAuthSettings.preserveRequestedRoute && this.oauthService.hasValidAccessToken()) {
+                routeToPreLoginRoute(this.router);
+            }
             // object assign is used here so the header doesn't have to re render with the new object reference
             // header
             Object.assign(this.headerSettings, config?.header?.settings);
@@ -2189,12 +2206,12 @@ class AppTemplateComponent {
         Object.assign(this.navigationTheme, defaultNavTheme);
     }
 }
-AppTemplateComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: AppTemplateComponent, deps: [{ token: BaseConfigService }, { token: i2.TranslateService }, { token: FederatedModuleService }], target: i0.ɵɵFactoryTarget.Component });
+AppTemplateComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: AppTemplateComponent, deps: [{ token: BaseConfigService }, { token: i2.TranslateService }, { token: FederatedModuleService }, { token: i1$3.Router }, { token: i1$1.OAuthService }], target: i0.ɵɵFactoryTarget.Component });
 AppTemplateComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.7", type: AppTemplateComponent, selector: "sof-ar-app-template", ngImport: i0, template: "<header *ngIf=\"!isFederatedModule\">\r\n  <sof-ar-header [settings]=\"headerSettings\" [themeSettings]=\"headerThemeSettings\" [authSettings]=\"headerAuthSettings\"\r\n                 (setLanguage$)=\"applyLanguage()\" [currentLang]=\"currentLang\">\r\n    <ng-container sof-ar-header-left>\r\n      <ng-content select=\"[sof-ar-header-left]\"></ng-content>\r\n    </ng-container>\r\n    <ng-container sof-ar-header-center>\r\n      <ng-content select=\"[sof-ar-header-center]\"></ng-content>\r\n    </ng-container>\r\n    <ng-container sof-ar-header-right>\r\n      <ng-content select=\"[sof-ar-header-right]\"></ng-content>\r\n    </ng-container>\r\n    <ng-container sof-header-user-menu>\r\n      <ng-content select=\"[sof-header-user-menu]\"></ng-content>\r\n    </ng-container>\r\n  </sof-ar-header>\r\n</header>\r\n<ng-content select=\"[sof-ar-template-content]\"> </ng-content>\r\n<ng-container *ngIf=\"isFederatedModule\">\r\n  <router-outlet></router-outlet>\r\n</ng-container>\r\n<sof-ar-navigation *ngIf=\"!isFederatedModule\" [navigationData]=\"navigationNodes\" [settings]=\"navigationSettings\"\r\n                   [advancedSettings]=\"navigationAdvancedSettings\" [themeSettings]=\"navigationTheme\"\r\n                   [languageSettings]=\"languageSettings\" [currentLang]=\"currentLang\" (setLanguage$)=\"applyLanguage()\"\r\n                   [logOutText]=\"logOutText\">\r\n  <ng-container sof-ar-nav-content>\r\n    <sof-ar-alert-banner class=\"sof-ar-alert-banner-container\"></sof-ar-alert-banner>\r\n    <div class=\"sof-ar-nav-container\" fxLayout=\"column\" fxLayout=\"start stretch\" style=\"height: 100%;\">\r\n      <ng-content select=\"[sof-ar-nav-content-header]\"></ng-content>\r\n      <div class=\"sof-ar-nav-content-container\" fxFlex=\"1 0 100%\">\r\n        <main [ngStyle.lt-md]=\"{'max-width':navigationSettings?.maxContentWidthMobile+'%'}\"\r\n              [ngStyle.gt-sm]=\"{'max-width':navigationSettings?.maxContentWidthDesktop+'%'}\" class=\"main-content\">\r\n          <router-outlet></router-outlet>\r\n        </main>\r\n      </div>\r\n      <div fxFlex=\"auto\" fxLayoutAlign=\"end end\">\r\n        <sof-ar-footer style=\"width: 100%;\" [footerConfig]=\"{ showPreContent1: false, showPreContent2: false }\">\r\n          <ng-container sof-ar-footer-content>\r\n            <ng-content select=\"[sof-ar-footer-content]\"></ng-content>\r\n          </ng-container>\r\n        </sof-ar-footer>\r\n      </div>\r\n    </div>\r\n  </ng-container>\r\n  <ng-container sof-ar-nav-mobile-footer>\r\n    <ng-content select=\"[sof-ar-nav-mobile-footer]\"></ng-content>\r\n  </ng-container>\r\n</sof-ar-navigation>\r\n", styles: [".nav-content-container{display:flex;flex-direction:column;height:100%}.sof-ar-nav-container{overflow:overlay}.sof-ar-nav-content-container{width:100%}.main-content{margin:auto}\n"], dependencies: [{ kind: "component", type: ArmatureNavigationComponent, selector: "sof-ar-navigation", inputs: ["navigationData", "settings", "advancedSettings", "themeSettings", "languageSettings", "currentLang", "logOutText"], outputs: ["setLanguage$"] }, { kind: "component", type: ArmatureHeaderComponent, selector: "sof-ar-header", inputs: ["settings", "themeSettings", "authSettings", "currentLang"], outputs: ["setLanguage$", "isLoggedInEE"] }, { kind: "component", type: ArmatureFooterComponent, selector: "sof-ar-footer", inputs: ["footerConfig"] }, { kind: "component", type: AlertBannerComponent, selector: "sof-ar-alert-banner", inputs: ["context"] }, { kind: "directive", type: i1$3.RouterOutlet, selector: "router-outlet", inputs: ["name"], outputs: ["activate", "deactivate", "attach", "detach"], exportAs: ["outlet"] }, { kind: "directive", type: i1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i3.DefaultLayoutDirective, selector: "  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]", inputs: ["fxLayout", "fxLayout.xs", "fxLayout.sm", "fxLayout.md", "fxLayout.lg", "fxLayout.xl", "fxLayout.lt-sm", "fxLayout.lt-md", "fxLayout.lt-lg", "fxLayout.lt-xl", "fxLayout.gt-xs", "fxLayout.gt-sm", "fxLayout.gt-md", "fxLayout.gt-lg"] }, { kind: "directive", type: i3.DefaultLayoutAlignDirective, selector: "  [fxLayoutAlign], [fxLayoutAlign.xs], [fxLayoutAlign.sm], [fxLayoutAlign.md],  [fxLayoutAlign.lg], [fxLayoutAlign.xl], [fxLayoutAlign.lt-sm], [fxLayoutAlign.lt-md],  [fxLayoutAlign.lt-lg], [fxLayoutAlign.lt-xl], [fxLayoutAlign.gt-xs], [fxLayoutAlign.gt-sm],  [fxLayoutAlign.gt-md], [fxLayoutAlign.gt-lg]", inputs: ["fxLayoutAlign", "fxLayoutAlign.xs", "fxLayoutAlign.sm", "fxLayoutAlign.md", "fxLayoutAlign.lg", "fxLayoutAlign.xl", "fxLayoutAlign.lt-sm", "fxLayoutAlign.lt-md", "fxLayoutAlign.lt-lg", "fxLayoutAlign.lt-xl", "fxLayoutAlign.gt-xs", "fxLayoutAlign.gt-sm", "fxLayoutAlign.gt-md", "fxLayoutAlign.gt-lg"] }, { kind: "directive", type: i3.DefaultFlexDirective, selector: "  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]", inputs: ["fxFlex", "fxFlex.xs", "fxFlex.sm", "fxFlex.md", "fxFlex.lg", "fxFlex.xl", "fxFlex.lt-sm", "fxFlex.lt-md", "fxFlex.lt-lg", "fxFlex.lt-xl", "fxFlex.gt-xs", "fxFlex.gt-sm", "fxFlex.gt-md", "fxFlex.gt-lg"] }, { kind: "directive", type: i4.DefaultStyleDirective, selector: "  [ngStyle],  [ngStyle.xs], [ngStyle.sm], [ngStyle.md], [ngStyle.lg], [ngStyle.xl],  [ngStyle.lt-sm], [ngStyle.lt-md], [ngStyle.lt-lg], [ngStyle.lt-xl],  [ngStyle.gt-xs], [ngStyle.gt-sm], [ngStyle.gt-md], [ngStyle.gt-lg]", inputs: ["ngStyle", "ngStyle.xs", "ngStyle.sm", "ngStyle.md", "ngStyle.lg", "ngStyle.xl", "ngStyle.lt-sm", "ngStyle.lt-md", "ngStyle.lt-lg", "ngStyle.lt-xl", "ngStyle.gt-xs", "ngStyle.gt-sm", "ngStyle.gt-md", "ngStyle.gt-lg"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: AppTemplateComponent, decorators: [{
             type: Component,
             args: [{ selector: 'sof-ar-app-template', template: "<header *ngIf=\"!isFederatedModule\">\r\n  <sof-ar-header [settings]=\"headerSettings\" [themeSettings]=\"headerThemeSettings\" [authSettings]=\"headerAuthSettings\"\r\n                 (setLanguage$)=\"applyLanguage()\" [currentLang]=\"currentLang\">\r\n    <ng-container sof-ar-header-left>\r\n      <ng-content select=\"[sof-ar-header-left]\"></ng-content>\r\n    </ng-container>\r\n    <ng-container sof-ar-header-center>\r\n      <ng-content select=\"[sof-ar-header-center]\"></ng-content>\r\n    </ng-container>\r\n    <ng-container sof-ar-header-right>\r\n      <ng-content select=\"[sof-ar-header-right]\"></ng-content>\r\n    </ng-container>\r\n    <ng-container sof-header-user-menu>\r\n      <ng-content select=\"[sof-header-user-menu]\"></ng-content>\r\n    </ng-container>\r\n  </sof-ar-header>\r\n</header>\r\n<ng-content select=\"[sof-ar-template-content]\"> </ng-content>\r\n<ng-container *ngIf=\"isFederatedModule\">\r\n  <router-outlet></router-outlet>\r\n</ng-container>\r\n<sof-ar-navigation *ngIf=\"!isFederatedModule\" [navigationData]=\"navigationNodes\" [settings]=\"navigationSettings\"\r\n                   [advancedSettings]=\"navigationAdvancedSettings\" [themeSettings]=\"navigationTheme\"\r\n                   [languageSettings]=\"languageSettings\" [currentLang]=\"currentLang\" (setLanguage$)=\"applyLanguage()\"\r\n                   [logOutText]=\"logOutText\">\r\n  <ng-container sof-ar-nav-content>\r\n    <sof-ar-alert-banner class=\"sof-ar-alert-banner-container\"></sof-ar-alert-banner>\r\n    <div class=\"sof-ar-nav-container\" fxLayout=\"column\" fxLayout=\"start stretch\" style=\"height: 100%;\">\r\n      <ng-content select=\"[sof-ar-nav-content-header]\"></ng-content>\r\n      <div class=\"sof-ar-nav-content-container\" fxFlex=\"1 0 100%\">\r\n        <main [ngStyle.lt-md]=\"{'max-width':navigationSettings?.maxContentWidthMobile+'%'}\"\r\n              [ngStyle.gt-sm]=\"{'max-width':navigationSettings?.maxContentWidthDesktop+'%'}\" class=\"main-content\">\r\n          <router-outlet></router-outlet>\r\n        </main>\r\n      </div>\r\n      <div fxFlex=\"auto\" fxLayoutAlign=\"end end\">\r\n        <sof-ar-footer style=\"width: 100%;\" [footerConfig]=\"{ showPreContent1: false, showPreContent2: false }\">\r\n          <ng-container sof-ar-footer-content>\r\n            <ng-content select=\"[sof-ar-footer-content]\"></ng-content>\r\n          </ng-container>\r\n        </sof-ar-footer>\r\n      </div>\r\n    </div>\r\n  </ng-container>\r\n  <ng-container sof-ar-nav-mobile-footer>\r\n    <ng-content select=\"[sof-ar-nav-mobile-footer]\"></ng-content>\r\n  </ng-container>\r\n</sof-ar-navigation>\r\n", styles: [".nav-content-container{display:flex;flex-direction:column;height:100%}.sof-ar-nav-container{overflow:overlay}.sof-ar-nav-content-container{width:100%}.main-content{margin:auto}\n"] }]
-        }], ctorParameters: function () { return [{ type: BaseConfigService }, { type: i2.TranslateService }, { type: FederatedModuleService }]; } });
+        }], ctorParameters: function () { return [{ type: BaseConfigService }, { type: i2.TranslateService }, { type: FederatedModuleService }, { type: i1$3.Router }, { type: i1$1.OAuthService }]; } });
 
 /** The start up abstract class */
 class AbstractStartupService {
@@ -5506,18 +5523,6 @@ var ApplicationUserModel;
  * Do not edit the class manually.
  */
 
-/**
- * Routes to the pre login in route
- * @param router The router
- */
-const routeToPreLoginRoute = (router) => {
-    const preservedRoute = window.sessionStorage.getItem(preSignInRouteStorageKey);
-    if (preservedRoute) {
-        router.navigateByUrl(preservedRoute);
-        window.sessionStorage.removeItem(preSignInRouteStorageKey);
-    }
-};
-
 const BASE_PATH = new InjectionToken('basePath');
 const COLLECTION_FORMATS = {
     'csv': ',',