cabloy 5.1.104 → 5.1.105

package/zova/src/suite/a-home/modules/home-api/src/api/openapi/types.ts

@@ -256,7 +256,7 @@ export interface paths {
     patch?: never;
     trace?: never;
   };
-  '/api/home/user/passport/createPassportJwtFromOauthCode': {
+  '/api/home/user/passport/refreshAuthToken': {
     parameters: {
       query?: never;
       header?: never;
@@ -265,14 +265,14 @@ export interface paths {
     };
     get?: never;
     put?: never;
-    post: operations['HomeUserPassport_createPassportJwtFromOauthCode'];
+    post: operations['HomeUserPassport_refreshAuthToken'];
     delete?: never;
     options?: never;
     head?: never;
     patch?: never;
     trace?: never;
   };
-  '/api/home/user/passport/refreshAuthToken': {
+  '/api/home/user/passport/createPassportJwtFromOauthCode': {
     parameters: {
       query?: never;
       header?: never;
@@ -281,7 +281,7 @@ export interface paths {
     };
     get?: never;
     put?: never;
-    post: operations['HomeUserPassport_refreshAuthToken'];
+    post: operations['HomeUserPassport_createPassportJwtFromOauthCode'];
     delete?: never;
     options?: never;
     head?: never;
@@ -1531,6 +1531,7 @@ export interface components {
       id: number | string;
       /** @description Role Name */
       name: string;
+      siteIds: string[];
     };
     'home-user.dto.passportJwt': {
       passport: components['schemas']['home-user.dto.passport'];
@@ -3373,7 +3374,7 @@ export interface operations {
     };
     authToken: true;
   };
-  HomeUserPassport_createPassportJwtFromOauthCode: {
+  HomeUserPassport_refreshAuthToken: {
     parameters: {
       query?: never;
       header?: never;
@@ -3383,7 +3384,7 @@ export interface operations {
     requestBody: {
       content: {
         'application/json': {
-          code: string;
+          refreshToken: string;
         };
       };
     };
@@ -3396,13 +3397,13 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data: components['schemas']['home-user.dto.passportJwt'];
+            data: components['schemas']['a-jwt.dto.jwtToken'];
           };
         };
       };
     };
   };
-  HomeUserPassport_refreshAuthToken: {
+  HomeUserPassport_createPassportJwtFromOauthCode: {
     parameters: {
       query?: never;
       header?: never;
@@ -3412,7 +3413,7 @@ export interface operations {
     requestBody: {
       content: {
         'application/json': {
-          refreshToken: string;
+          code: string;
         };
       };
     };
@@ -3425,7 +3426,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data: components['schemas']['a-jwt.dto.jwtToken'];
+            data: components['schemas']['home-user.dto.passportJwt'];
           };
         };
       };

package/zova/src/suite/a-home/modules/home-api/src/apiSchema/homeUserPassport.ts

@@ -11,8 +11,8 @@ import {
   ApiApiHomeUserPassportloginOauthPath,
   ApiApiHomeUserPassportassociatePath,
   ApiApiHomeUserPassportmigratePath,
-  ApiApiHomeUserPassportcreatePassportJwtFromOauthCodePath,
   ApiApiHomeUserPassportrefreshAuthTokenPath,
+  ApiApiHomeUserPassportcreatePassportJwtFromOauthCodePath,
   ApiApiHomeUserPassportcreateTempAuthTokenPath,
 } from '../api/homeUserPassport.js';
 
@@ -46,6 +46,10 @@ export class ApiSchemaHomeUserPassport extends BeanBase {
     return this.$sdk.createApiSchemas(ApiApiHomeUserPassportmigratePath, 'get', options);
   }
 
+  refreshAuthToken(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(ApiApiHomeUserPassportrefreshAuthTokenPath, 'post', options);
+  }
+
   createPassportJwtFromOauthCode(options?: IApiSchemaOptions) {
     return this.$sdk.createApiSchemas(
       ApiApiHomeUserPassportcreatePassportJwtFromOauthCodePath,
@@ -54,10 +58,6 @@ export class ApiSchemaHomeUserPassport extends BeanBase {
     );
   }
 
-  refreshAuthToken(options?: IApiSchemaOptions) {
-    return this.$sdk.createApiSchemas(ApiApiHomeUserPassportrefreshAuthTokenPath, 'post', options);
-  }
-
   createTempAuthToken(options?: IApiSchemaOptions) {
     return this.$sdk.createApiSchemas(
       ApiApiHomeUserPassportcreateTempAuthTokenPath,

package/zova/src/suite/a-home/modules/home-base/src/.metadata/page/errorAccessDenied.ts

@@ -0,0 +1,9 @@
+import { createZovaComponentPage } from 'zova';
+
+import { ControllerPageErrorAccessDenied } from '../../page/errorAccessDenied/controller.jsx';
+
+export const ZPageErrorAccessDenied = createZovaComponentPage(
+  ControllerPageErrorAccessDenied,
+  undefined,
+  undefined,
+);

package/zova/src/suite/a-home/modules/home-base/src/page/errorAccessDenied/controller.tsx

@@ -0,0 +1,40 @@
+import { classes } from 'typestyle';
+import { BeanControllerPageBase } from 'zova';
+import { Controller } from 'zova-module-a-bean';
+
+@Controller()
+export class ControllerPageErrorAccessDenied extends BeanControllerPageBase {
+  cTitle: string;
+  cDescription: string;
+
+  protected async __init__() {
+    this.cTitle = this.$style({
+      fontSize: '30vh',
+    });
+    this.cDescription = classes(
+      'text-3xl',
+      this.$style({
+        opacity: '0.4',
+      }),
+    );
+  }
+
+  protected render() {
+    return (
+      <div class="text-center">
+        <div>
+          <div class={this.cTitle}>403</div>
+          <div class={this.cDescription}>Access denied.</div>
+          <button
+            class="btn btn-primary"
+            onClick={() => {
+              this.app.$gotoHome();
+            }}
+          >
+            Go Home
+          </button>
+        </div>
+      </div>
+    );
+  }
+}

package/zova/src/suite/a-home/modules/home-base/src/routes.ts

@@ -1,6 +1,7 @@
 import type { IModuleRoute } from 'zova-module-a-router';
 
 import { ZPageAuthCallback } from './.metadata/page/authCallback.js';
+import { ZPageErrorAccessDenied } from './.metadata/page/errorAccessDenied.js';
 import { ZPageErrorExpired } from './.metadata/page/errorExpired.js';
 import { ZPageErrorNotFound } from './.metadata/page/errorNotFound.js';
 
@@ -14,6 +15,14 @@ export const routes: IModuleRoute[] = [
       requiresAuth: false,
     },
   },
+  {
+    path: 'errorAccessDenied',
+    component: ZPageErrorAccessDenied,
+    meta: {
+      layout: 'empty',
+      requiresAuth: false,
+    },
+  },
   {
     path: 'errorNotFound',
     component: ZPageErrorNotFound,

package/zova/src/suite/a-home/modules/home-base/src/service/routerGuards.ts

@@ -14,11 +14,9 @@ export class ServiceRouterGuards extends BeanRouterGuardsBase {
 
   protected onRouterGuards(router: BeanRouter) {
     router.beforeEach(async to => {
-      if (
-        !this.sys.config.ssr.cookieDisabledOnServer &&
-        to.meta.requiresAuth !== false &&
-        !this.$passport.isAuthenticated
-      ) {
+      if (to.meta.requiresAuth === false) return;
+      if (this.sys.config.ssr.cookieDisabledOnServer) return;
+      if (!this.$passport.isAuthenticated) {
         const [_res, err] = await catchError(() => {
           return this.$passport.ensurePassport();
         });
@@ -26,14 +24,25 @@ export class ServiceRouterGuards extends BeanRouterGuardsBase {
           this.$errorHandler(err, 'onRouterGuards');
           return false;
         }
-        if (!this.$passport.isAuthenticated) {
-          try {
-            this.app.$gotoLogin(to.fullPath);
-          } catch (err: any) {
-            this.$errorHandler(err);
-          }
-          return false;
+      }
+      if (!this.$passport.isAuthenticated) {
+        try {
+          this.app.$gotoLogin(to.fullPath);
+        } catch (err: any) {
+          this.$errorHandler(err);
+        }
+        return false;
+      }
+      const siteId = this.sys.env.SITE_ID;
+      const siteAdmitted =
+        !!siteId && !!this.$passport.roles?.some(role => role.siteIds.includes(siteId));
+      if (!siteAdmitted) {
+        try {
+          this.app.$gotoAccessDenied();
+        } catch (err: any) {
+          this.$errorHandler(err);
         }
+        return false;
       }
     });
     router.beforeResolve(async to => {

package/zova/src/suite/a-home/modules/home-passport/src/model/passport.ts

@@ -169,8 +169,8 @@ export class ModelPassport extends BeanModelBase {
     return this.passport?.roles;
   }
 
-  get isAdmin() {
-    return !!this.passport?.roles.some(item => item.name === 'admin');
+  get isSystemAdmin() {
+    return !!this.passport?.roles.some(item => item.name === 'systemAdmin');
   }
 
   async getJwtInfo(): Promise<IJwtInfo | undefined> {

package/zova/src/suite-vendor/a-zova/modules/a-router/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-router",
-  "version": "5.1.29",
+  "version": "5.1.30",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "router",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-router/src/monkeySys.ts

@@ -85,8 +85,12 @@ export class MonkeySys
       return app.$gotoPage(pagePath, { ...options, params: undefined });
     };
     app.$gotoLogin = (returnTo?: string, cause?: string) => {
-      if (!returnTo && cast(app.meta.$router.currentRoute)?.path === app.sys.env.ROUTER_PAGE_LOGIN)
+      if (
+        !returnTo &&
+        cast(app.meta.$router.currentRoute)?.path === app.sys.env.ROUTER_PAGE_LOGIN
+      ) {
         return;
+      }
       const query: any = {};
       if (cause) {
         query.cause = cause;
@@ -94,6 +98,11 @@ export class MonkeySys
       const returnTo2 = returnTo === app.sys.env.ROUTER_PAGE_LOGIN ? undefined : (returnTo ?? true);
       return app.$gotoPage(app.sys.env.ROUTER_PAGE_LOGIN, { query, returnTo: returnTo2 });
     };
+    app.$gotoAccessDenied = () => {
+      const pagePath = '/home/base/errorAccessDenied';
+      if (cast(app.meta.$router.currentRoute)?.path === pagePath) return;
+      return app.$gotoPage(pagePath, { replace: true });
+    };
     app.$gotoReturnTo = (returnTo?: string) => {
       const pagePath = app.$getReturnTo(returnTo);
       return app.$gotoPage(pagePath, { replace: true });

package/zova/src/suite-vendor/a-zova/modules/a-router/src/types/router.ts

@@ -52,6 +52,7 @@ declare module 'zova' {
     $gotoPage(pagePath: string, options?: IGotoPageOptions): TypeGotoPageResult;
     $gotoHome(options?: IGotoPageOptions): TypeGotoPageResult;
     $gotoLogin(returnTo?: string, cause?: string): TypeGotoPageResult;
+    $gotoAccessDenied(): TypeGotoPageResult;
     $gotoReturnTo(returnTo?: string): TypeGotoPageResult;
     $getReturnTo(returnTo?: string): string;
     $getCurrentPagePath(): string | undefined;

package/zova/src/suite-vendor/a-zova/modules/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.92",
+  "version": "5.1.93",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "keywords": [
@@ -43,7 +43,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "defu": "^6.1.7",
     "luxon": "^3.7.2",
-    "zova-jsx": "^1.1.77"
+    "zova-jsx": "^1.1.78"
   },
   "devDependencies": {
     "@cabloy/cli": "^3.1.28",

package/zova/src/suite-vendor/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.133",
+  "version": "5.1.134",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -23,7 +23,7 @@
     "zova-module-a-meta": "^5.1.21",
     "zova-module-a-model": "^5.1.33",
     "zova-module-a-openapi": "^5.1.43",
-    "zova-module-a-router": "^5.1.29",
+    "zova-module-a-router": "^5.1.30",
     "zova-module-a-routerstack": "^5.1.26",
     "zova-module-a-routertabs": "^5.1.33",
     "zova-module-a-ssr": "^5.1.29",
@@ -32,7 +32,7 @@
     "zova-module-a-style": "^5.1.32",
     "zova-module-a-table": "^5.1.37",
     "zova-module-a-zod": "^5.1.36",
-    "zova-module-a-zova": "^5.1.92"
+    "zova-module-a-zova": "^5.1.93"
   },
   "title": "a-zova"
 }