cabloy 5.1.243 → 5.1.244

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

@@ -2,9 +2,12 @@ import type { IModuleMain, VonaContext } from 'vona';
 
 import { BeanSimple } from 'vona';
 
+import { $getAuthTokenMode } from './lib/auth.ts';
+
 export class Main extends BeanSimple implements IModuleMain {
   async moduleLoading() {}
   async moduleLoaded() {
+    $getAuthTokenMode(this.app.config.modules['a-user'].authToken);
     // user
     Object.defineProperty(this.app.context, 'user', {
       enumerable: false,

package/vona/src/suite-vendor/a-vona/modules/a-user/src/service/authTokenAdapter.ts

@@ -10,7 +10,10 @@ import type { IUser } from '../types/user.ts';
 export class ServiceAuthTokenAdapter extends BeanBase implements IAuthTokenAdapter {
   async create(payloadData: IPayloadData, ttl?: number): Promise<IPayloadData> {
     const authIdStr = this._getAuthId(payloadData)?.toString();
-    const token = authIdStr === '-1' ? createHash(authIdStr) : uuidv4();
+    const token =
+      this.bean.passport.authTokenMode === 'auth' && authIdStr === '-1'
+        ? createHash(authIdStr)
+        : uuidv4();
     const payloadDataNew = Object.assign({}, payloadData, {
       [this.scope.config.payloadData.fields.token]: token,
     });

package/vona/src/suite-vendor/a-vona/modules/a-user/src/service/redisToken.ts

@@ -47,11 +47,15 @@ export class ServiceRedisToken extends BeanBase {
 
   private _getAuthRedisKey(payloadData: IPayloadData) {
     if (!this.ctx.instance) return;
-    return `${this._getUserId(payloadData)}:${this._getAuthId(payloadData)}`;
+    const key = `${this._getUserId(payloadData)}:${this._getAuthId(payloadData)}`;
+    if (this.bean.passport.authTokenMode === 'auth') return key;
+    const token = this._getToken(payloadData);
+    if (!token) return;
+    return `${key}:${token}`;
   }
 
   private _getAuthRedisKeyPrefix(user: IUser) {
-    return `${user.id}`;
+    return `${user.id}:`;
   }
 
   private _getToken(payloadData: IPayloadData) {

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

@@ -21,8 +21,10 @@ export interface IAuth {
 }
 
 export type TypeAuthTokenStrategy = 'reissue' | 'refresh' | 'reuse';
+export type TypeAuthTokenMode = 'auth' | 'session';
 
 export interface IAuthTokenConfig {
+  mode: TypeAuthTokenMode;
   stateless: boolean;
   strategy: {
     refreshAuthToken: TypeAuthTokenStrategy;
@@ -60,3 +62,9 @@ export interface IAuthTokenOptions {
 export interface ISigninOptions {
   authToken?: IAuthTokenOptions;
 }
+
+declare module 'vona' {
+  export interface VonaConfigEnv {
+    AUTH_TOKEN_MODE: string | undefined;
+  }
+}

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

@@ -20,6 +20,7 @@ export interface IPassportAdapter {
 declare module 'vona' {
   export interface ContextState {
     passport?: IPassport;
+    passportPayloadData?: IPayloadData;
   }
 
   export interface VonaContext {

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

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

package/zova/src/suite/a-home/modules/home-layoutadmin/src/component/layoutAdmin/render.user.tsx

@@ -1,5 +1,6 @@
 import { BeanRenderBase } from 'zova';
 import { Render } from 'zova-module-a-bean';
+import { ZButton } from 'zova-module-basic-button';
 import { resolveImagePreviewUrl } from 'zova-module-basic-image';
 import { closeNearestDetails } from 'zova-module-home-base';
 
@@ -32,14 +33,14 @@ export class RenderUser extends BeanRenderBase {
               </a>
             </li>
             <li>
-              <a
-                onClick={event => {
-                  this.$passport.logout().mutate();
+              <ZButton
+                onPerform={async event => {
                   closeNearestDetails(event);
+                  await this.$passport.logout().mutateAsync();
                 }}
               >
                 {this.scope.locale.Logout()}
-              </a>
+              </ZButton>
             </li>
           </ul>
         </details>

package/zova/src/suite/a-home/modules/home-layoutweb/src/component/layoutWeb/render.user.tsx

@@ -1,5 +1,6 @@
 import { BeanRenderBase, ClientOnly } from 'zova';
 import { Render } from 'zova-module-a-bean';
+import { ZButton } from 'zova-module-basic-button';
 import { resolveImagePreviewUrl } from 'zova-module-basic-image';
 import { closeNearestDetails } from 'zova-module-home-base';
 
@@ -39,14 +40,14 @@ export class RenderUser extends BeanRenderBase {
                     </a>
                   </li>
                   <li>
-                    <a
-                      onClick={event => {
-                        this.$passport.logout().mutate();
+                    <ZButton
+                      onPerform={async event => {
                         closeNearestDetails(event);
+                        await this.$passport.logout().mutateAsync();
                       }}
                     >
                       {this.scope.locale.Logout()}
-                    </a>
+                    </ZButton>
                   </li>
                 </>
               ) : (