cabloy 5.1.102 → 5.1.104

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

@@ -9,7 +9,7 @@ import type {
 
 import { combineQueries, isNil } from '@cabloy/utils';
 import { SchemaObject } from 'openapi3-ts/oas31';
-import { BeanModelBase, Model } from 'zova-module-a-model';
+import { $QueryEnsureFresh, $QueryGetFresh, BeanModelBase, Model } from 'zova-module-a-model';
 import {
   IPermissionHintGeneral,
   IResourceFormActionRowNameRecord,
@@ -28,7 +28,9 @@ export class ModelPassport extends BeanModelBase {
   expireTime?: number;
   schemaLogin?: SchemaObject;
 
-  protected async __init__() {
+  protected async __init__() {}
+
+  async appInitialize() {
     this.schemaLogin = this.$computed(() => {
       return this.apiSchemasLogin.requestBody;
     });
@@ -81,6 +83,41 @@ export class ModelPassport extends BeanModelBase {
     });
   }
 
+  getTempAuthToken(options: { path?: string; staleTime: number }) {
+    if (!process.env.CLIENT || !this.isAuthenticated) return;
+    return this.$useStateData({
+      queryKey: ['tempAuthToken', options.path],
+      queryFn: async () => {
+        return await this.$api.homeUserPassport.createTempAuthToken(undefined, {
+          query: { path: options.path },
+        });
+      },
+      staleTime: options.staleTime,
+      meta: {
+        disableSuspenseOnInit: true,
+        persister: false,
+        ssr: { dehydrate: false },
+      },
+    });
+  }
+
+  getFreshTempAuthToken(options: { path?: string; staleTime: number }): string | undefined {
+    return $QueryGetFresh(
+      () => this.getTempAuthToken(options),
+      query => this._isTempAuthTokenExpired(query.data, query.dataUpdatedAt, options.staleTime),
+    );
+  }
+
+  async ensureFreshTempAuthToken(options: {
+    path?: string;
+    staleTime: number;
+  }): Promise<string | undefined> {
+    return await $QueryEnsureFresh(
+      () => this.getTempAuthToken(options),
+      query => this._isTempAuthTokenExpired(query.data, query.dataUpdatedAt, options.staleTime),
+    );
+  }
+
   getOauthLoginUrl(module: string, providerName: string, clientName?: string): string {
     const apiPath = this.sys.util.apiActionPathTranslate(ApiApiHomeUserPassportloginOauthPath, {
       module,
@@ -132,6 +169,10 @@ export class ModelPassport extends BeanModelBase {
     return this.passport?.roles;
   }
 
+  get isAdmin() {
+    return !!this.passport?.roles.some(item => item.name === 'admin');
+  }
+
   async getJwtInfo(): Promise<IJwtInfo | undefined> {
     if (!this.accessToken) return undefined;
     return {
@@ -160,6 +201,14 @@ export class ModelPassport extends BeanModelBase {
     return this.passport;
   }
 
+  private _isTempAuthTokenExpired(
+    token: string | undefined,
+    dataUpdatedAt: number,
+    staleTime: number,
+  ) {
+    return token === undefined || dataUpdatedAt + staleTime <= Date.now();
+  }
+
   private _setLocaleTz() {
     const user = this.passport?.user;
     if (!user) return;

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

@@ -1,11 +1,20 @@
 import type { IModule } from '@cabloy/module-info';
-import type { BeanBase, BeanContainer, IMonkeyBeanInit, IMonkeyModule } from 'zova';
+import type {
+  BeanBase,
+  BeanContainer,
+  IMonkeyAppInitialize,
+  IMonkeyBeanInit,
+  IMonkeyModule,
+} from 'zova';
 
 import { BeanSimple } from 'zova';
 
 import type { ModelPassport } from './model/passport.js';
 
-export class Monkey extends BeanSimple implements IMonkeyModule, IMonkeyBeanInit {
+export class Monkey
+  extends BeanSimple
+  implements IMonkeyAppInitialize, IMonkeyModule, IMonkeyBeanInit
+{
   private _moduleSelf: IModule;
   private $$modelPassport: ModelPassport;
 
@@ -14,13 +23,18 @@ export class Monkey extends BeanSimple implements IMonkeyModule, IMonkeyBeanInit
     this._moduleSelf = moduleSelf;
   }
 
-  async getModelPassport() {
+  private async getModelPassport() {
     if (!this.$$modelPassport) {
       this.$$modelPassport = await this.bean._getBean('home-passport.model.passport', true);
     }
     return this.$$modelPassport;
   }
 
+  async appInitialize() {
+    const modelPassport = await this.getModelPassport();
+    await modelPassport.appInitialize();
+  }
+
   async moduleLoading(_module: IModule) {}
   async moduleLoaded(module: IModule) {
     // self

package/zova/src/suite/a-training/modules/training-student/src/api/openapi/schemas.ts

@@ -67,10 +67,8 @@ export type ApiSchemaTrainingRecordDtoRecordSelectResItemPartial =
   Partial<ApiSchemaTrainingRecordDtoRecordSelectResItem>;
 export type ApiSchemaAImageDtoImageView = components['schemas']['a-image.dto.imageView'];
 export type ApiSchemaAImageDtoImageViewPartial = Partial<ApiSchemaAImageDtoImageView>;
-export type ApiSchemaAImageDtoImageTransformOptions =
-  components['schemas']['a-image.dto.imageTransformOptions'];
-export type ApiSchemaAImageDtoImageTransformOptionsPartial =
-  Partial<ApiSchemaAImageDtoImageTransformOptions>;
+export type ApiSchemaAFileDtoFileView = components['schemas']['a-file.dto.fileView'];
+export type ApiSchemaAFileDtoFileViewPartial = Partial<ApiSchemaAFileDtoFileView>;
 export type ApiSchemaTrainingRecordDtoRecordView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_425dbecccd52e19e24888f99e1b1670233afa875 =
   components['schemas']['training-record.dto.recordView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_425dbecccd52e19e24888f99e1b1670233afa875'];
 export type ApiSchemaTrainingRecordDtoRecordView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_425dbecccd52e19e24888f99e1b1670233afa875Partial =
@@ -111,14 +109,46 @@ export type ApiSchemaTrainingStudentDtoStudentSummary_2d063d28bc7243bed02ebd8bdd
   components['schemas']['training-student.dto.studentSummary_2d063d28bc7243bed02ebd8bddf1212a93c6305b'];
 export type ApiSchemaTrainingStudentDtoStudentSummary_2d063d28bc7243bed02ebd8bddf1212a93c6305bPartial =
   Partial<ApiSchemaTrainingStudentDtoStudentSummary_2d063d28bc7243bed02ebd8bddf1212a93c6305b>;
-export type ApiSchemaAImageDtoImageUploadTokenResponse =
-  components['schemas']['a-image.dto.imageUploadTokenResponse'];
-export type ApiSchemaAImageDtoImageUploadTokenResponsePartial =
-  Partial<ApiSchemaAImageDtoImageUploadTokenResponse>;
-export type ApiSchemaAImageDtoImageUploadTokenRequest =
-  components['schemas']['a-image.dto.imageUploadTokenRequest'];
-export type ApiSchemaAImageDtoImageUploadTokenRequestPartial =
-  Partial<ApiSchemaAImageDtoImageUploadTokenRequest>;
+export type ApiSchemaAFileDtoFileUploadPolicyResponse =
+  components['schemas']['a-file.dto.fileUploadPolicyResponse'];
+export type ApiSchemaAFileDtoFileUploadPolicyResponsePartial =
+  Partial<ApiSchemaAFileDtoFileUploadPolicyResponse>;
+export type ApiSchemaAFileDtoFileUploadPolicyRequest =
+  components['schemas']['a-file.dto.fileUploadPolicyRequest'];
+export type ApiSchemaAFileDtoFileUploadPolicyRequestPartial =
+  Partial<ApiSchemaAFileDtoFileUploadPolicyRequest>;
+export type ApiSchemaAFileDtoFileUploadResponse =
+  components['schemas']['a-file.dto.fileUploadResponse'];
+export type ApiSchemaAFileDtoFileUploadResponsePartial =
+  Partial<ApiSchemaAFileDtoFileUploadResponse>;
+export type ApiSchemaAFileDtoFileDirectUploadResponse =
+  components['schemas']['a-file.dto.fileDirectUploadResponse'];
+export type ApiSchemaAFileDtoFileDirectUploadResponsePartial =
+  Partial<ApiSchemaAFileDtoFileDirectUploadResponse>;
+export type ApiSchemaAFileDtoFileDirectUploadRequest =
+  components['schemas']['a-file.dto.fileDirectUploadRequest'];
+export type ApiSchemaAFileDtoFileDirectUploadRequestPartial =
+  Partial<ApiSchemaAFileDtoFileDirectUploadRequest>;
+export type ApiSchemaAFileDtoFileDirectUploadFinalizeResponse =
+  components['schemas']['a-file.dto.fileDirectUploadFinalizeResponse'];
+export type ApiSchemaAFileDtoFileDirectUploadFinalizeResponsePartial =
+  Partial<ApiSchemaAFileDtoFileDirectUploadFinalizeResponse>;
+export type ApiSchemaAFileDtoFileDirectUploadFinalizeRequest =
+  components['schemas']['a-file.dto.fileDirectUploadFinalizeRequest'];
+export type ApiSchemaAFileDtoFileDirectUploadFinalizeRequestPartial =
+  Partial<ApiSchemaAFileDtoFileDirectUploadFinalizeRequest>;
+export type ApiSchemaAFileDtoFileUploadUrlRequest =
+  components['schemas']['a-file.dto.fileUploadUrlRequest'];
+export type ApiSchemaAFileDtoFileUploadUrlRequestPartial =
+  Partial<ApiSchemaAFileDtoFileUploadUrlRequest>;
+export type ApiSchemaAImageDtoImageUploadPolicyResponse =
+  components['schemas']['a-image.dto.imageUploadPolicyResponse'];
+export type ApiSchemaAImageDtoImageUploadPolicyResponsePartial =
+  Partial<ApiSchemaAImageDtoImageUploadPolicyResponse>;
+export type ApiSchemaAImageDtoImageUploadPolicyRequest =
+  components['schemas']['a-image.dto.imageUploadPolicyRequest'];
+export type ApiSchemaAImageDtoImageUploadPolicyRequestPartial =
+  Partial<ApiSchemaAImageDtoImageUploadPolicyRequest>;
 export type ApiSchemaAImageDtoImageUploadResponse =
   components['schemas']['a-image.dto.imageUploadResponse'];
 export type ApiSchemaAImageDtoImageUploadResponsePartial =
@@ -131,6 +161,14 @@ export type ApiSchemaAImageDtoImageDirectUploadRequest =
   components['schemas']['a-image.dto.imageDirectUploadRequest'];
 export type ApiSchemaAImageDtoImageDirectUploadRequestPartial =
   Partial<ApiSchemaAImageDtoImageDirectUploadRequest>;
+export type ApiSchemaAImageDtoImageDirectUploadFinalizeResponse =
+  components['schemas']['a-image.dto.imageDirectUploadFinalizeResponse'];
+export type ApiSchemaAImageDtoImageDirectUploadFinalizeResponsePartial =
+  Partial<ApiSchemaAImageDtoImageDirectUploadFinalizeResponse>;
+export type ApiSchemaAImageDtoImageDirectUploadFinalizeRequest =
+  components['schemas']['a-image.dto.imageDirectUploadFinalizeRequest'];
+export type ApiSchemaAImageDtoImageDirectUploadFinalizeRequestPartial =
+  Partial<ApiSchemaAImageDtoImageDirectUploadFinalizeRequest>;
 export type ApiSchemaAImageDtoImageUploadUrlRequest =
   components['schemas']['a-image.dto.imageUploadUrlRequest'];
 export type ApiSchemaAImageDtoImageUploadUrlRequestPartial =