@genesislcap/blank-app-seed 3.40.1 → 3.41.0

package/.genx/package.json

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

package/.genx/versions.json

@@ -1,5 +1,5 @@
 {
-  "UI": "14.234.1",
-  "GSF": "8.8.0",
-  "Auth": "8.8.0"
+  "UI": "14.246.2",
+  "GSF": "8.9.0",
+  "Auth": "8.9.0"
 }

package/CHANGELOG.md

@@ -1,5 +1,49 @@
 # Changelog
 
+## [3.41.0](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.40.1...v3.41.0) (2025-03-06)
+
+
+### Features
+
+* bump GSF to 8.9 [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) (#436) 1295e2b
+* release 8.9 [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) (#437) 1172438
+* use foundation-auth as default login [FUI-2196](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/2196) (#427) abd0c48
+* use foundation-auth as default login [FUI-2196](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/2196) (#427) b8c1d13
+* use public path for navigation when available [FUI-2071](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/2071) (#410) 5e6c1af
+
+
+### Bug Fixes
+
+* automated dependency version update [skip-ci] [PSD-9](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/9) 7229060
+* automated dependency version update [skip-ci] [PSD-9](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/9) (#414) bca5113
+* automated dependency version update [skip-ci] [PSD-9](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/9) (#426) d3751d1
+* automated dependency version update [skip-ci] [PSD-9](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/9) (#429) 7f512d2
+* automated dependency version update [skip-ci] [PSD-9](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/9) (#431) c2eb359
+* customEvent tooltip update GENC-847 (#419) 80f5e8e
+* include auth in config [FUI-2196](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/2196) 1c549d5
+* revert changes 65040e4
+* revert changes from 8.9 (#430) 4133d7e, closes FUI-2196 PSD-9
+* update versions build trigger f8783d3
+* updating server version information for Auth [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) e897283
+* updating server version information for Auth [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) d5fd0da
+* updating server version information for Auth [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) eb67c93
+* updating server version information for Auth [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) d7d9ecb
+* updating server version information for Auth [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) c456aad
+* updating server version information for Auth [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) e84d97f
+* updating server version information for Auth [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) 761fc00
+* updating server version information for Auth [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) 266dfd6
+* updating server version information for GSF [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) 520e1bb
+* updating server version information for GSF [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) 0772186
+* updating server version information for GSF [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) ff4366b
+* updating server version information for GSF [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) 6f4446a
+* updating server version information for GSF [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) f4b429c
+* updating server version information for GSF [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) 7dc3ae2
+* updating server version information for GSF [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) e95345c
+* updating server version information for GSF [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) bcff53d
+* updating server version information for GSF [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) 1992fef
+* updating server version information for GSF [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) 9decda0
+* updating server version information for GSF [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) b63f98e
+
 ## [3.40.1](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.40.0...v3.40.1) (2025-02-17)
 
 

package/client-tmp/angular/angular.json

@@ -74,6 +74,9 @@
         },
         "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,11 +1,12 @@
 import { AfterViewInit, Component, ElementRef, OnDestroy, OnInit } from '@angular/core';
 import { Router, NavigationEnd } from '@angular/router';
-import getLayoutNameByRoute from './utils/getLayoutNameByRoute';
-import type { LayoutComponentName } from './types/layout';
-import { configureFoundationLogin } from './share/foundation-login';
+import { Connect } from '@genesislcap/foundation-comms';
+import { customEventFactory, registerStylesTarget } from '../pbc/utils';
+import { configureFoundationAuth } from './share/foundation-auth';
 import { registerComponents } from './share/genesis-components';
 import { getStore } from './store';
-import { customEventFactory, registerStylesTarget } from '../pbc/utils';
+import type { LayoutComponentName } from './types/layout';
+import getLayoutNameByRoute from './utils/getLayoutNameByRoute';
 {{#if FDC3.channels.length}}
 import { listenToChannel, onFDC3Ready } from './utils';
 {{/if}}
@@ -20,12 +21,17 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
   title = '{{capitalCase appName}}';
   store = getStore();
 
+  // @ts-ignore
+  @Connect connect: Connect;
+
   constructor(
     private el: ElementRef,
     router: Router,
   ) {
-      configureFoundationLogin({ router });
-      
+    // @ts-ignore
+    configureFoundationAuth({ router, connectService: this.connect });
+
+
     // 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();
-      this.router.navigate([`/${AUTH_PATH}`]);
+      await this.router.navigate([`/${AUTH_PATH}`]);
       return false;
     }
     return true;

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

@@ -5,6 +5,7 @@
     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,11 +29,15 @@ 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}}{{this.title}}{{else}}{{this.name}}{{/if}}',
+                        title: '{{#if this.title}}{{capitalCase 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,20 +1,34 @@
-// 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: any;
-}) => null
-  // configure({
-  //   omitRoutes: ['request-account'],
-  //   postLoginRedirect: async () => {
-  //     await connectService.init();
-  //     router.navigate([`/${INTERNAL_URLS.homepage}`]);
-  //   },
-  // });
+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}}']);
+    },
+  });
+};

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

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

package/client-tmp/react/package.json

@@ -58,7 +58,7 @@
     "history": "^5.3.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "react-router-dom": "7.0.2",
+    "react-router": "^7.1.3",
     "web-vitals": "^2.1.4"
   },
   "devDependencies": {
@@ -77,7 +77,7 @@
     "@types/css-modules": "^1.0.5",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.14.10",
-    "@types/react": "^19.0.1",  
+    "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.2",
     "@typescript-eslint/eslint-plugin": "^7.13.1",
     "@typescript-eslint/parser": "^7.13.1",

package/client-tmp/react/src/App.tsx

@@ -1,7 +1,6 @@
 import { useEffect, useState } from 'react';
-import { unstable_HistoryRouter as HistoryRouter, Routes, Route, useLocation } from 'react-router-dom';
+import {Routes, Route, useLocation, BrowserRouter} from 'react-router';
 import {
-  history,
   setApiHost,
   getLayoutNameByRoute,
   {{#if FDC3.channels.length~}}
@@ -17,7 +16,6 @@ import { AuthProvider } from './store/AuthContext';
 import { RoutesProvider, useRoutesContext } from './store/RoutesContext';
 import AuthPage from './pages/AuthPage/AuthPage';
 import { registerComponents as genesisRegisterComponents } from './share/genesis-components';
-import { configureFoundationLogin } from './share/foundation-login';
 import ProtectedGuard from './guards/ProtectedGuard';
 import { storeService } from '@/services/store.service';
 
@@ -33,10 +31,8 @@ const DynamicLayout = () => {
 
   useEffect(() => {
     handleRouteChange(location);
-    const unlisten = history.listen(handleRouteChange);
 
     return () => {
-      unlisten();
     }
   }, [location]);
 
@@ -82,7 +78,6 @@ const App: React.FC<AppProps> = ({ rootElement }) => {
 
   setApiHost();
   genesisRegisterComponents();
-  configureFoundationLogin({ router: history });
 
   useEffect(() => {
     registerStylesTarget(document.body, 'main');
@@ -107,14 +102,14 @@ const App: React.FC<AppProps> = ({ rootElement }) => {
   return (
     <AuthProvider>
       <RoutesProvider>
-        <HistoryRouter history={history as any}>
+        <BrowserRouter>
           <Routes>
             <Route path="*" element={<DynamicLayout />} />
           </Routes>
-        </HistoryRouter>
+        </BrowserRouter>
       </RoutesProvider>
     </AuthProvider>
   );
 };
 
-export default App;
+export default App;

package/client-tmp/react/src/config.ts

@@ -2,11 +2,11 @@ import { RouteLayouts } from './types/RouteLayouts';
 import { environment } from '@environment';
 
 export const routeLayouts: RouteLayouts = {
-  '/auth': 'blank',
+  '/login': 'blank',
   '/': 'blank',
 };
 
-export const AUTH_PATH = 'auth';
+export const AUTH_PATH = 'login';
 export const NOT_PERMITTED_PATH = 'not-permitted';
 
 export const API_DATA = {

package/client-tmp/react/src/guards/ProtectedGuard.tsx

@@ -1,6 +1,5 @@
 import { useState, useEffect, ReactNode } from 'react';
-import { RouteObject } from 'react-router';
-import { useNavigate } from 'react-router-dom';
+import {RouteObject, useNavigate} from 'react-router';
 import isConnectedHelper from '@/helpers/isConnectedHelper';
 import isAuthenticatedHelper from '@/helpers/isAuthenticatedHelper';
 import hasPermissionHelper from '@/helpers/hasPermissionHelper';
@@ -56,11 +55,15 @@ const ProtectedGuard: React.FC<{ children: ReactNode }> = ({ children }: { child
     }
 
     if (permissionState) {
-      navigate(`/${redirectUrlByPermissionState[permissionState]}`);
+      const baseElement = document.querySelector('base');
+      const basePath = baseElement?.getAttribute('href') || '';
+
+      const redirect = `${basePath}${redirectUrlByPermissionState[permissionState]}`;
+      navigate(`/${redirect}`);
     }
   }, [routes, isConnected, isAuthenticated, hasPermission]);
 
   return children;
 };
 
-export default ProtectedGuard;
+export default ProtectedGuard;

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

@@ -1,7 +1,6 @@
 import React, { ReactNode, useEffect, useRef } from 'react';
-import { RouteObject } from 'react-router';
+import { RouteObject, useNavigate } from 'react-router';
 import { configureDesignSystem, getNavItems } from '@genesislcap/foundation-ui';
-import { useNavigate } from 'react-router-dom';
 import {
   baseLayerLuminance,
   StandardLuminance,
@@ -10,6 +9,9 @@ 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 {
   children: ReactNode;
@@ -25,7 +27,6 @@ type ExtendedRouteObject = RouteObject & {
 const DefaultLayout: React.FC<DefaultLayoutProps> = ({ children }) => {
   const navigate = useNavigate();
   const designSystemProviderRef = useRef<HTMLElement>(null);
-  const foundationHeaderRef = useRef<HTMLElement>(null);
   const routes = useRoutesContext() as ExtendedRouteObject[];
   const navItems = getNavItems(routes.flatMap((route) => ({
     path: route.path || '',
@@ -43,25 +44,18 @@ const DefaultLayout: React.FC<DefaultLayoutProps> = ({ children }) => {
       );
     }
   };
-  
+
+  if (!connectService.isConnected()) {
+    getUser().trackPath();
+    navigate(`/${AUTH_PATH}`)
+  }
+
   useEffect(() => {
     if (designSystemProviderRef.current) {
       configureDesignSystem(designSystemProviderRef.current, designTokens);
     }
 
-    const handleLuminanceIconClicked = () => {
-      onLuminanceToggle();
-    };
-
-    const foundationHeader = foundationHeaderRef.current;
-    if (foundationHeader) {
-      foundationHeader.addEventListener('luminance-icon-clicked', handleLuminanceIconClicked);
-    }
-
     return () => {
-      if (foundationHeader) {
-        foundationHeader.removeEventListener('luminance-icon-clicked', handleLuminanceIconClicked);
-      }
     };
   }, []);
 
@@ -71,7 +65,8 @@ const DefaultLayout: React.FC<DefaultLayoutProps> = ({ children }) => {
     <rapid-design-system-provider ref={designSystemProviderRef} class={className}>
       <PBCElementsRenderer target={['layout-start']} />
       <foundation-header
-        ref={foundationHeaderRef}
+        onluminance-icon-clicked={onLuminanceToggle}
+        onlogout-clicked={() => navigate(`/${AUTH_PATH}`)}
         show-luminance-toggle-button
         show-misc-toggle-button
         routeNavItems={navItems}

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

@@ -1,12 +1,20 @@
-import React from 'react';
+import React, {useEffect} from 'react';
 import './AuthPage.css';
+import { configureFoundationLogin } from "@/share/foundation-login.ts";
+import { useNavigate } from "react-router";
 
 const AuthPage: React.FC = () => {
-  return (
-    <section className="auth-page">
-      <client-app-login></client-app-login>
-    </section>
-  );
+    const navigate = useNavigate();
+
+    useEffect(() => {
+        configureFoundationLogin({ navigate });
+    }, []);
+
+    return (
+        <section className="auth-page">
+            <client-app-login></client-app-login>
+        </section>
+    );
 };
 
-export default AuthPage;
+export default AuthPage;

package/client-tmp/react/src/pbc/container.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useRef, RouteObject } from 'react';
 import { deriveElementTag } from './utils';
 import { useRoutesContext } from '@/store/RoutesContext';
-import { useLocation } from 'react-router-dom';
+import { useLocation } from 'react-router';
 
 type ExtendedRouteObject = RouteObject & {
   data?: {
@@ -41,4 +41,4 @@ const PBCContainer: React.FC = () => {
   return <div ref={containerRef} className="container" style=\{{ width: '100%', height: '100%' }}></div>;
 };
 
-export default PBCContainer;
+export default PBCContainer;

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

@@ -1,28 +1,37 @@
-import {configure, define} from '@genesislcap/foundation-login';
+import { configure, defaultAuthConfig } from '@genesislcap/foundation-auth/config';
 import { getUser } from '@genesislcap/foundation-user';
-import { DI } from '@genesislcap/web-core';
 import { AUTH_PATH } from '@/config';
-import type { Router } from '@/utils/history';
+import { GENESIS_SOCKET_URL } from '@genesislcap/foundation-utils';
+import { Connect } from '@genesislcap/foundation-comms';
+import { DI } from '@genesislcap/web-core';
+import type { NavigateFunction } from 'react-router';
 
 /**
  * Configure the micro frontend
  */
-export const configureFoundationLogin = ({ router }:{ router: Router }) => {
-  configure(DI.getOrCreateDOMContainer(), {
-    autoConnect: true,
-    autoAuth: true, // < Allow users to skip login
-    showConnectionIndicator: true,
-    hostPath: AUTH_PATH,
-    redirectHandler: () => {
-      // workaround for redirect from foundation-login
-      setTimeout(() => {
-        const lastPath = getUser().lastPath() ?? '/{{kebabCase routes.[0].name}}';
-        router.push(lastPath);
-      }, 0);
+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,
+      },
     },
-  });
+    hostPath: basePath + AUTH_PATH,
+    postLoginRedirect: async () => {
+      const url = GENESIS_SOCKET_URL;
+      await connect.connect(url);
 
-  return define({
-    name: `client-app-login`,
-  });
+      const redirectUrl = '/{{kebabCase routes.[0].name}}';
+      navigate(redirectUrl);
+    },
+  })
 }
+

package/client-tmp/react/src/store/RoutesContext.tsx

@@ -1,5 +1,5 @@
 import React, { createContext, useContext, ReactNode } from 'react';
-import { RouteObject, Navigate } from 'react-router-dom';
+import { RouteObject, Navigate } from 'react-router';
 import { getApp } from '@genesislcap/foundation-shell/app';
 import AuthPage from '@/pages/AuthPage/AuthPage';
 import NotFoundPage from '@/pages/NotFoundPage/NotFoundPage';
@@ -71,4 +71,4 @@ export const RoutesProvider: React.FC<{ children: ReactNode }> = ({ children })
 
 export const useRoutesContext = () => {
   return useContext(RoutesContext);
-};
+};

package/client-tmp/react/src/utils/index.ts

@@ -1,6 +1,5 @@
-export * from './history';
 export * from './fdc3';
 export * from './layout';
 export * from './permissions';
 export * from './setApiHost';
-export * from './getLayoutNameByRoute';
+export * from './getLayoutNameByRoute';

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,6 +76,20 @@ 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'),
@@ -100,4 +114,4 @@ module.exports = (env, argv) => {
       modules: false,
     },
   };
-};
+};

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

@@ -89,6 +89,7 @@
     "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}}",
@@ -117,6 +118,7 @@
     "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}}",
@@ -139,6 +141,7 @@
     "@genesislcap/g2plot-chart": "{{versions.UI}}",
     "@genesislcap/rapid-design-system": "{{versions.UI}}",
     "@genesislcap/rapid-grid-pro": "{{versions.UI}}",
-    "@genesislcap/web-core": "{{versions.UI}}"
+    "@genesislcap/web-core": "{{versions.UI}}",
+    "typescript": "5.6.3"
   }
 }

package/client-tmp/web-components/public/initSSO.js

@@ -1,4 +1,4 @@
-// Set the appHostURL from which the providers are to be fetched.
+// Set the appHostURL from which the providers are to be fetched
 const appHostURL = `${location.protocol}//${location.host}/gwf/`;
 
 const fetchIDPs = async () => {

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

@@ -1,16 +1,14 @@
-import { Auth, Session } from '@genesislcap/foundation-comms';
-import { defaultLoginConfig, LoginConfig } from '@genesislcap/foundation-login';
+import { getUser, navigateTo } from '@genesislcap/foundation-auth';
+import { Auth, Connect } from '@genesislcap/foundation-comms';
 import { FoundationRouterConfiguration } from '@genesislcap/foundation-ui';
-import { PUBLIC_PATH } from '@genesislcap/foundation-utils';
-import { NavigationPhase, optional, Route } from '@genesislcap/web-core';
+import { GENESIS_SOCKET_URL, PUBLIC_PATH } from '@genesislcap/foundation-utils';
 import { defaultLayout, loginLayout } from '../layouts';
-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';
+{{#each routes}}
+import { {{pascalCase this.name}} } from './{{kebabCase this.name}}/{{kebabCase this.name}}';
+{{/each}}
 
 // eslint-disable-next-line
 declare var ENABLE_SSO: string;
@@ -29,17 +27,13 @@ const ssoSettings =
 const publicPath = typeof PUBLIC_PATH !== 'undefined' ? PUBLIC_PATH : '';
 
 export class MainRouterConfig extends FoundationRouterConfiguration<LoginSettings> {
-  constructor(
-    @Auth private auth: Auth,
-    @Session private session: Session,
-    @optional(LoginConfig)
-    private loginConfig: LoginConfig = { ...defaultLoginConfig, autoAuth: true, autoConnect: true },
-  ) {
-    super();
-  }
+  @Connect private connect: Connect;
+  @Auth private auth: Auth;
 
   async configure() {
     this.configureAnalytics();
+    this.configureRoutePermittedChecks();
+    this.configureFallbackRouteDefinition();
     this.title = '{{capitalCase appName}}';
     this.defaultLayout = defaultLayout;
 
@@ -52,22 +46,31 @@ export class MainRouterConfig extends FoundationRouterConfiguration<LoginSetting
         name: 'login',
         title: 'Login',
         element: async () => {
-          const { configure, define } = await import(
-            /* webpackChunkName: "foundation-login" */
-            '@genesislcap/foundation-login'
+          const { configure, defaultAuthConfig } = await import(
+            '@genesislcap/foundation-auth/config'
           );
-          configure(this.container, {
-            hostPath: 'login',
-            autoConnect: true,
-            defaultRedirectUrl: publicPath + '{{kebabCase routes.[0].name}}',
+          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();
+            },
             ...ssoSettings,
           });
-          return define({
-            name: `{{rootElement}}-login`,
-            /**
-             * You can augment the template and styles here when needed.
-             */
-          });
         },
         layout: loginLayout,
         settings: { public: true },
@@ -103,70 +106,22 @@ 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 public route don't block
+         * If the route is public or the user is authenticated don't block
          */
-        if (settings && settings.public) {
+        if (settings?.public || this.user.isAuthenticated) {
           return;
         }
 
         /**
-         * If logged in don't block
+         * Otherwise route them to login
          */
-        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);
-        });
+        this.navigationPhaseLoginRedirect(phase);
       },
     });
   }
-
-  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.40.1",
+  "version": "3.41.0",
   "license": "Apache-2.0",
   "scripts": {
     "release": "semantic-release"

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

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

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

@@ -1,47 +0,0 @@
-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, // < Guard in place to ensure connection. Keeping the connect form in place for now.
-    autoAuth: true, // < Allow users to skip login
-    showConnectionIndicator: true,
-    hostPath: AUTH_PATH,
-    redirectHandler: () => {
-      router.navigate([getUser().lastPath() ?? '{{kebabCase routes.[0].name}}'])
-    },
-    ...ssoSettings,
-    logo: css `
-      content: url("${logo}");
-    `,
-  });
-
-  return define({
-    name: `client-app-login`,
-  });
-}

package/client-tmp/react/src/utils/history.ts

@@ -1,5 +0,0 @@
-import { createBrowserHistory, History } from 'history';
-
-export type Router = History;
-
-export const history = createBrowserHistory() as History;