cabloy 5.1.104 → 5.1.105

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/lib/beanSsrSiteBase.ts

@@ -1,7 +1,7 @@
 import type { ZovaMetaMode } from '@cabloy/module-info';
 import type { IParamsAndQuery } from '@cabloy/utils';
 import type { ILocaleRecord } from 'vona';
-import type { IMenuGroup, IMenuItem } from 'vona-module-a-menu';
+import type { IMenuGroup } from 'vona-module-a-menu';
 import type { IOnionSlice } from 'vona-module-a-onion';
 import type { TypeEventResolvePathData, TypeEventResolvePathResult } from 'vona-module-a-static';
 
@@ -16,7 +16,12 @@ import { BeanBase, cast, deepExtend, SymbolModuleName } from 'vona';
 import { checkErrorJwtExpiredAndThrow } from 'vona-module-a-jwt';
 
 import type { TypeEventRetrieveMenusResult } from '../bean/event.retrieveMenus.ts';
-import type { IDecoratorSsrMenuOptions, ISsrMenuRecord } from '../types/ssrMenu.ts';
+import type { TypeEventRetrieveMenusSiteResult } from '../bean/event.retrieveMenusSite.ts';
+import type {
+  IDecoratorSsrMenuOptions,
+  ISsrMenuItemPrepared,
+  ISsrMenuRecord,
+} from '../types/ssrMenu.ts';
 import type { ISsrMenuGroupRecord } from '../types/ssrMenuGroup.ts';
 import type {
   IDecoratorSsrSiteOptions,
@@ -139,7 +144,15 @@ export class BeanSsrSiteBase<
   }
 
   async retrieveMenus(): Promise<TypeEventRetrieveMenusResult | undefined> {
-    return await this._getMenusCache(this.ctx.locale);
+    const menusPrepared = await this._getMenusCache(this.ctx.locale);
+    if (!menusPrepared) return;
+    const menus = menusPrepared.menus
+      ?.filter(menu => !menu.roles?.length || this.bean.passport.checkRoleName(menu.roles))
+      .map(menu => {
+        const { roles: _roles, ...menuPublic } = menu;
+        return menuPublic;
+      });
+    return { menus, groups: menusPrepared.groups };
   }
 
   public get siteOptions() {
@@ -168,6 +181,14 @@ export class BeanSsrSiteBase<
         },
         this.$scope.ssr.config.site.default,
         onionOptions,
+        {
+          envServer: {
+            SITE_ID: onionOptions.siteId,
+          },
+          envClient: {
+            SITE_ID: onionOptions.siteId,
+          },
+        },
       );
     }
     return this._siteOptions;
@@ -253,9 +274,11 @@ export class BeanSsrSiteBase<
     };
   }
 
-  private async _getMenusCache(locale: keyof ILocaleRecord): Promise<TypeEventRetrieveMenusResult> {
+  private async _getMenusCache(
+    locale: keyof ILocaleRecord,
+  ): Promise<TypeEventRetrieveMenusSiteResult | undefined> {
     if (!this.app.meta[SymbolCacheMenus]) this.app.meta[SymbolCacheMenus] = {};
-    const cacheMenus: Record<keyof ILocaleRecord, TypeEventRetrieveMenusResult> =
+    const cacheMenus: Record<keyof ILocaleRecord, TypeEventRetrieveMenusSiteResult> =
       this.app.meta[SymbolCacheMenus];
     const beanFullName = this.$beanFullName;
     const instanceName = this.ctx.instanceName;
@@ -268,7 +291,9 @@ export class BeanSsrSiteBase<
     return cacheMenus[beanFullName][cacheKey];
   }
 
-  private async _prepareMenus(locale: keyof ILocaleRecord): Promise<TypeEventRetrieveMenusResult> {
+  private async _prepareMenus(
+    locale: keyof ILocaleRecord,
+  ): Promise<TypeEventRetrieveMenusSiteResult | undefined> {
     return await this.$scope.ssr.event.retrieveMenusSite.emit(
       { ssrSite: this, locale },
       async () => {
@@ -287,7 +312,7 @@ export class BeanSsrSiteBase<
   private _prepareMenusOrGroups<T extends keyof ISsrMenuRecord>(
     locale: keyof ILocaleRecord,
     ssrMenus: IOnionSlice<ISsrMenuRecord, T, unknown>[],
-  ): IMenuItem[];
+  ): ISsrMenuItemPrepared[];
   private _prepareMenusOrGroups<T extends keyof ISsrMenuGroupRecord>(
     locale: keyof ILocaleRecord,
     ssrMenus: IOnionSlice<ISsrMenuGroupRecord, T, unknown>[],
@@ -298,7 +323,7 @@ export class BeanSsrSiteBase<
   ) {
     const siteOnionName = this.$onionName;
     // menus
-    const menus: IMenuItem<keyof SsrSiteOptions['pages']>[] = [];
+    const menus: ISsrMenuItemPrepared[] = [];
     for (const ssrMenu of ssrMenus) {
       const siteMenuOptions = ssrMenu.beanOptions
         .options as IDecoratorSsrMenuOptions<IDecoratorSsrSiteOptions>;

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/service/ssr.ts

@@ -16,22 +16,52 @@ export class ServiceSsr extends BeanBase {
     if (!this.app.meta[SymbolCacheSites]) this.app.meta[SymbolCacheSites] = {};
     if (!this.app.meta[SymbolCacheSites][cacheKey]) {
       // check sites
-      this.app.meta[SymbolCacheSites][cacheKey] = this.bean.onion.ssrSite
-        .getOnionsEnabled(this.ctx.instanceName!)
-        .toReversed()
-        .sort((site1, site2) => {
-          const siteOptions1 = site1.beanOptions.options as IDecoratorSsrSiteOptions;
-          const siteOptions2 = site2.beanOptions.options as IDecoratorSsrSiteOptions;
-          const publicPath1 = `/${siteOptions1.publicPath}`;
-          const publicPath2 = `/${siteOptions2.publicPath}`;
-          return publicPath1 === publicPath2
-            ? 0
-            : publicPath1.startsWith(publicPath2)
-              ? -1
-              : publicPath2.startsWith(publicPath1)
-                ? 1
-                : 0;
-        });
+      const sites = this.bean.onion.ssrSite.getOnionsEnabled(this.ctx.instanceName!).toReversed();
+      const siteIds = new Map<string, string>();
+      const publicPaths = new Map<string, string>();
+      for (const site of sites) {
+        const siteOptions = site.beanOptions.options as IDecoratorSsrSiteOptions;
+        const beanFullName = site.beanOptions.beanFullName;
+        const siteId = siteOptions.siteId;
+        if (typeof siteId !== 'string' || !siteId.trim()) {
+          throw new Error(
+            `Should specify non-empty siteId for SSR site: ${beanFullName} (${cacheKey})`,
+          );
+        }
+        const siteIdDuplicate = siteIds.get(siteId);
+        if (siteIdDuplicate) {
+          throw new Error(
+            `Duplicate SSR siteId "${siteId}" for ${siteIdDuplicate} and ${beanFullName} (${cacheKey})`,
+          );
+        }
+        siteIds.set(siteId, beanFullName);
+        const publicPath = siteOptions.publicPath;
+        if (typeof publicPath !== 'string') {
+          throw new TypeError(
+            `Should specify publicPath for SSR site: ${beanFullName} (${cacheKey})`,
+          );
+        }
+        const publicPathDuplicate = publicPaths.get(publicPath);
+        if (publicPathDuplicate) {
+          throw new Error(
+            `Duplicate SSR publicPath "${publicPath}" for ${publicPathDuplicate} and ${beanFullName} (${cacheKey})`,
+          );
+        }
+        publicPaths.set(publicPath, beanFullName);
+      }
+      this.app.meta[SymbolCacheSites][cacheKey] = sites.sort((site1, site2) => {
+        const siteOptions1 = site1.beanOptions.options as IDecoratorSsrSiteOptions;
+        const siteOptions2 = site2.beanOptions.options as IDecoratorSsrSiteOptions;
+        const publicPath1 = `/${siteOptions1.publicPath}`;
+        const publicPath2 = `/${siteOptions2.publicPath}`;
+        return publicPath1 === publicPath2
+          ? 0
+          : publicPath1.startsWith(publicPath2)
+            ? -1
+            : publicPath2.startsWith(publicPath1)
+              ? 1
+              : 0;
+      });
     }
     return this.app.meta[SymbolCacheSites][cacheKey];
   }

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/service/ssrHandler.ts

@@ -68,10 +68,8 @@ export class ServiceSsrHandler extends BeanBase {
   }
 
   private _createMissingBundleMessage() {
-    const diagnostics = this._siteOptions.diagnostics;
-    const siteName = diagnostics?.siteName ?? String(this._siteOptions.publicPath || 'unknown');
-    const buildCommand = diagnostics?.buildCommand;
+    const buildCommand = this._siteOptions.diagnostics?.buildCommand;
     const commandHint = buildCommand ? ` Run "${buildCommand}" at the repository root.` : '';
-    return `Missing SSR bundle for site ${siteName}: ${this._siteAssetDir}.${commandHint}`;
+    return `Missing SSR bundle for site ${this._siteOptions.siteId}: ${this._siteAssetDir}.${commandHint}`;
   }
 }

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/types/env.ts

@@ -4,6 +4,7 @@ export interface ZovaConfigEnv {
   META_FLAVOR: ZovaMetaFlavor;
   META_MODE: ZovaMetaMode;
   META_APP_MODE: ZovaMetaAppMode;
+  SITE_ID: string;
   APP_ROUTER_MODE: 'hash' | 'history' | 'abstract' | undefined;
   APP_ROUTER_BASE: string | undefined;
   APP_PUBLIC_PATH: string | undefined;

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/types/ssrMenu.ts

@@ -1,6 +1,7 @@
 import type { ILocaleRecord, OmitNever } from 'vona';
-import type { IMenuItem } from 'vona-module-a-menu';
+import type { IMenuGroup, IMenuItem } from 'vona-module-a-menu';
 import type { IOnionOptionsEnable, ServiceOnion } from 'vona-module-a-onion';
+import type { IRoleNameRecord } from 'vona-module-a-user';
 
 import type { ISsrMenuGroupRecord } from './ssrMenuGroup.ts';
 import type { IDecoratorSsrSiteOptions, ISsrSiteRecord } from './ssrSite.ts';
@@ -12,6 +13,14 @@ export interface ISsrMenuItem<Pages extends {} = {}, Icons extends {} = {}> exte
   'name' | 'group'
 > {
   group?: keyof ISsrMenuGroupRecord | (keyof ISsrMenuGroupRecord)[];
+  roles?: (keyof IRoleNameRecord)[];
+}
+
+export type ISsrMenuItemPrepared = IMenuItem<any, any> & Pick<ISsrMenuItem<any, any>, 'roles'>;
+
+export interface ISsrMenusPrepared {
+  menus?: ISsrMenuItemPrepared[];
+  groups?: IMenuGroup[];
 }
 
 // should not set default generic = IDecoratorSsrSiteOptions

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/types/ssrSite.ts

@@ -46,12 +46,13 @@ export interface SSRContextState {
   pageData?: unknown;
 }
 
+export interface ISsrSiteIdRecord {}
+
 export interface ISsrSitePublicPathRecord {}
 
 export interface ISsrSiteRecord {}
 
 export interface ISsrSiteDiagnosticsOptions {
-  siteName?: string;
   buildCommand?: string;
 }
 
@@ -68,6 +69,7 @@ export interface IDecoratorSsrSiteOptions<
   extends
     IOnionOptionsEnable,
     IOnionOptionsMatch<TypeOnionOptionsMatchRule<keyof IInstanceRecord>> {
+  siteId: keyof ISsrSiteIdRecord;
   publicPath: keyof ISsrSitePublicPathRecord;
   bundlePath: string;
   diagnostics?: ISsrSiteDiagnosticsOptions;

package/vona/src/suite-vendor/a-cabloy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.39",
+  "version": "5.1.40",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/vona/src/suite-vendor/a-vona/modules/a-permission/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-permission",
-  "version": "5.1.14",
+  "version": "5.1.15",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-permission/src/.metadata/index.ts

@@ -27,6 +27,7 @@ declare module 'vona' {
 }
 /** bean: end */
 /** event: begin */
+export * from '../bean/event.retrievePermissionAction.ts';
 export * from '../bean/event.retrievePermissions.ts';
 
 import 'vona';
@@ -36,6 +37,17 @@ declare module 'vona' {
 }
 declare module 'vona-module-a-permission' {
   
+        export interface EventRetrievePermissionAction {
+          /** @internal */
+          get scope(): ScopeModuleAPermission;
+        }
+
+          export interface EventRetrievePermissionAction {
+            get $beanFullName(): 'a-permission.event.retrievePermissionAction';
+            get $onionName(): 'a-permission:retrievePermissionAction';
+            
+          }
+
         export interface EventRetrievePermissions {
           /** @internal */
           get scope(): ScopeModuleAPermission;
@@ -49,17 +61,21 @@ declare module 'vona-module-a-permission' {
 }
 /** event: end */
 /** event: begin */
+import type { EventRetrievePermissionAction } from '../bean/event.retrievePermissionAction.ts';
 import type { EventRetrievePermissions } from '../bean/event.retrievePermissions.ts';
 export interface IModuleEvent {
-  'retrievePermissions': EventRetrievePermissions;
+  'retrievePermissionAction': EventRetrievePermissionAction;
+'retrievePermissions': EventRetrievePermissions;
 }
 /** event: end */
 /** event: begin */
+import type { TypeEventRetrievePermissionActionData, TypeEventRetrievePermissionActionResult } from '../bean/event.retrievePermissionAction.ts';
 import type { TypeEventRetrievePermissionsData, TypeEventRetrievePermissionsResult } from '../bean/event.retrievePermissions.ts';
 import type { EventOn } from 'vona-module-a-event'; 
 declare module 'vona-module-a-event' {
   export interface IEventRecord {
-    'a-permission:retrievePermissions': EventOn<TypeEventRetrievePermissionsData, TypeEventRetrievePermissionsResult>;
+    'a-permission:retrievePermissionAction': EventOn<TypeEventRetrievePermissionActionData, TypeEventRetrievePermissionActionResult>;
+'a-permission:retrievePermissions': EventOn<TypeEventRetrievePermissionsData, TypeEventRetrievePermissionsResult>;
   }
 }
 /** event: end */

package/vona/src/suite-vendor/a-vona/modules/a-permission/src/bean/bean.permission.ts

@@ -88,7 +88,12 @@ export class BeanPermission extends BeanBase {
     const route = this._getControllerActionRoute(resource, actionKey);
     if (!route?.route?.meta) return false;
     if (!this._matchPassportMeta(route.route.meta)) return false;
-    return await this.retrievePermissionActionByRoles(resource, actionKey);
+    return await this.scope.event.retrievePermissionAction.emit(
+      { resource, actionKey },
+      async () => {
+        return await this.retrievePermissionActionByRoles(resource, actionKey);
+      },
+    );
   }
 
   @Caching.get({

package/vona/src/suite-vendor/a-vona/modules/a-permission/src/bean/event.retrievePermissionAction.ts

@@ -0,0 +1,16 @@
+import type { IResourceRecord } from 'vona-module-a-openapi';
+
+import { BeanEventBase, Event } from 'vona-module-a-event';
+
+export interface TypeEventRetrievePermissionActionData {
+  resource: keyof IResourceRecord;
+  actionKey: string;
+}
+
+export type TypeEventRetrievePermissionActionResult = boolean;
+
+@Event()
+export class EventRetrievePermissionAction extends BeanEventBase<
+  TypeEventRetrievePermissionActionData,
+  TypeEventRetrievePermissionActionResult
+> {}

package/vona/src/suite-vendor/a-vona/modules/a-user/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-user",
-  "version": "5.1.18",
+  "version": "5.1.19",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-user/src/bean/bean.passport.ts

@@ -53,9 +53,9 @@ export class BeanPassport extends BeanBase {
     return !!user && !!user.activated;
   }
 
-  public async isAdmin(): Promise<boolean> {
+  public async isSystemAdmin(): Promise<boolean> {
     const passport = this.current;
-    return await this.passportAdapter.isAdmin(passport);
+    return await this.passportAdapter.isSystemAdmin(passport);
   }
 
   public async setCurrent(passport: IPassport | undefined) {

package/vona/src/suite-vendor/a-vona/modules/a-user/src/lib/passport.ts

@@ -15,22 +15,25 @@ function RoleName(options?: Partial<IGuardOptionsRoleName>): ClassDecorator & Me
   return Aspect.guard('a-user:roleName', options);
 }
 
-function Admin(
+function SystemAdmin(
   options?: Partial<Omit<IGuardOptionsRoleName, 'name'>>,
 ): ClassDecorator & MethodDecorator {
-  return Aspect.guard('a-user:roleName', Object.assign({}, options, { name: 'admin' as const }));
+  return Aspect.guard(
+    'a-user:roleName',
+    Object.assign({}, options, { name: 'systemAdmin' as const }),
+  );
 }
 
 export interface IDecoratorGroupPassport {
   public: typeof Public;
   activated: typeof Activated;
   roleName: typeof RoleName;
-  admin: typeof Admin;
+  systemAdmin: typeof SystemAdmin;
 }
 
 export const Passport: IDecoratorGroupPassport = {
   public: Public,
   activated: Activated,
   roleName: RoleName,
-  admin: Admin,
+  systemAdmin: SystemAdmin,
 } as unknown as IDecoratorGroupPassport;

package/vona/src/suite-vendor/a-vona/modules/a-user/src/types/passport.ts

@@ -11,7 +11,7 @@ export interface IPassport {
 }
 
 export interface IPassportAdapter {
-  isAdmin(passport: IPassport | undefined): Promise<boolean>;
+  isSystemAdmin(passport: IPassport | undefined): Promise<boolean>;
   setCurrent(passport: IPassport | undefined): Promise<IPassport | undefined>;
   serialize(passport: IPassport): Promise<IPayloadData>;
   deserialize(payloadData: IPayloadData): Promise<IPassport | undefined>;

package/vona/src/suite-vendor/a-vona/modules/a-user/src/types/role.ts

@@ -1,7 +1,8 @@
 import type { TableIdentity } from 'table-identity';
 
 export interface IRoleNameRecord {
-  admin: never;
+  registeredUser: never;
+  systemAdmin: never;
 }
 
 export interface IRoleIdRecord {}
@@ -9,6 +10,7 @@ export interface IRoleIdRecord {}
 export interface IRole {
   id: TableIdentity;
   name: string;
+  siteIds: string[];
 }
 
 export interface IRoleAdapter {

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-vona",
-  "version": "5.1.66",
+  "version": "5.1.67",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/zova/env/.env.cabloyBasicAdmin

@@ -1,3 +1,5 @@
+SITE_ID = admin
+
 APP_PUBLIC_PATH = admin
 
 STYLE_DEFAULT_THEME = home-theme:orange

package/zova/env/.env.cabloyBasicWeb

@@ -1,3 +1,5 @@
+SITE_ID = web
+
 ROUTER_PAGE_HOME = /:locale
 
 LAYOUT_COMPONENT_DEFAULT = home-layoutweb:layoutWeb

package/zova/packages-utils/zova-jsx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.77",
+  "version": "1.1.78",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Zova JSX",
   "keywords": [
@@ -50,7 +50,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "typestyle": "^2.4.0",
     "vue": "^3.5.38",
-    "zova-core": "^5.1.77"
+    "zova-core": "^5.1.78"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.134",
+  "version": "5.1.135",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.77",
-    "zova-suite-a-zova": "^5.1.133"
+    "zova-core": "^5.1.78",
+    "zova-suite-a-zova": "^5.1.134"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.77",
+  "version": "5.1.78",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [

package/zova/packages-zova/zova-core/src/core/sys/sys.ts

@@ -132,6 +132,9 @@ export class ZovaSys {
   private _prepareEnv(env: NodeJS.ProcessEnv, envRuntime?: Partial<ZovaConfigEnv>): ZovaConfigEnv {
     const env2 = this._prepareEnv_Runtime(env, envRuntime);
     const env3 = this._prepareEnv_Client(env2 as any);
+    if (!env3.SITE_ID?.trim()) {
+      throw new Error(`Should specify SITE_ID for Zova flavor: ${env3.META_FLAVOR}`);
+    }
     return env3;
   }
 

package/zova/packages-zova/zova-core/src/types/utils/env.ts

@@ -6,6 +6,7 @@ export interface ZovaConfigEnv {
   META_FLAVOR: ZovaMetaFlavor;
   META_MODE: ZovaMetaMode;
   META_APP_MODE: ZovaMetaAppMode;
+  SITE_ID: string;
   APP_NAME: string | undefined;
   APP_TITLE: string | undefined;
   APP_DESCRIPTION: string | undefined;

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

@@ -76,6 +76,17 @@ export type ApiApiHomeUserPassportmigrateRequestQuery =
 export type ApiApiHomeUserPassportmigrateResponseBody =
   paths[ApiApiHomeUserPassportmigratePath][ApiApiHomeUserPassportmigrateMethod]['responses']['200']['content']['application/json']['data'];
 
+/** HomeUserPassport_refreshAuthToken */
+export const ApiApiHomeUserPassportrefreshAuthTokenPath =
+  '/api/home/user/passport/refreshAuthToken';
+export type ApiApiHomeUserPassportrefreshAuthTokenPath = '/api/home/user/passport/refreshAuthToken';
+export type ApiApiHomeUserPassportrefreshAuthTokenMethod = 'post';
+export type ApiApiHomeUserPassportrefreshAuthTokenRequestBody = {
+  refreshToken: string;
+};
+export type ApiApiHomeUserPassportrefreshAuthTokenResponseBody =
+  paths[ApiApiHomeUserPassportrefreshAuthTokenPath][ApiApiHomeUserPassportrefreshAuthTokenMethod]['responses']['200']['content']['application/json']['data'];
+
 /** HomeUserPassport_createPassportJwtFromOauthCode */
 export const ApiApiHomeUserPassportcreatePassportJwtFromOauthCodePath =
   '/api/home/user/passport/createPassportJwtFromOauthCode';
@@ -88,17 +99,6 @@ export type ApiApiHomeUserPassportcreatePassportJwtFromOauthCodeRequestBody = {
 export type ApiApiHomeUserPassportcreatePassportJwtFromOauthCodeResponseBody =
   paths[ApiApiHomeUserPassportcreatePassportJwtFromOauthCodePath][ApiApiHomeUserPassportcreatePassportJwtFromOauthCodeMethod]['responses']['200']['content']['application/json']['data'];
 
-/** HomeUserPassport_refreshAuthToken */
-export const ApiApiHomeUserPassportrefreshAuthTokenPath =
-  '/api/home/user/passport/refreshAuthToken';
-export type ApiApiHomeUserPassportrefreshAuthTokenPath = '/api/home/user/passport/refreshAuthToken';
-export type ApiApiHomeUserPassportrefreshAuthTokenMethod = 'post';
-export type ApiApiHomeUserPassportrefreshAuthTokenRequestBody = {
-  refreshToken: string;
-};
-export type ApiApiHomeUserPassportrefreshAuthTokenResponseBody =
-  paths[ApiApiHomeUserPassportrefreshAuthTokenPath][ApiApiHomeUserPassportrefreshAuthTokenMethod]['responses']['200']['content']['application/json']['data'];
-
 /** HomeUserPassport_createTempAuthToken */
 export const ApiApiHomeUserPassportcreateTempAuthTokenPath =
   '/api/home/user/passport/createTempAuthToken';
@@ -179,23 +179,23 @@ export class ApiHomeUserPassport extends BeanApiBase {
     );
   }
 
-  createPassportJwtFromOauthCode(
-    body: ApiApiHomeUserPassportcreatePassportJwtFromOauthCodeRequestBody,
+  refreshAuthToken(
+    body: ApiApiHomeUserPassportrefreshAuthTokenRequestBody,
     options?: IApiActionOptions,
   ) {
-    return this.$fetch.post<any, ApiApiHomeUserPassportcreatePassportJwtFromOauthCodeResponseBody>(
-      ApiApiHomeUserPassportcreatePassportJwtFromOauthCodePath,
+    return this.$fetch.post<any, ApiApiHomeUserPassportrefreshAuthTokenResponseBody>(
+      ApiApiHomeUserPassportrefreshAuthTokenPath,
       body,
       this.$configPrepare(OpenApiBaseURL(this.sys), options),
     );
   }
 
-  refreshAuthToken(
-    body: ApiApiHomeUserPassportrefreshAuthTokenRequestBody,
+  createPassportJwtFromOauthCode(
+    body: ApiApiHomeUserPassportcreatePassportJwtFromOauthCodeRequestBody,
     options?: IApiActionOptions,
   ) {
-    return this.$fetch.post<any, ApiApiHomeUserPassportrefreshAuthTokenResponseBody>(
-      ApiApiHomeUserPassportrefreshAuthTokenPath,
+    return this.$fetch.post<any, ApiApiHomeUserPassportcreatePassportJwtFromOauthCodeResponseBody>(
+      ApiApiHomeUserPassportcreatePassportJwtFromOauthCodePath,
       body,
       this.$configPrepare(OpenApiBaseURL(this.sys), options),
     );