@genesislcap/foundation-login 14.226.1 → 14.226.2-alpha-bcda968.0

package/dist/dts/main/main.d.ts

@@ -90,7 +90,7 @@ import { MainRouterConfig } from '../routes';
  *         // Otherwise route them to login
  *         phase.cancel(() => {
  *           session.captureReturnUrl();
- *           Route.name.replace(phase.router, 'login');
+ *           FoundationRouteNav.name.replace(phase.router, 'login');
  *         });
  *       },
  *     });

package/dist/dts/routes/base.d.ts

@@ -54,9 +54,8 @@ export declare class BaseRoute extends ConfigHostElement {
     setError(message: string): void;
     clearError(): void;
     get orgUsername(): string;
-    getSubRoutePath(routeName: Routes | string): string;
     onBack: () => void;
-    onNavigate: (path: string) => void;
+    onNavigate: (routeName: Routes, params?: Object, trigger?: boolean) => void;
     queueOnBack(delay?: number): void;
     autofill(): Promise<boolean>;
     storeCredentials(password?: string): void;

package/dist/dts/routes/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../src/routes/base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../src/routes/base.ts"],"names":[],"mappings":"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"}

package/dist/dts/routes/config.d.ts

@@ -1,7 +1,5 @@
-import { Auth, Session, FoundationAnalytics } from '@genesislcap/foundation-comms';
-import { Constructable } from '@microsoft/fast-element';
-import { Container } from '@microsoft/fast-foundation';
-import { RouterConfiguration } from '@microsoft/fast-router';
+import { Auth } from '@genesislcap/foundation-comms';
+import { FoundationRouterConfiguration } from '@genesislcap/foundation-ui';
 import { LoginConfig } from '../main/config';
 import type { Settings } from './types';
 /**
@@ -14,14 +12,10 @@ import type { Settings } from './types';
  *
  * @internal
  */
-export declare class MainRouterConfig extends RouterConfiguration<Settings> {
+export declare class MainRouterConfig extends FoundationRouterConfiguration<Settings> {
     private auth;
-    private container;
-    private analytics;
-    private session;
     private loginConfig;
-    constructor(auth: Auth, container: Container, analytics: FoundationAnalytics, session: Session, loginConfig?: LoginConfig);
+    constructor(auth: Auth, loginConfig?: LoginConfig);
     configure(): void;
-    construct<T>(Type: Constructable<T>): T;
 }
 //# sourceMappingURL=config.d.ts.map

package/dist/dts/routes/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/routes/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,OAAO,EACP,mBAAmB,EAGpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAY,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAA2B,mBAAmB,EAAS,MAAM,wBAAwB,CAAC;AAE7F,OAAO,EAAsB,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAQjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGxC;;;;;;;;;GASG;AACH,qBAAa,gBAAiB,SAAQ,mBAAmB,CAAC,QAAQ,CAAC;IAEzD,OAAO,CAAC,IAAI;IACP,OAAO,CAAC,SAAS;IACP,OAAO,CAAC,SAAS;IAC7B,OAAO,CAAC,OAAO;IACD,OAAO,CAAC,WAAW;gBAJ5B,IAAI,EAAE,IAAI,EACL,SAAS,EAAE,SAAS,EACV,SAAS,EAAE,mBAAmB,EAC1C,OAAO,EAAE,OAAO,EACF,WAAW,cAAqB;IAK1D,SAAS;IAqJT,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC;CAG/C"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/routes/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAC;AAI3E,OAAO,EAAsB,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAQjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGxC;;;;;;;;;GASG;AACH,qBAAa,gBAAiB,SAAQ,6BAA6B,CAAC,QAAQ,CAAC;IAEnE,OAAO,CAAC,IAAI;IACK,OAAO,CAAC,WAAW;gBAD5B,IAAI,EAAE,IAAI,EACO,WAAW,cAAqB;IAK1D,SAAS;CAuHjB"}

package/dist/dts/routes/forgot-password/forgot-password.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"forgot-password.d.ts","sourceRoot":"","sources":["../../../../src/routes/forgot-password/forgot-password.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGpC,qBAKa,cAAe,SAAQ,SAAS;IACrC,iBAAiB;IAKjB,QAAQ;CAef"}
+{"version":3,"file":"forgot-password.d.ts","sourceRoot":"","sources":["../../../../src/routes/forgot-password/forgot-password.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGpC,qBAKa,cAAe,SAAQ,SAAS;IACrC,iBAAiB;IAKjB,QAAQ;CAyBf"}

package/dist/esm/main/main.js

@@ -95,7 +95,7 @@ import { definition, standaloneDefinition } from './main.definition';
  *         // Otherwise route them to login
  *         phase.cancel(() => {
  *           session.captureReturnUrl();
- *           Route.name.replace(phase.router, 'login');
+ *           FoundationRouteNav.name.replace(phase.router, 'login');
  *         });
  *       },
  *     });

package/dist/esm/routes/base.js

@@ -1,11 +1,11 @@
 import { __awaiter, __decorate } from "tslib";
 import { Auth, Connect, CredentialManager, credentialSeparator, MessageBuilder, Session, } from '@genesislcap/foundation-comms';
 import { I18next } from '@genesislcap/foundation-i18n';
+import { FoundationRouteNav } from '@genesislcap/foundation-ui';
 import { sync } from '@genesislcap/foundation-utils';
 import { SecondaryRapidColorHEX } from '@genesislcap/foundation-zero';
 import { attr, css, customElement, FASTElement, html, observable, when, } from '@microsoft/fast-element';
 import { Container } from '@microsoft/fast-foundation';
-import { Route } from '@microsoft/fast-router';
 import { classNames } from '@microsoft/fast-web-utilities';
 import merge from 'lodash/merge';
 import { defaultLoginConfig, hostUrl, LoginConfig } from '../main/config';
@@ -55,8 +55,10 @@ export class BaseRoute extends ConfigHostElement {
         this.message = '';
         this.hasErrors = false;
         this.isSubmitting = false;
-        this.onBack = () => this.onNavigate('/');
-        this.onNavigate = (path) => Route.path.push(path);
+        this.onBack = () => this.onNavigate('login');
+        this.onNavigate = (routeName, params = {}, trigger = true) => {
+            FoundationRouteNav.name.push(this, routeName, params, trigger);
+        };
     }
     connectedCallback() {
         var _a;
@@ -107,9 +109,6 @@ export class BaseRoute extends ConfigHostElement {
             ? `${this.username.trim()}:${this.organisation.trim()}`
             : this.username.trim();
     }
-    getSubRoutePath(routeName) {
-        return this.config.hostPath !== '' ? `${this.config.hostPath}/${routeName}` : routeName;
-    }
     queueOnBack(delay) {
         var _a;
         setTimeout(() => {

package/dist/esm/routes/config.js

@@ -1,7 +1,7 @@
 import { __awaiter, __decorate, __param } from "tslib";
-import { Auth, Session, FoundationAnalytics, FoundationAnalyticsEventType, } from '@genesislcap/foundation-comms';
-import { Container, optional } from '@microsoft/fast-foundation';
-import { RouterConfiguration, Route } from '@microsoft/fast-router';
+import { Auth } from '@genesislcap/foundation-comms';
+import { FoundationRouterConfiguration } from '@genesislcap/foundation-ui';
+import { optional } from '@microsoft/fast-foundation';
 import { defaultLayout } from '../layouts';
 import { defaultLoginConfig, LoginConfig } from '../main/config';
 import { ForgotPassword } from './forgot-password/forgot-password';
@@ -22,28 +22,19 @@ import { Verify } from './verify/verify';
  *
  * @internal
  */
-let MainRouterConfig = class MainRouterConfig extends RouterConfiguration {
-    constructor(auth, container, analytics, session, loginConfig = defaultLoginConfig) {
+let MainRouterConfig = class MainRouterConfig extends FoundationRouterConfiguration {
+    constructor(auth, loginConfig = defaultLoginConfig) {
         super();
         this.auth = auth;
-        this.container = container;
-        this.analytics = analytics;
-        this.session = session;
         this.loginConfig = loginConfig;
     }
     configure() {
         this.title = 'Login';
+        this.loginPath = '';
         this.defaultLayout = defaultLayout;
-        /**
-         * TODO: Cascade the template options to child routes in a subsequent PR
-         * element: async () => {
-         *    const { define, templateOptions, template, styles } = await import(
-         *        /!* webpackChunkName: "login-form" *!/
-         *        './login-form'
-         *    );
-         *    return define(this.compose(templateOptions, template, styles, 'login-form'));
-         * },
-         */
+        this.configureAnalytics();
+        this.configureRoutePermittedChecks();
+        this.configureFallbackRouteDefinition();
         const routes = [
             {
                 path: '',
@@ -114,63 +105,40 @@ let MainRouterConfig = class MainRouterConfig extends RouterConfiguration {
             });
         }
         this.routes.map(...routes);
-        const session = this.session;
-        const auth = this.auth;
-        const analytics = this.analytics;
-        /**
-         * Example of a FallbackRouteDefinition
-         */
-        this.routes.fallback(() => auth.isLoggedIn ? { redirect: 'not-found' } : { redirect: 'login' });
         /**
          * Example of a NavigationContributor
          */
         this.contributors.push({
             navigate: (phase) => __awaiter(this, void 0, void 0, function* () {
                 const settings = phase.route.settings;
-                /**
-                 * TODO: Centralise
-                 * Suspect this should be done via createEventSink, but it's not fully clear how-to do that as no docs
-                 */
-                analytics.trackEvent(FoundationAnalyticsEventType.routeChanged, {
-                    path: phase.route.endpoint.path,
-                });
                 /**
                  * If public route don't block
                  */
-                if (settings && settings.public) {
+                if (settings === null || settings === void 0 ? void 0 : settings.public) {
                     return;
                 }
                 /**
-                 * If logged in don't block
+                 * If authenticated don't block
                  */
-                if (auth.isLoggedIn) {
+                if (this.user.isAuthenticated) {
                     return;
                 }
                 /**
-                 * If allowAutoAuth and session is valid try to connect+auto-login
+                 * If autoAuth and session is valid try to connect+auto-login
                  */
-                if (this.loginConfig.autoAuth && (yield auth.reAuthFromSession())) {
+                if (this.loginConfig.autoAuth && (yield this.auth.reAuthFromSession())) {
                     return;
                 }
                 /**
                  * Otherwise route them to login
                  */
-                phase.cancel(() => {
-                    session.captureReturnUrl();
-                    Route.name.replace(phase.router, 'login');
-                });
+                this.navigationPhaseLoginRedirect(phase);
             }),
         });
     }
-    construct(Type) {
-        return this.container.get(Type);
-    }
 };
 MainRouterConfig = __decorate([
     __param(0, Auth),
-    __param(1, Container),
-    __param(2, FoundationAnalytics),
-    __param(3, Session),
-    __param(4, optional(LoginConfig))
+    __param(1, optional(LoginConfig))
 ], MainRouterConfig);
 export { MainRouterConfig };

package/dist/esm/routes/forgot-password/forgot-password.js

@@ -1,6 +1,6 @@
 import { __awaiter, __decorate } from "tslib";
+import { FoundationRouteNav } from '@genesislcap/foundation-ui';
 import { customElement } from '@microsoft/fast-element';
-import { hostEnv } from '../../main/config';
 import { commonLoginRouteStyles } from '../../styles';
 import { logger } from '../../utils';
 import { BaseRoute } from '../base';
@@ -19,16 +19,23 @@ let ForgotPassword = class ForgotPassword extends BaseRoute {
         const _super = Object.create(null, {
             onSubmit: { get: () => super.onSubmit }
         });
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             logger.debug('forgot password submission');
             yield _super.onSubmit.call(this);
+            const navigationPathCallback = (fullPath) => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                const message = this.messageBuilder.createForgotPasswordMessage(this.orgUsername, fullPath);
+                yield this.sendMessage(message, this.toLocalisedText('FORGOTTEN_PASSWORD_SUCCESS_MESSAGE'), undefined, (_a = this.config.messageDelays) === null || _a === void 0 ? void 0 : _a.forgotPassword);
+            });
             /**
              * Example url from email: https://public-foundation.genesislab.global/reset-password?password=nc_cbGrlgCkZeJHAF043oqEidnk
              */
-            const returnUrl = `${location.protocol}//${hostEnv}/${this.getSubRoutePath('reset-password')}`;
-            const message = this.messageBuilder.createForgotPasswordMessage(this.orgUsername, returnUrl);
-            yield this.sendMessage(message, this.toLocalisedText('FORGOTTEN_PASSWORD_SUCCESS_MESSAGE'), undefined, (_a = this.config.messageDelays) === null || _a === void 0 ? void 0 : _a.forgotPassword);
+            // this.$emit('generate-navigation-path', {
+            //   path: 'reset-password',
+            //   callback: navigationPathCallback,
+            // });
+            const fullPath = yield FoundationRouteNav.name.generateRoute(this, 'reset-password');
+            yield navigationPathCallback(fullPath);
         });
     }
 };

package/dist/esm/routes/login-form/login-form.js

@@ -1,8 +1,8 @@
 import { __awaiter, __decorate } from "tslib";
 import { AuthError } from '@genesislcap/foundation-comms';
+import { FoundationRouteNav } from '@genesislcap/foundation-ui';
 import { inIFrame, inSymphonyDesktop, openPopup } from '@genesislcap/foundation-utils';
 import { customElement, DOM, observable, volatile } from '@microsoft/fast-element';
-import { Route } from '@microsoft/fast-router';
 import { logger, getSSOLoginURL, fetchIDPs } from '../../utils';
 import { BaseRoute } from '../base';
 import { LoginFormStyles as styles } from './login-form.styles';
@@ -194,14 +194,14 @@ let LoginForm = class LoginForm extends BaseRoute {
                     this.config.redirectHandler(url);
                 }
                 else {
-                    Route.path.push(url);
+                    FoundationRouteNav.path.push(url);
                 }
             }
             catch (err) {
                 if (err instanceof AuthError) {
                     if (err.hasPasswordExpiredError()) {
                         this.storeCredentials();
-                        this.onNavigate(this.getSubRoutePath('reset-password?expired'));
+                        this.onNavigate('reset-password', { expired: true });
                         return;
                     }
                     if (err.hasMFAError()) {

package/dist/esm/routes/login-form/login-form.template.js

@@ -13,7 +13,7 @@ const regularLogin = html `
             ${when((x) => !x.config.omitRoutes.includes('forgot-password'), html `
                 <zero-button
                   appearance="lightweight"
-                  @click=${(x) => x.onNavigate(x.getSubRoutePath(`forgot-password`))}
+                  @click=${(x) => x.onNavigate(`forgot-password`)}
                   data-test-id="forgot-password"
                 >
                   ${(x) => x.toLocalisedText('LOGIN_FORM_FORGOT_PASSWORD_LINK')}
@@ -22,7 +22,7 @@ const regularLogin = html `
             ${when((x) => !x.config.omitRoutes.includes('reset-password'), html `
                 <zero-button
                   appearance="lightweight"
-                  @click=${(x) => x.onNavigate(x.getSubRoutePath(`reset-password`))}
+                  @click=${(x) => x.onNavigate(`reset-password`)}
                   data-test-id="reset-password"
                 >
                   ${(x) => x.toLocalisedText('LOGIN_FORM_CHANGE_PASSWORD_LINK')}
@@ -33,7 +33,7 @@ const regularLogin = html `
             ${when((x) => !x.config.omitRoutes.includes('request-account'), html `
                 <zero-button
                   appearance="lightweight"
-                  @click=${(x) => x.onNavigate(x.getSubRoutePath(`request-account`))}
+                  @click=${(x) => x.onNavigate(`request-account`)}
                   data-test-id="request-account"
                 >
                   ${(x) => x.toLocalisedText('LOGIN_FORM_REQUEST_ACCOUNT_LINK')}

package/dist/esm/routes/protected/protected.js

@@ -11,7 +11,7 @@ let Protected = class Protected extends BaseRoute {
                 return;
             }
             yield this.credentialManager.preventSilentAccess();
-            this.onNavigate('/');
+            this.onNavigate('login');
         });
     }
 };

package/dist/foundation-login.api.json

@@ -1024,7 +1024,7 @@
         {
           "kind": "Class",
           "canonicalReference": "@genesislcap/foundation-login!Login:class",
-          "docComment": "/**\n * Defines the login class which handles account authentication from the front-end\n *\n * @remarks\n *\n * Add the Login class as a router element, and it will handle the account authentication for you. Requires use of `@genesislcap/foundation-comms` for the {@link @genesislcap/foundation-comms#Auth | Auth} and {@link @genesislcap/foundation#Session | Session} classes.\n *\n * There are a lot of configuration options available, and different authentication types (such as login via SSO). Use the modules exported `configure` and `define` functions for more power.\n *\n * @deprecated\n *\n * - Use '\\@genesislcap/pbc-auth' instead. 'https://www.npmjs.com/package/\\@genesislcap/pbc-auth'\n *\n * @example\n *\n * The following is an example of using it in your app, setting it up in the router configuration. This isn't a complete routes confutation, but it contains all required configuration in regard to adding Login functionality.\n * ```ts\n * // Import required dependencies from the foundation-login package\n * import { Login } from '@genesislcap/foundation-login';\n * // Import required dependencies from the foundation-comms package\n * // You could also import analytics events and set them up in the NavigationContributor\n * import { Auth, Session } from '@genesislcap/foundation-comms';\n *\n * type RouterSettings = {\n *   public?: boolean;\n *   autoAuth?: boolean;\n * }\n *\n * // Define your router config\n * export class MainRouterConfig extends RouterConfiguration<RouterSettings> {\n *   // Ensure you inject in required dependencies\n *   constructor(\n *     @Auth private auth: Auth,\n *     @Session private session: Session\n *   ) {\n *     super();\n *   }\n *\n *   // Add Login as a route\n *   public configure() {\n *     ...\n *     this.routes.map(\n *       { path: '', redirect: 'login' },\n *       {\n *         path: 'login',\n *         element: Login,\n *         title: 'Login',\n *         name: 'login',\n *         layout: loginLayout,\n *         settings: { public: true },\n *         childRouters: true,\n *       },\n *       ... // Other routes config here\n *     );\n *\n *     const session = this.session;\n *     const auth = this.auth;\n *\n *     // Example of a FallbackRouteDefinition\n *     this.routes.fallback(() =>\n *       auth.isLoggedIn ? { redirect: 'not-found' } : { redirect: 'login' }\n *     );\n *\n *      // Example of a NavigationContributor\n *     this.contributors.push({\n *       navigate: async (phase) => {\n *         const settings = phase.route.settings;\n *\n *         // Could add in processes such as analytics here\n *\n *         // If public route don't block\n *         if (settings && settings.public) {\n *           return;\n *         }\n *\n *         // If logged in don't block\n *         if (auth.isLoggedIn) {\n *           return;\n *         }\n *\n *         // If autoAuth and session is valid try to connect+auto-login\n *         if (settings && settings.autoAuth && (await auth.reAuthFromSession())) {\n *           return;\n *         }\n *\n *         // Otherwise route them to login\n *         phase.cancel(() => {\n *           session.captureReturnUrl();\n *           Route.name.replace(phase.router, 'login');\n *         });\n *       },\n *     });\n *   }\n *\n *   ... // Other configuration/methods\n *\n * }\n * ```\n *\n * @public\n */\n",
+          "docComment": "/**\n * Defines the login class which handles account authentication from the front-end\n *\n * @remarks\n *\n * Add the Login class as a router element, and it will handle the account authentication for you. Requires use of `@genesislcap/foundation-comms` for the {@link @genesislcap/foundation-comms#Auth | Auth} and {@link @genesislcap/foundation#Session | Session} classes.\n *\n * There are a lot of configuration options available, and different authentication types (such as login via SSO). Use the modules exported `configure` and `define` functions for more power.\n *\n * @deprecated\n *\n * - Use '\\@genesislcap/pbc-auth' instead. 'https://www.npmjs.com/package/\\@genesislcap/pbc-auth'\n *\n * @example\n *\n * The following is an example of using it in your app, setting it up in the router configuration. This isn't a complete routes confutation, but it contains all required configuration in regard to adding Login functionality.\n * ```ts\n * // Import required dependencies from the foundation-login package\n * import { Login } from '@genesislcap/foundation-login';\n * // Import required dependencies from the foundation-comms package\n * // You could also import analytics events and set them up in the NavigationContributor\n * import { Auth, Session } from '@genesislcap/foundation-comms';\n *\n * type RouterSettings = {\n *   public?: boolean;\n *   autoAuth?: boolean;\n * }\n *\n * // Define your router config\n * export class MainRouterConfig extends RouterConfiguration<RouterSettings> {\n *   // Ensure you inject in required dependencies\n *   constructor(\n *     @Auth private auth: Auth,\n *     @Session private session: Session\n *   ) {\n *     super();\n *   }\n *\n *   // Add Login as a route\n *   public configure() {\n *     ...\n *     this.routes.map(\n *       { path: '', redirect: 'login' },\n *       {\n *         path: 'login',\n *         element: Login,\n *         title: 'Login',\n *         name: 'login',\n *         layout: loginLayout,\n *         settings: { public: true },\n *         childRouters: true,\n *       },\n *       ... // Other routes config here\n *     );\n *\n *     const session = this.session;\n *     const auth = this.auth;\n *\n *     // Example of a FallbackRouteDefinition\n *     this.routes.fallback(() =>\n *       auth.isLoggedIn ? { redirect: 'not-found' } : { redirect: 'login' }\n *     );\n *\n *      // Example of a NavigationContributor\n *     this.contributors.push({\n *       navigate: async (phase) => {\n *         const settings = phase.route.settings;\n *\n *         // Could add in processes such as analytics here\n *\n *         // If public route don't block\n *         if (settings && settings.public) {\n *           return;\n *         }\n *\n *         // If logged in don't block\n *         if (auth.isLoggedIn) {\n *           return;\n *         }\n *\n *         // If autoAuth and session is valid try to connect+auto-login\n *         if (settings && settings.autoAuth && (await auth.reAuthFromSession())) {\n *           return;\n *         }\n *\n *         // Otherwise route them to login\n *         phase.cancel(() => {\n *           session.captureReturnUrl();\n *           FoundationRouteNav.name.replace(phase.router, 'login');\n *         });\n *       },\n *     });\n *   }\n *\n *   ... // Other configuration/methods\n *\n * }\n * ```\n *\n * @public\n */\n",
           "excerptTokens": [
             {
               "kind": "Content",

package/dist/foundation-login.d.ts

@@ -1,20 +1,18 @@
 import { Auth } from '@genesislcap/foundation-comms';
 import { Binding } from '@microsoft/fast-element';
 import { Connect } from '@genesislcap/foundation-comms';
-import { Constructable } from '@microsoft/fast-element';
 import { Container } from '@microsoft/fast-foundation';
 import { CredentialManager } from '@genesislcap/foundation-comms';
 import { DefineFunction } from '@genesislcap/foundation-ui';
 import { ElementStyles } from '@microsoft/fast-element';
 import { FASTElement } from '@microsoft/fast-element';
-import { FoundationAnalytics } from '@genesislcap/foundation-comms';
+import { FoundationRouterConfiguration } from '@genesislcap/foundation-ui';
 import { I18next } from '@genesislcap/foundation-i18n';
 import { I18nextConfig } from '@genesislcap/foundation-i18n';
 import { InterfaceSymbol } from '@microsoft/fast-foundation';
 import { Message } from '@genesislcap/foundation-comms';
 import { MessageBuilder } from '@genesislcap/foundation-comms';
 import { PartialFASTElementDefinition } from '@microsoft/fast-element';
-import { RouterConfiguration } from '@microsoft/fast-router';
 import { Session } from '@genesislcap/foundation-comms';
 import { SyntheticViewTemplate } from '@microsoft/fast-element';
 import { TemplateElementDependency } from '@genesislcap/foundation-ui';
@@ -60,9 +58,8 @@ export declare class BaseRoute extends ConfigHostElement {
     setError(message: string): void;
     clearError(): void;
     get orgUsername(): string;
-    getSubRoutePath(routeName: Routes | string): string;
     onBack: () => void;
-    onNavigate: (path: string) => void;
+    onNavigate: (routeName: Routes, params?: Object, trigger?: boolean) => void;
     queueOnBack(delay?: number): void;
     autofill(): Promise<boolean>;
     storeCredentials(password?: string): void;
@@ -459,7 +456,7 @@ export declare function isMFRoute(pathname?: string): boolean;
  *         // Otherwise route them to login
  *         phase.cancel(() => {
  *           session.captureReturnUrl();
- *           Route.name.replace(phase.router, 'login');
+ *           FoundationRouteNav.name.replace(phase.router, 'login');
  *         });
  *       },
  *     });
@@ -796,15 +793,11 @@ export declare class LogoElement extends ConfigHostElement {
  *
  * @internal
  */
-export declare class MainRouterConfig extends RouterConfiguration<Settings> {
+export declare class MainRouterConfig extends FoundationRouterConfiguration<Settings> {
     private auth;
-    private container;
-    private analytics;
-    private session;
     private loginConfig;
-    constructor(auth: Auth, container: Container, analytics: FoundationAnalytics, session: Session, loginConfig?: LoginConfig);
+    constructor(auth: Auth, loginConfig?: LoginConfig);
     configure(): void;
-    construct<T>(Type: Constructable<T>): T;
 }
 
 /**

package/docs/api/foundation-login.login.md

@@ -100,7 +100,7 @@ export class MainRouterConfig extends RouterConfiguration<RouterSettings> {
         // Otherwise route them to login
         phase.cancel(() => {
           session.captureReturnUrl();
-          Route.name.replace(phase.router, 'login');
+          FoundationRouteNav.name.replace(phase.router, 'login');
         });
       },
     });

package/docs/api-report.md

@@ -7,20 +7,18 @@
 import { Auth } from '@genesislcap/foundation-comms';
 import { Binding } from '@microsoft/fast-element';
 import { Connect } from '@genesislcap/foundation-comms';
-import { Constructable } from '@microsoft/fast-element';
 import { Container } from '@microsoft/fast-foundation';
 import { CredentialManager } from '@genesislcap/foundation-comms';
 import { DefineFunction } from '@genesislcap/foundation-ui';
 import { ElementStyles } from '@microsoft/fast-element';
 import { FASTElement } from '@microsoft/fast-element';
-import { FoundationAnalytics } from '@genesislcap/foundation-comms';
+import { FoundationRouterConfiguration } from '@genesislcap/foundation-ui';
 import { I18next } from '@genesislcap/foundation-i18n';
 import { I18nextConfig } from '@genesislcap/foundation-i18n';
 import { InterfaceSymbol } from '@microsoft/fast-foundation';
 import { Message } from '@genesislcap/foundation-comms';
 import { MessageBuilder } from '@genesislcap/foundation-comms';
 import { PartialFASTElementDefinition } from '@microsoft/fast-element';
-import { RouterConfiguration } from '@microsoft/fast-router';
 import { Session } from '@genesislcap/foundation-comms';
 import { SyntheticViewTemplate } from '@microsoft/fast-element';
 import { TemplateElementDependency } from '@genesislcap/foundation-ui';
@@ -61,8 +59,6 @@ export class BaseRoute extends ConfigHostElement {
     // (undocumented)
     ensureConnection(): Promise<boolean>;
     // (undocumented)
-    getSubRoutePath(routeName: Routes | string): string;
-    // (undocumented)
     hasErrors: boolean;
     // (undocumented)
     host: string;
@@ -75,7 +71,7 @@ export class BaseRoute extends ConfigHostElement {
     // (undocumented)
     onBack: () => void;
     // (undocumented)
-    onNavigate: (path: string) => void;
+    onNavigate: (routeName: Routes, params?: Object, trigger?: boolean) => void;
     // (undocumented)
     onSubmit(): Promise<void>;
     // (undocumented)
@@ -316,12 +312,10 @@ export class LogoElement extends ConfigHostElement {
 // Warning: (ae-internal-missing-underscore) The name "MainRouterConfig" should be prefixed with an underscore because the declaration is marked as @internal
 //
 // @internal
-export class MainRouterConfig extends RouterConfiguration<Settings> {
-    constructor(auth: Auth, container: Container, analytics: FoundationAnalytics, session: Session, loginConfig?: LoginConfig);
+export class MainRouterConfig extends FoundationRouterConfiguration<Settings> {
+    constructor(auth: Auth, loginConfig?: LoginConfig);
     // (undocumented)
     configure(): void;
-    // (undocumented)
-    construct<T>(Type: Constructable<T>): T;
 }
 
 // @public (undocumented)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/foundation-login",
   "description": "Genesis Foundation Login",
-  "version": "14.226.1",
+  "version": "14.226.2-alpha-bcda968.0",
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
   "types": "dist/foundation-login.d.ts",
@@ -67,22 +67,22 @@
     }
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "14.226.1",
-    "@genesislcap/genx": "14.226.1",
-    "@genesislcap/rollup-builder": "14.226.1",
-    "@genesislcap/ts-builder": "14.226.1",
-    "@genesislcap/uvu-playwright-builder": "14.226.1",
-    "@genesislcap/vite-builder": "14.226.1",
-    "@genesislcap/webpack-builder": "14.226.1",
+    "@genesislcap/foundation-testing": "14.226.2-alpha-bcda968.0",
+    "@genesislcap/genx": "14.226.2-alpha-bcda968.0",
+    "@genesislcap/rollup-builder": "14.226.2-alpha-bcda968.0",
+    "@genesislcap/ts-builder": "14.226.2-alpha-bcda968.0",
+    "@genesislcap/uvu-playwright-builder": "14.226.2-alpha-bcda968.0",
+    "@genesislcap/vite-builder": "14.226.2-alpha-bcda968.0",
+    "@genesislcap/webpack-builder": "14.226.2-alpha-bcda968.0",
     "rimraf": "^5.0.0"
   },
   "dependencies": {
-    "@genesislcap/foundation-comms": "14.226.1",
-    "@genesislcap/foundation-i18n": "14.226.1",
-    "@genesislcap/foundation-logger": "14.226.1",
-    "@genesislcap/foundation-ui": "14.226.1",
-    "@genesislcap/foundation-utils": "14.226.1",
-    "@genesislcap/foundation-zero": "14.226.1",
+    "@genesislcap/foundation-comms": "14.226.2-alpha-bcda968.0",
+    "@genesislcap/foundation-i18n": "14.226.2-alpha-bcda968.0",
+    "@genesislcap/foundation-logger": "14.226.2-alpha-bcda968.0",
+    "@genesislcap/foundation-ui": "14.226.2-alpha-bcda968.0",
+    "@genesislcap/foundation-utils": "14.226.2-alpha-bcda968.0",
+    "@genesislcap/foundation-zero": "14.226.2-alpha-bcda968.0",
     "@microsoft/fast-components": "2.30.6",
     "@microsoft/fast-element": "1.14.0",
     "@microsoft/fast-foundation": "2.49.6",
@@ -100,5 +100,5 @@
     "access": "public"
   },
   "customElements": "dist/custom-elements.json",
-  "gitHead": "e691c1741d135edca5271f338f62df8154efb99c"
+  "gitHead": "9af9df8ba21d267f9bb916dcdc29796cd9f3e007"
 }