cabloy 5.1.105 → 5.1.107

package/zova/src/suite/a-home/modules/home-api/mock/passport.fake.ts

@@ -235,8 +235,25 @@ const __sdkSchemaPassportLogin = {
               type: 'string',
               title: '角色名',
             },
+            title: {
+              type: 'string',
+              title: '角色标题',
+            },
+            locales: {
+              type: 'object',
+              additionalProperties: {
+                type: 'string',
+              },
+              title: '角色本地化文本',
+            },
+            siteIds: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
           },
-          required: ['createdAt', 'updatedAt', 'id', 'name'],
+          required: ['createdAt', 'updatedAt', 'id', 'name', 'title', 'siteIds'],
           title: '角色',
         },
         'a-jwt.dto.jwtToken': {
@@ -393,6 +410,22 @@ export default defineFakeRoute([
             auth: {
               id: 1,
             },
+            roles: [
+              {
+                id: 1,
+                name: 'registeredUser',
+                title: 'Registered User',
+                locales: { 'zh-cn': '注册用户' },
+                siteIds: ['web'],
+              },
+              {
+                id: 2,
+                name: 'systemAdmin',
+                title: 'System Administrator',
+                locales: { 'zh-cn': '系统管理员' },
+                siteIds: ['web', 'admin'],
+              },
+            ],
           },
           jwt: {
             accessToken: `accessToken-${user.name}`,
@@ -423,6 +456,22 @@ export default defineFakeRoute([
           auth: {
             id: 1,
           },
+          roles: [
+            {
+              id: 1,
+              name: 'registeredUser',
+              title: 'Registered User',
+              locales: { 'zh-cn': '注册用户' },
+              siteIds: ['web'],
+            },
+            {
+              id: 2,
+              name: 'systemAdmin',
+              title: 'System Administrator',
+              locales: { 'zh-cn': '系统管理员' },
+              siteIds: ['web', 'admin'],
+            },
+          ],
         },
       };
     },

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

@@ -1531,6 +1531,14 @@ export interface components {
       id: number | string;
       /** @description Role Name */
       name: string;
+      /** @description Role Title */
+      title: string;
+      /** @description Role Locales */
+      locales?:
+        | {
+            [key: string]: string;
+          }
+        | undefined;
       siteIds: string[];
     };
     'home-user.dto.passportJwt': {
@@ -3568,7 +3576,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3598,7 +3606,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3715,7 +3723,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3745,7 +3753,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3797,7 +3805,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -4408,7 +4416,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -4438,7 +4446,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };

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

@@ -83,6 +83,7 @@ declare module 'zova' {
 export * from '../component/itemLink/controller.jsx';
 export * from '../component/page/controller.jsx';
 export * from '../page/authCallback/controller.jsx';
+export * from '../page/errorAccessDenied/controller.jsx';
 export * from '../page/errorExpired/controller.jsx';
 export * from '../page/errorNotFound/controller.jsx';
 
@@ -108,6 +109,11 @@ declare module 'zova-module-home-base' {
           get scope(): ScopeModuleHomeBase;
         }
 
+        export interface ControllerPageErrorAccessDenied {
+          /** @internal */
+          get scope(): ScopeModuleHomeBase;
+        }
+
         export interface ControllerPageErrorExpired {
           /** @internal */
           get scope(): ScopeModuleHomeBase;
@@ -123,6 +129,7 @@ declare module 'zova-module-home-base' {
 import { ControllerItemLink } from '../component/itemLink/controller.jsx';
 import { ControllerPage } from '../component/page/controller.jsx';
 import { ControllerPageAuthCallback } from '../page/authCallback/controller.jsx';
+import { ControllerPageErrorAccessDenied } from '../page/errorAccessDenied/controller.jsx';
 import { ControllerPageErrorExpired } from '../page/errorExpired/controller.jsx';
 import { ControllerPageErrorNotFound } from '../page/errorNotFound/controller.jsx';
 import 'zova';
@@ -131,6 +138,7 @@ declare module 'zova' {
     'home-base.controller.itemLink': ControllerItemLink;
 'home-base.controller.page': ControllerPage;
 'home-base.controller.pageAuthCallback': ControllerPageAuthCallback;
+'home-base.controller.pageErrorAccessDenied': ControllerPageErrorAccessDenied;
 'home-base.controller.pageErrorExpired': ControllerPageErrorExpired;
 'home-base.controller.pageErrorNotFound': ControllerPageErrorNotFound;
   }
@@ -139,6 +147,7 @@ declare module 'zova' {
 /** pages: begin */
 export * from './page/authCallback.js';
 import { NSControllerPageAuthCallback } from './page/authCallback.js';
+export * from './page/errorAccessDenied.js';
 export * from './page/errorExpired.js';
 import { NSControllerPageErrorExpired } from './page/errorExpired.js';
 export * from './page/errorNotFound.js';
@@ -148,6 +157,7 @@ import 'zova';
 declare module 'zova-module-a-router' {
 export interface IPagePathRecord {
   '/home/base/authCallback': TypePagePathSchema<undefined,NSControllerPageAuthCallback.QueryInput>;
+'/home/base/errorAccessDenied': TypePagePathSchema<undefined,undefined>;
 '/home/base/errorExpired': TypePagePathSchema<undefined,NSControllerPageErrorExpired.QueryInput>;
 '/home/base//:catchAll(.*)*': TypePagePathSchema<undefined,undefined>;
 }

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

@@ -31,7 +31,7 @@ export class ControllerPageErrorAccessDenied extends BeanControllerPageBase {
               this.app.$gotoHome();
             }}
           >
-            Go Home
+            {this.scope.locale.GoHome()}
           </button>
         </div>
       </div>

package/zova/src/suite/a-training/modules/training-student/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,15 @@ export interface components {
       id: number | string;
       /** @description Role Name */
       name: string;
+      /** @description Role Title */
+      title: string;
+      /** @description Role Locales */
+      locales?:
+        | {
+            [key: string]: string;
+          }
+        | undefined;
+      siteIds: string[];
     };
     'home-user.dto.passportJwt': {
       passport: components['schemas']['home-user.dto.passport'];
@@ -3373,7 +3382,7 @@ export interface operations {
     };
     authToken: true;
   };
-  HomeUserPassport_createPassportJwtFromOauthCode: {
+  HomeUserPassport_refreshAuthToken: {
     parameters: {
       query?: never;
       header?: never;
@@ -3383,7 +3392,7 @@ export interface operations {
     requestBody: {
       content: {
         'application/json': {
-          code: string;
+          refreshToken: string;
         };
       };
     };
@@ -3396,13 +3405,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 +3421,7 @@ export interface operations {
     requestBody: {
       content: {
         'application/json': {
-          refreshToken: string;
+          code: string;
         };
       };
     };
@@ -3425,7 +3434,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data: components['schemas']['a-jwt.dto.jwtToken'];
+            data: components['schemas']['home-user.dto.passportJwt'];
           };
         };
       };
@@ -3567,7 +3576,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3597,7 +3606,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3714,7 +3723,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3744,7 +3753,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3796,7 +3805,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -4407,7 +4416,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -4437,7 +4446,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };

package/zova/src/suite/cabloy-basic/modules/basic-file/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,15 @@ export interface components {
       id: number | string;
       /** @description Role Name */
       name: string;
+      /** @description Role Title */
+      title: string;
+      /** @description Role Locales */
+      locales?:
+        | {
+            [key: string]: string;
+          }
+        | undefined;
+      siteIds: string[];
     };
     'home-user.dto.passportJwt': {
       passport: components['schemas']['home-user.dto.passport'];
@@ -3373,7 +3382,7 @@ export interface operations {
     };
     authToken: true;
   };
-  HomeUserPassport_createPassportJwtFromOauthCode: {
+  HomeUserPassport_refreshAuthToken: {
     parameters: {
       query?: never;
       header?: never;
@@ -3383,7 +3392,7 @@ export interface operations {
     requestBody: {
       content: {
         'application/json': {
-          code: string;
+          refreshToken: string;
         };
       };
     };
@@ -3396,13 +3405,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 +3421,7 @@ export interface operations {
     requestBody: {
       content: {
         'application/json': {
-          refreshToken: string;
+          code: string;
         };
       };
     };
@@ -3425,7 +3434,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data: components['schemas']['a-jwt.dto.jwtToken'];
+            data: components['schemas']['home-user.dto.passportJwt'];
           };
         };
       };
@@ -3567,7 +3576,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3597,7 +3606,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3714,7 +3723,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3744,7 +3753,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3796,7 +3805,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -4407,7 +4416,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -4437,7 +4446,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };

package/zova/src/suite/cabloy-basic/modules/basic-image/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,15 @@ export interface components {
       id: number | string;
       /** @description Role Name */
       name: string;
+      /** @description Role Title */
+      title: string;
+      /** @description Role Locales */
+      locales?:
+        | {
+            [key: string]: string;
+          }
+        | undefined;
+      siteIds: string[];
     };
     'home-user.dto.passportJwt': {
       passport: components['schemas']['home-user.dto.passport'];
@@ -3373,7 +3382,7 @@ export interface operations {
     };
     authToken: true;
   };
-  HomeUserPassport_createPassportJwtFromOauthCode: {
+  HomeUserPassport_refreshAuthToken: {
     parameters: {
       query?: never;
       header?: never;
@@ -3383,7 +3392,7 @@ export interface operations {
     requestBody: {
       content: {
         'application/json': {
-          code: string;
+          refreshToken: string;
         };
       };
     };
@@ -3396,13 +3405,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 +3421,7 @@ export interface operations {
     requestBody: {
       content: {
         'application/json': {
-          refreshToken: string;
+          code: string;
         };
       };
     };
@@ -3425,7 +3434,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data: components['schemas']['a-jwt.dto.jwtToken'];
+            data: components['schemas']['home-user.dto.passportJwt'];
           };
         };
       };
@@ -3567,7 +3576,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3597,7 +3606,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3714,7 +3723,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3744,7 +3753,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3796,7 +3805,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -4407,7 +4416,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -4437,7 +4446,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };