@genesislcap/blank-app-seed 3.12.4 → 3.13.1

package/.genx/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/blank-app-seed-config",
   "description": "Genesis Blank App Seed Configuration",
-  "version": "3.12.4",
+  "version": "3.13.1",
   "license": "Apache-2.0",
   "genxSeedConfig": {
     "exclude": [

package/.genx/versions.json

@@ -1,5 +1,5 @@
 {
-  "UI": "14.184.0",
+  "UI": "14.188.0",
   "GSF": "8.0.1",
   "Auth": "8.0.0"
 }

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [3.13.1](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.13.0...v3.13.1) (2024-06-17)
+
+
+### Bug Fixes
+
+* foundation-ui resource and datasource enhancements [skip-ci] [FUI-1993](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/1993) (#256) 2e64739
+
+## [3.13.0](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.12.4...v3.13.0) (2024-06-14)
+
+
+### Features
+
+* support for route permissions based on right codes GENC-469 (#255) c7f4358
+
 ## [3.12.4](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.12.3...v3.12.4) (2024-06-07)
 
 

package/client/src/routes/config.ts

@@ -1,16 +1,15 @@
 import { Auth, Session } from '@genesislcap/foundation-comms';
-import {
-  defaultLoginConfig,
-  LoginConfig,
-  Settings as LoginSettings,
-} from '@genesislcap/foundation-login';
+import { defaultLoginConfig, LoginConfig } from '@genesislcap/foundation-login';
 import { FoundationRouterConfiguration } from '@genesislcap/foundation-ui';
-import { optional, Route } from '@genesislcap/web-core';
+import { NavigationPhase, optional, Route } from '@genesislcap/web-core';
 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';
 
 // eslint-disable-next-line
 declare var ENABLE_SSO: string;
@@ -72,12 +71,21 @@ export class MainRouterConfig extends FoundationRouterConfiguration<LoginSetting
         childRouters: true,
       },
       { path: 'not-found', element: NotFound, title: 'Not Found', name: 'not-found' },
+      {
+        path: defaultNotPermittedRoute,
+        element: NotPermitted,
+        title: 'Not Permitted',
+        name: defaultNotPermittedRoute,
+      },
       {{#each routes}}
       {
         path: '{{kebabCase this.name}}',
         element: {{pascalCase this.name}},
         title: '{{sentenceCase this.name}}',
         name: '{{kebabCase this.name}}',
+        {{#if this.permissions.viewRight}}
+        settings: { isPermitted: () => this.auth.currentUser.hasPermission('{{this.permissions.viewRight}}') },
+        {{/if}}
         navItems: [
           {
             title: '{{sentenceCase this.name}}',
@@ -85,6 +93,7 @@ export class MainRouterConfig extends FoundationRouterConfiguration<LoginSetting
               name: 'cog',
               variant: 'solid',
             },
+            permission: '{{this.permissions.viewRight}}',
           },
         ],
       },
@@ -116,13 +125,14 @@ export class MainRouterConfig extends FoundationRouterConfiguration<LoginSetting
          * If logged in don't block
          */
         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.auth.reAuthFromSession())) {
+        if (this.loginConfig.autoAuth && (await this.reAuthFromSession(settings, phase))) {
           return;
         }
 
@@ -136,4 +146,24 @@ export class MainRouterConfig extends FoundationRouterConfiguration<LoginSetting
       },
     });
   }
+
+  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/client/src/routes/not-found/not-found.styles.ts

@@ -8,4 +8,8 @@ export const NotFoundStyles = css`
     align-items: center;
     justify-content: center;
   }
+
+  h1 {
+    color: var(--neutral-foreground-rest);
+  }
 `;

package/client/src/routes/not-permitted/not-permitted.styles.ts

@@ -0,0 +1,16 @@
+import { css } from '@genesislcap/web-core';
+import { mixinScreen } from '../../styles';
+
+export const NotPermittedStyles = css`
+  :host {
+    ${mixinScreen('flex')}
+
+    align-items: center;
+    justify-content: center;
+  }
+
+  h1 {
+    text-align: center;
+    color: var(--neutral-foreground-rest);
+  }
+`;

package/client/src/routes/not-permitted/not-permitted.template.ts

@@ -0,0 +1,9 @@
+import { html } from '@genesislcap/web-core';
+import type { NotPermitted } from './not-permitted';
+
+export const NotPermittedTemplate = html<NotPermitted>`
+  <h1>
+    You do not have permission to access this part of the application, please contact your
+    administrator.
+  </h1>
+`;

package/client/src/routes/not-permitted/not-permitted.ts

@@ -0,0 +1,18 @@
+import { customElement, GenesisElement } from '@genesislcap/web-core';
+import { logger } from '../../utils';
+import { NotPermittedStyles as styles } from './not-permitted.styles';
+import { NotPermittedTemplate as template } from './not-permitted.template';
+
+export const defaultNotPermittedRoute = 'not-permitted';
+
+@customElement({
+  name: 'not-permitted-route',
+  template,
+  styles,
+})
+export class NotPermitted extends GenesisElement {
+  public connectedCallback() {
+    super.connectedCallback();
+    logger.debug(`${name} is now connected to the DOM`);
+  }
+}

package/client/src/routes/types.ts

@@ -0,0 +1,5 @@
+import { Settings } from '@genesislcap/foundation-login';
+
+export type LoginSettings = Settings & {
+  isPermitted?: () => boolean;
+};

package/package.json

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