@genesislcap/blank-app-seed 3.41.0 → 3.41.2

package/.genx/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/blank-app-seed-config",
   "description": "Genesis Blank App Seed Configuration",
-  "version": "3.41.0",
+  "version": "3.41.2",
   "license": "Apache-2.0",
   "scripts": {
     "lint": "eslint .",

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [3.41.2](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.41.1...v3.41.2) (2025-03-20)
+
+
+### Bug Fixes
+
+* correct path for login redirect 4b06ecb
+* fix angular router e92e502
+* react and angular router fix (#439) 6c7a4da
+* react router fixes 1fd1742
+
+## [3.41.1](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.41.0...v3.41.1) (2025-03-18)
+
+
+### Bug Fixes
+
+* revert changes e50c69a
+* revert cookies (#438) 754f30a
+
 ## [3.41.0](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.40.1...v3.41.0) (2025-03-06)
 
 

package/client-tmp/angular/angular.json

@@ -74,9 +74,6 @@
         },
         "serve": {
           "builder": "@angular-builders/custom-webpack:dev-server",
-          "options": {
-            "proxyConfig": "src/proxy.conf.json"
-          },
           "configurations": {
             "production": {
               "buildTarget": "{{pkgName}}:build:production"

package/client-tmp/angular/src/app/app.component.ts

@@ -1,12 +1,11 @@
 import { AfterViewInit, Component, ElementRef, OnDestroy, OnInit } from '@angular/core';
 import { Router, NavigationEnd } from '@angular/router';
-import { Connect } from '@genesislcap/foundation-comms';
-import { customEventFactory, registerStylesTarget } from '../pbc/utils';
-import { configureFoundationAuth } from './share/foundation-auth';
+import getLayoutNameByRoute from './utils/getLayoutNameByRoute';
+import type { LayoutComponentName } from './types/layout';
+import { configureFoundationLogin } from './share/foundation-login';
 import { registerComponents } from './share/genesis-components';
 import { getStore } from './store';
-import type { LayoutComponentName } from './types/layout';
-import getLayoutNameByRoute from './utils/getLayoutNameByRoute';
+import { customEventFactory, registerStylesTarget } from '../pbc/utils';
 {{#if FDC3.channels.length}}
 import { listenToChannel, onFDC3Ready } from './utils';
 {{/if}}
@@ -21,17 +20,12 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
   title = '{{capitalCase appName}}';
   store = getStore();
 
-  // @ts-ignore
-  @Connect connect: Connect;
-
   constructor(
     private el: ElementRef,
     router: Router,
   ) {
-    // @ts-ignore
-    configureFoundationAuth({ router, connectService: this.connect });
-
-
+      configureFoundationLogin({ router });
+      
     // Set layout componet based on route
     router.events.subscribe((event: any) => {
       if (event instanceof NavigationEnd) {

package/client-tmp/angular/src/app/guards/auth.guard.ts

@@ -9,7 +9,7 @@ export class AuthGuard extends PermissionsGuard {
   override async canActivate(): Promise<boolean> {
     if (!this.user.isAuthenticated) {
       this.user.trackPath();
-      await this.router.navigate([`/${AUTH_PATH}`]);
+      this.router.navigate([`/${AUTH_PATH}`]);
       return false;
     }
     return true;

package/client-tmp/angular/src/app/layouts/default/default.layout.html

@@ -5,7 +5,6 @@
     show-luminance-toggle-button
     show-misc-toggle-button
     (luminance-icon-clicked)="onLuminanceToogle()"
-    (logout-clicked)="onLogout()"
     [navigateTo]="navigateAngular"
     [routeNavItems]="navItems"
   >

package/client-tmp/angular/src/app/layouts/default/default.layout.ts

@@ -29,15 +29,11 @@ export class DefaultLayoutComponent extends BaseLayout implements AfterViewInit
     configureDesignSystem(this.designSystemProviderElement.nativeElement, designTokens);
     registerStylesTarget(this.el.nativeElement, 'layout');
   }
-
+  
   navigateAngular = (path: string) => {
     this.router.navigate([path]);
   };
-
-  onLogout = () => {
-    this.router.navigate(['/login']);
-  };
-
+  
   onLuminanceToogle = (): void => {
     baseLayerLuminance.setValueFor(
       this.designSystemProviderElement.nativeElement,

package/client-tmp/angular/src/app/services/route.service.ts

@@ -39,7 +39,7 @@ export class RouteService {
                 navItems: [
                     {
                         navId: 'header',
-                        title: '{{#if this.title}}{{capitalCase this.title}}{{else}}{{this.name}}{{/if}}',
+                        title: '{{#if this.title}}{{this.title}}{{else}}{{this.name}}{{/if}}',
                         icon: {
                             name: '{{this.icon}}',
                             variant: 'solid',
@@ -53,7 +53,7 @@ export class RouteService {
 
     /**
      * @privateRemarks
-     * The shell has access to context, so it's possible for it to return a pre-mapped framework variant of routes.
+     * The shell has access to context, so it's possible for it to return a pre-mapped framework variant of routes. 
      * In this iteration we're doing it inline, given the angular version may move and here we know the shape we need.
      */
     pbcRoutes(): Routes {

package/client-tmp/angular/src/app/share/foundation-auth.ts

@@ -1,34 +1,20 @@
+// import { configure } from '@genesislcap/foundation-auth/config';
 import type { Router } from '@angular/router';
-import { configure, defaultAuthConfig } from '@genesislcap/foundation-auth/config';
-import type { Connect } from '@genesislcap/foundation-comms';
-import { getUser } from '@genesislcap/foundation-user';
-import { GENESIS_SOCKET_URL } from '@genesislcap/foundation-utils';
-import { AUTH_PATH } from '../app.config';
 
 /**
  * Configure the micro frontend
  */
-export const configureFoundationAuth = ({ router, connectService,}: { router: Router; connectService: Connect; }) => {
-  const baseElement = document.querySelector('base');
-  const basePath = baseElement?.getAttribute('href') || '';
-
-  configure({
-    name: 'client-app-login',
-    omitRoutes: ['request-account', 'forgot-password'],
-    fields: {
-      ...defaultAuthConfig.fields,
-      username: {
-        ...defaultAuthConfig.fields.username,
-      },
-    },
-    hostPath: basePath + AUTH_PATH,
-    postLoginRedirect: async () => {
-      const url = GENESIS_SOCKET_URL;
-      await connectService.connect(url);
-
-      const lastPath = getUser().lastPath()?.replace(basePath, '');
-
-      router.navigate([lastPath ?? '{{kebabCase routes.[0].name}}']);
-    },
-  });
-};
+export const configureFoundationAuth = ({
+  router,
+  connectService,
+}: {
+  router: Router;
+  connectService: any;
+}) => null
+  // configure({
+  //   omitRoutes: ['request-account'],
+  //   postLoginRedirect: async () => {
+  //     await connectService.init();
+  //     router.navigate([`/${INTERNAL_URLS.homepage}`]);
+  //   },
+  // });

package/client-tmp/angular/src/app/share/foundation-login.ts

@@ -0,0 +1,45 @@
+import {configure, define} from '@genesislcap/foundation-login';
+import type { Router } from '@angular/router';
+import { getUser } from '@genesislcap/foundation-user';
+import { css, DI } from '@genesislcap/web-core';
+import { AUTH_PATH } from '../app.config';
+import logo from '../../assets/logo.svg';
+
+// eslint-disable-next-line
+declare var ENABLE_SSO: boolean;
+
+const ssoSettings =
+  typeof ENABLE_SSO !== 'undefined' && ENABLE_SSO === true
+    ? {
+        autoAuth: true,
+        sso: {
+          toggled: true,
+          identityProvidersPath: 'sso/list',
+        },
+      }
+    : {};
+
+/**
+ * Configure the micro frontend
+ */
+export const configureFoundationLogin = ({
+  router,
+}: {
+  router: Router;
+}) => {
+  configure(DI.getOrCreateDOMContainer(), {
+    autoConnect: true,
+    hostPath: AUTH_PATH,
+    redirectHandler: () => {
+      router.navigate(['{{kebabCase routes.[0].name}}'])
+    },
+    ...ssoSettings,
+    logo: css `
+      content: url("${logo}");
+    `,
+  });
+
+  return define({
+    name: `client-app-login`,
+  });
+}

package/client-tmp/react/src/layouts/default/DefaultLayout.tsx

@@ -9,8 +9,6 @@ import styles from './DefaultLayout.module.css';
 import PBCElementsRenderer from '@/pbc/elementsRenderer';
 import * as designTokens from '@/styles/design-tokens.json';
 import { useRoutesContext } from '@/store/RoutesContext';
-import { connectService } from '@/services/connect.service.ts';
-import { getUser } from '@genesislcap/foundation-user';
 import { AUTH_PATH } from '@/config';
 
 interface DefaultLayoutProps {
@@ -45,11 +43,6 @@ const DefaultLayout: React.FC<DefaultLayoutProps> = ({ children }) => {
     }
   };
 
-  if (!connectService.isConnected()) {
-    getUser().trackPath();
-    navigate(`/${AUTH_PATH}`)
-  }
-
   useEffect(() => {
     if (designSystemProviderRef.current) {
       configureDesignSystem(designSystemProviderRef.current, designTokens);

package/client-tmp/react/src/pages/AuthPage/AuthPage.tsx

@@ -1,7 +1,7 @@
 import React, {useEffect} from 'react';
 import './AuthPage.css';
 import { configureFoundationLogin } from "@/share/foundation-login.ts";
-import { useNavigate } from "react-router";
+import { useNavigate } from 'react-router';
 
 const AuthPage: React.FC = () => {
     const navigate = useNavigate();

package/client-tmp/react/src/share/foundation-login.ts

@@ -1,37 +1,23 @@
-import { configure, defaultAuthConfig } from '@genesislcap/foundation-auth/config';
-import { getUser } from '@genesislcap/foundation-user';
-import { AUTH_PATH } from '@/config';
-import { GENESIS_SOCKET_URL } from '@genesislcap/foundation-utils';
-import { Connect } from '@genesislcap/foundation-comms';
+import {configure, define} from '@genesislcap/foundation-login';
 import { DI } from '@genesislcap/web-core';
-import type { NavigateFunction } from 'react-router';
+import { AUTH_PATH } from '@/config';
 
 /**
  * Configure the micro frontend
  */
-export const configureFoundationLogin = ({navigate}: { navigate: NavigateFunction}) => {
-  const baseElement = document.querySelector('base');
-  const basePath = baseElement?.getAttribute('href') || '';
-  const connect = DI.getOrCreateDOMContainer().get(Connect);
-
-
-  configure({
-    name: 'client-app-login',
-    omitRoutes: ['request-account', 'forgot-password'],
-    fields: {
-      ...defaultAuthConfig.fields,
-      username: {
-        ...defaultAuthConfig.fields.username,
-      },
+export const configureFoundationLogin = ({ navigate }:{ navigate: any }) => {
+  configure(DI.getOrCreateDOMContainer(), {
+    autoConnect: true,
+    autoAuth: true, // < Allow users to skip login
+    showConnectionIndicator: true,
+    hostPath: AUTH_PATH,
+    redirectHandler: () => {
+      const lastPath = '/{{kebabCase routes.[0].name}}';
+      navigate(lastPath);
     },
-    hostPath: basePath + AUTH_PATH,
-    postLoginRedirect: async () => {
-      const url = GENESIS_SOCKET_URL;
-      await connect.connect(url);
+  });
 
-      const redirectUrl = '/{{kebabCase routes.[0].name}}';
-      navigate(redirectUrl);
-    },
-  })
+  return define({
+    name: `client-app-login`,
+  });
 }
-

package/client-tmp/react/webpack.config.js

@@ -7,7 +7,7 @@ module.exports = (env, argv) => {
   const https = process.env.HTTPS === 'true';
   const open = !(process.env.NO_OPEN === 'true');
   const environmentFile = mode === 'production'
-    ? 'environment.prod.ts'
+    ? 'environment.prod.ts' 
     : 'environment.ts';
   const environmentPath = resolve(__dirname, 'src/environments', environmentFile);
 
@@ -76,20 +76,6 @@ module.exports = (env, argv) => {
     ],
     devServer: {
       server: https ? 'https' : 'http',
-      proxy: [
-        {
-          context: "/sm",
-          "target": "{{apiHost}}",
-          "secure": false,
-          "pathRewrite": {"^/sm": ""},
-        },
-        {
-          context: "/gwf",
-          "target": "{{apiHost}}",
-          "secure": false,
-          "ws": true
-        }
-      ],
       open,
       static: {
         directory: join(__dirname, 'public'),

package/client-tmp/web-components/package.json

@@ -89,7 +89,6 @@
     "lint-staged": "^12.4.1"
   },
   "dependencies": {
-    "@genesislcap/foundation-auth": "{{versions.UI}}",
     "@genesislcap/foundation-comms": "{{versions.UI}}",
     "@genesislcap/foundation-entity-management": "{{versions.UI}}",
     "@genesislcap/foundation-events": "{{versions.UI}}",
@@ -118,7 +117,6 @@
     "tslib": "^2.3.1"
   },
   "overrides": {
-    "@genesislcap/foundation-auth": "{{versions.UI}}",
     "@genesislcap/foundation-comms": "{{versions.UI}}",
     "@genesislcap/foundation-entity-management": "{{versions.UI}}",
     "@genesislcap/foundation-events": "{{versions.UI}}",
@@ -141,7 +139,6 @@
     "@genesislcap/g2plot-chart": "{{versions.UI}}",
     "@genesislcap/rapid-design-system": "{{versions.UI}}",
     "@genesislcap/rapid-grid-pro": "{{versions.UI}}",
-    "@genesislcap/web-core": "{{versions.UI}}",
-    "typescript": "5.6.3"
+    "@genesislcap/web-core": "{{versions.UI}}"
   }
 }

package/client-tmp/web-components/src/layouts/default.ts

@@ -1,7 +1,5 @@
 import { getApp } from '@genesislcap/foundation-shell/app';
 import type { FoundationRouter } from '@genesislcap/foundation-ui';
-import { FoundationRouteNav } from '@genesislcap/foundation-ui';
-import { PUBLIC_PATH } from '@genesislcap/foundation-utils';
 import { css, GenesisElementLayout, html } from '@genesislcap/web-core';
 import type { Store } from '../store';
 
@@ -44,8 +42,6 @@ export const defaultLayout = new GenesisElementLayout(
       <foundation-header
         show-luminance-toggle-button
         show-misc-toggle-button
-        @logout-clicked=${(x) =>
-          FoundationRouteNav.path.push(`${PUBLIC_PATH}/${x.config.loginPath}/logout`)}
         :routeNavItems=${(x) => x.config.getNavItems()}
       ></foundation-header>
       <div class="content">

package/client-tmp/web-components/src/routes/config.ts

@@ -1,14 +1,16 @@
-import { getUser, navigateTo } from '@genesislcap/foundation-auth';
-import { Auth, Connect } from '@genesislcap/foundation-comms';
+import { Auth, Session } from '@genesislcap/foundation-comms';
+import { defaultLoginConfig, LoginConfig } from '@genesislcap/foundation-login';
 import { FoundationRouterConfiguration } from '@genesislcap/foundation-ui';
-import { GENESIS_SOCKET_URL, PUBLIC_PATH } from '@genesislcap/foundation-utils';
+import { PUBLIC_PATH } from '@genesislcap/foundation-utils';
+import { NavigationPhase, optional, Route } from '@genesislcap/web-core';
 import { defaultLayout, loginLayout } from '../layouts';
-import { NotFound } from './not-found/not-found';
-import { defaultNotPermittedRoute, NotPermitted } from './not-permitted/not-permitted';
-import { LoginSettings } from './types';
+import { logger } from '../utils';
 {{#each routes}}
 import { {{pascalCase this.name}} } from './{{kebabCase this.name}}/{{kebabCase this.name}}';
 {{/each}}
+import { NotFound } from './not-found/not-found';
+import { defaultNotPermittedRoute, NotPermitted } from './not-permitted/not-permitted';
+import { LoginSettings } from './types';
 
 // eslint-disable-next-line
 declare var ENABLE_SSO: string;
@@ -27,13 +29,17 @@ const ssoSettings =
 const publicPath = typeof PUBLIC_PATH !== 'undefined' ? PUBLIC_PATH : '';
 
 export class MainRouterConfig extends FoundationRouterConfiguration<LoginSettings> {
-  @Connect private connect: Connect;
-  @Auth private auth: Auth;
+  constructor(
+    @Auth private auth: Auth,
+    @Session private session: Session,
+    @optional(LoginConfig)
+    private loginConfig: LoginConfig = { ...defaultLoginConfig, autoAuth: true, autoConnect: true },
+  ) {
+    super();
+  }
 
   async configure() {
     this.configureAnalytics();
-    this.configureRoutePermittedChecks();
-    this.configureFallbackRouteDefinition();
     this.title = '{{capitalCase appName}}';
     this.defaultLayout = defaultLayout;
 
@@ -46,31 +52,22 @@ export class MainRouterConfig extends FoundationRouterConfiguration<LoginSetting
         name: 'login',
         title: 'Login',
         element: async () => {
-          const { configure, defaultAuthConfig } = await import(
-            '@genesislcap/foundation-auth/config'
+          const { configure, define } = await import(
+            /* webpackChunkName: "foundation-login" */
+            '@genesislcap/foundation-login'
           );
-          return configure({
-            omitRoutes: ['request-account', 'forgot-password'],
-            fields: {
-              ...defaultAuthConfig.fields,
-              username: {
-                ...defaultAuthConfig.fields.username,
-                pattern: '^[a-zA-Z0-9.@_:-]*$',
-              },
-            },
-            hostPath: this.loginPath,
-            postLoginRedirect: async () => {
-              await this.connect.connect(GENESIS_SOCKET_URL);
-              navigateTo(getUser().lastPath() ?? publicPath + '{{kebabCase routes.[0].name}}');
-            },
-            postLogoutRedirect: () => {
-              if (this.connect.isConnected) {
-                this.connect.disconnect();
-              }
-              defaultAuthConfig.postLogoutRedirect();
-            },
+          configure(this.container, {
+            hostPath: 'login',
+            autoConnect: true,
+            defaultRedirectUrl: publicPath + '/{{kebabCase routes.[0].name}}',
             ...ssoSettings,
           });
+          return define({
+            name: `{{rootElement}}-login`,
+            /**
+             * You can augment the template and styles here when needed.
+             */
+          });
         },
         layout: loginLayout,
         settings: { public: true },
@@ -106,22 +103,70 @@ export class MainRouterConfig extends FoundationRouterConfiguration<LoginSetting
       {{/each}}
     );
 
+    /**
+     * Example of a FallbackRouteDefinition
+     */
+    this.routes.fallback(() =>
+      this.auth.isLoggedIn ? { redirect: 'not-found' } : { redirect: authPath },
+    );
+
+    /**
+     * Example of a NavigationContributor
+     */
     this.contributors.push({
       navigate: async (phase) => {
         const settings = phase.route.settings;
 
         /**
-         * If the route is public or the user is authenticated don't block
+         * If public route don't block
          */
-        if (settings?.public || this.user.isAuthenticated) {
+        if (settings && settings.public) {
           return;
         }
 
         /**
-         * Otherwise route them to login
+         * If logged in don't block
          */
-        this.navigationPhaseLoginRedirect(phase);
+        if (this.auth.isLoggedIn) {
+          this.redirectIfNotPermitted(settings, phase);
+          return;
+        }
+
+        /**
+         * If allowAutoAuth and session is valid try to connect+auto-login
+         */
+        if (this.loginConfig.autoAuth && (await this.reAuthFromSession(settings, phase))) {
+          return;
+        }
+
+        /**
+         * Otherwise route them somewhere, like to a login
+         */
+        phase.cancel(() => {
+          this.session.captureReturnUrl();
+          Route.name.replace(phase.router, authPath);
+        });
       },
     });
   }
+
+  private async reAuthFromSession(settings: LoginSettings, phase: NavigationPhase) {
+    return this.auth.reAuthFromSession().then((authenticated) => {
+      logger.info(`reAuthFromSession. authenticated: ${authenticated}`);
+      if (authenticated) {
+        this.redirectIfNotPermitted(settings, phase);
+      }
+      return authenticated;
+    });
+  }
+
+  private redirectIfNotPermitted(settings: LoginSettings, phase: NavigationPhase) {
+    const { path } = phase.route.endpoint;
+    if (settings?.isPermitted && !settings.isPermitted()) {
+      logger.warn(`Not permitted - Redirecting URL from ${path} to ${defaultNotPermittedRoute}.`);
+      phase.cancel(() => {
+        Route.name.replace(phase.router, defaultNotPermittedRoute);
+      });
+    }
+  }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/blank-app-seed",
   "description": "Genesis Blank App Seed",
-  "version": "3.41.0",
+  "version": "3.41.2",
   "license": "Apache-2.0",
   "scripts": {
     "release": "semantic-release"

package/client-tmp/angular/src/proxy.conf.json

@@ -1,12 +0,0 @@
-{
-  "/sm": {
-    "target": "{{apiHost}}",
-    "secure": false,
-    "pathRewrite": { "^/sm": "" }
-  },
-  "/gwf": {
-    "target": "{{apiHost}}",
-    "secure": false,
-    "ws": true
-  }
-}

package/server/{{appName}}-app/src/main/genesis/scripts/genesis-router.kts

@@ -1,13 +0,0 @@
-package scripts
-
-router {
-    webPort = 9064
-    socketPort = 9065
-
-    cookieAuthentication {
-      enabled = true
-      httpOnly = true
-      secure = false
-      sameSite = SameSite.Lax
-    }
-}