vona-module-a-user 5.0.24 → 5.0.26

package/dist/.metadata/index.d.ts

@@ -107,6 +107,29 @@ declare module 'vona' {
     }
 }
 /** service: end */
+/** cacheRedis: begin */
+export * from '../bean/cacheRedis.authToken.ts';
+import { type IDecoratorCacheRedisOptions } from 'vona-module-a-cache';
+declare module 'vona-module-a-cache' {
+    interface ICacheRedisRecord {
+        'a-user:authToken': IDecoratorCacheRedisOptions;
+    }
+}
+declare module 'vona-module-a-user' {
+    interface CacheRedisAuthToken {
+    }
+    interface CacheRedisAuthToken {
+        get $beanFullName(): 'a-user.cacheRedis.authToken';
+        get $onionName(): 'a-user:authToken';
+    }
+}
+/** cacheRedis: end */
+/** cacheRedis: begin */
+import type { CacheRedisAuthToken } from '../bean/cacheRedis.authToken.ts';
+export interface IModuleCacheRedis {
+    'authToken': CacheRedisAuthToken;
+}
+/** cacheRedis: end */
 /** event: begin */
 export * from '../bean/event.activate.ts';
 export * from '../bean/event.createUserAnonymous.ts';
@@ -209,6 +232,7 @@ export interface ScopeModuleAUser {
     util: BeanScopeUtil;
     config: TypeModuleConfig<typeof config>;
     service: IModuleService;
+    cacheRedis: IModuleCacheRedis;
     event: IModuleEvent;
 }
 import 'vona';

package/dist/bean/bean.passport.d.ts

@@ -24,7 +24,7 @@ export declare class BeanPassport extends BeanBase {
     signinMock(name?: keyof IUserNameRecord, options?: ISigninOptions): Promise<IJwtToken>;
     signinWithAnonymous(): Promise<void>;
     createUserAnonymous(): Promise<IUserBase>;
-    kickOut(user: IUserBase): Promise<void>;
+    kickOut(user?: IUserBase): Promise<void>;
     checkAuthToken(accessToken?: string, clientName?: keyof IJwtClientRecord, options?: IJwtVerifyOptions): Promise<IPayloadDataBase | undefined>;
     refreshAuthToken(refreshToken: string): Promise<IJwtToken>;
     createTempAuthToken(options?: IJwtSignOptions): Promise<string>;

package/dist/bean/cacheRedis.authToken.d.ts

@@ -0,0 +1,5 @@
+import { BeanCacheRedisBase } from 'vona-module-a-cache';
+export type TCacheRedisAuthTokenKey = string;
+export type TCacheRedisAuthTokenData = string;
+export declare class CacheRedisAuthToken extends BeanCacheRedisBase<TCacheRedisAuthTokenKey, TCacheRedisAuthTokenData> {
+}

package/dist/bean/guard.roleName.d.ts

@@ -5,7 +5,9 @@ import { BeanBase } from 'vona';
 export interface IGuardOptionsRoleName extends IDecoratorGuardOptions {
     name?: keyof IRoleNameRecord | (keyof IRoleNameRecord)[];
     passWhenMatched: boolean;
+    rejectWhenDismatched: boolean;
 }
 export declare class GuardRoleName extends BeanBase implements IGuardExecute {
     execute(options: IGuardOptionsRoleName, next: Next): Promise<boolean>;
+    private _check;
 }

package/dist/bean/guard.userName.d.ts

@@ -5,7 +5,9 @@ import { BeanBase } from 'vona';
 export interface IGuardOptionsUserName extends IDecoratorGuardOptions {
     name?: keyof IUserNameRecord | (keyof IUserNameRecord)[];
     passWhenMatched: boolean;
+    rejectWhenDismatched: boolean;
 }
 export declare class GuardUserName extends BeanBase implements IGuardExecute {
     execute(options: IGuardOptionsUserName, next: Next): Promise<boolean>;
+    private _check;
 }

package/dist/config/config.d.ts

@@ -21,7 +21,4 @@ export declare function config(_app: VonaApplication): {
             token: string;
         };
     };
-    redisToken: {
-        maxAge: number;
-    };
 };

package/dist/index.js

@@ -2,18 +2,19 @@ import { BeanInfo, BeanBase, beanFullNameFromOnionName, createHash, uuidv4, Bean
 import { catchError } from '@cabloy/utils';
 import { Guard, Aspect } from 'vona-module-a-aspect';
 import { Bean, Service, Scope } from 'vona-module-a-bean';
+import { CacheRedis, BeanCacheRedisBase } from 'vona-module-a-cache';
 import { Event, BeanEventBase } from 'vona-module-a-event';
 import { Meta } from 'vona-module-a-meta';
 
-var _dec$e, _dec2$e, _class$e;
-let GuardPassport = (_dec$e = Guard({
+var _dec$f, _dec2$f, _class$f;
+let GuardPassport = (_dec$f = Guard({
   global: true,
   public: false,
   activated: true,
   checkAuthToken: true
-}), _dec2$e = BeanInfo({
+}), _dec2$f = BeanInfo({
   module: "a-user"
-}), _dec$e(_class$e = _dec2$e(_class$e = class GuardPassport extends BeanBase {
+}), _dec$f(_class$f = _dec2$f(_class$f = class GuardPassport extends BeanBase {
   async execute(options, next) {
     // auth token
     if (!this.bean.passport.getCurrent()) {
@@ -47,56 +48,74 @@ let GuardPassport = (_dec$e = Guard({
     // next
     return next();
   }
-}) || _class$e) || _class$e);
+}) || _class$f) || _class$f);
 
-var _dec$d, _dec2$d, _class$d;
-let GuardRoleName = (_dec$d = Guard({
-  passWhenMatched: true
-}), _dec2$d = BeanInfo({
+var _dec$e, _dec2$e, _class$e;
+let GuardRoleName = (_dec$e = Guard({
+  passWhenMatched: true,
+  rejectWhenDismatched: true
+}), _dec2$e = BeanInfo({
   module: "a-user"
-}), _dec$d(_class$d = _dec2$d(_class$d = class GuardRoleName extends BeanBase {
+}), _dec$e(_class$e = _dec2$e(_class$e = class GuardRoleName extends BeanBase {
   async execute(options, next) {
-    if (!options.name) return this.app.throw(403);
+    const result = await this._check(options);
+    if (!result) {
+      if (options.rejectWhenDismatched) return this.app.throw(403);
+    } else {
+      if (options.passWhenMatched) return true;
+    }
+    // next
+    return next();
+  }
+  async _check(options) {
+    if (!options.name) return false;
     const user = this.bean.passport.getCurrentUser();
-    if (!user || user.anonymous) return this.app.throw(403);
+    if (!user || user.anonymous) return false;
     const roles = this.bean.passport.getCurrentRoles();
-    if (!roles) return this.app.throw(403);
+    if (!roles) return false;
     const roleNames = roles?.map(item => item.name);
     const optionsName = Array.isArray(options.name) ? options.name : [options.name];
-    if (!roleNames.some(roleName => optionsName.includes(roleName))) return this.app.throw(403);
-    if (options.passWhenMatched) return true;
-    // next
-    return next();
+    if (!roleNames.some(roleName => optionsName.includes(roleName))) return false;
+    return true;
   }
-}) || _class$d) || _class$d);
+}) || _class$e) || _class$e);
 
-var _dec$c, _dec2$c, _class$c;
-let GuardUserName = (_dec$c = Guard({
-  passWhenMatched: true
-}), _dec2$c = BeanInfo({
+var _dec$d, _dec2$d, _class$d;
+let GuardUserName = (_dec$d = Guard({
+  passWhenMatched: true,
+  rejectWhenDismatched: true
+}), _dec2$d = BeanInfo({
   module: "a-user"
-}), _dec$c(_class$c = _dec2$c(_class$c = class GuardUserName extends BeanBase {
+}), _dec$d(_class$d = _dec2$d(_class$d = class GuardUserName extends BeanBase {
   async execute(options, next) {
-    if (!options.name) return this.app.throw(403);
+    const result = await this._check(options);
+    if (!result) {
+      if (options.rejectWhenDismatched) return this.app.throw(403);
+    } else {
+      if (options.passWhenMatched) return true;
+    }
+    // next
+    return next();
+  }
+  async _check(options) {
+    if (!options.name) return false;
     const user = this.bean.passport.getCurrentUser();
-    if (!user || user.anonymous) return this.app.throw(403);
+    if (!user || user.anonymous) return false;
     const userName = user.name;
     const optionsName = Array.isArray(options.name) ? options.name : [options.name];
-    if (!optionsName.includes(userName)) return this.app.throw(403);
-    if (options.passWhenMatched) return true;
-    // next
-    return next();
+    if (!optionsName.includes(userName)) return false;
+    return true;
   }
-}) || _class$c) || _class$c);
+}) || _class$d) || _class$d);
 
 function $getAuthIdSystem(_authName, authId) {
   return authId;
 }
 
-var _dec$b, _dec2$b, _class$b;
-let BeanPassport = (_dec$b = Bean(), _dec2$b = BeanInfo({
+var _dec$c, _dec2$c, _class$c;
+let BeanPassport = (_dec$c = Bean(), _dec2$c = BeanInfo({
   module: "a-user"
-}), _dec$b(_class$b = _dec2$b(_class$b = class BeanPassport extends BeanBase {
+}), _dec$c(_class$c = _dec2$c(_class$c = class BeanPassport extends BeanBase {
   constructor(...args) {
     super(...args);
     this._authTokenAdapter = void 0;
@@ -199,6 +218,7 @@ let BeanPassport = (_dec$b = Bean(), _dec2$b = BeanInfo({
     return userAnonymous;
   }
   async kickOut(user) {
+    if (!user) return;
     await this.authTokenAdapter.removeAll(user);
   }
   async checkAuthToken(accessToken, clientName, options) {
@@ -302,12 +322,12 @@ let BeanPassport = (_dec$b = Bean(), _dec2$b = BeanInfo({
       return payloadData2;
     }
   }
-}) || _class$b) || _class$b);
+}) || _class$c) || _class$c);
 
-var _dec$a, _dec2$a, _class$a;
-let BeanRole = (_dec$a = Bean(), _dec2$a = BeanInfo({
+var _dec$b, _dec2$b, _class$b;
+let BeanRole = (_dec$b = Bean(), _dec2$b = BeanInfo({
   module: "a-user"
-}), _dec$a(_class$a = _dec2$a(_class$a = class BeanRole extends BeanBase {
+}), _dec$b(_class$b = _dec2$b(_class$b = class BeanRole extends BeanBase {
   constructor(...args) {
     super(...args);
     this._roleAdapter = void 0;
@@ -328,12 +348,12 @@ let BeanRole = (_dec$a = Bean(), _dec2$a = BeanInfo({
   findAllByUserId(userId) {
     return this.roleAdapter.findAllByUserId(userId);
   }
-}) || _class$a) || _class$a);
+}) || _class$b) || _class$b);
 
-var _dec$9, _dec2$9, _class$9;
-let BeanUser = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
+var _dec$a, _dec2$a, _class$a;
+let BeanUser = (_dec$a = Bean(), _dec2$a = BeanInfo({
   module: "a-user"
-}), _dec$9(_class$9 = _dec2$9(_class$9 = class BeanUser extends BeanBase {
+}), _dec$a(_class$a = _dec2$a(_class$a = class BeanUser extends BeanBase {
   constructor(...args) {
     super(...args);
     this._userAdapter = void 0;
@@ -386,12 +406,12 @@ let BeanUser = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
   remove(user) {
     return this.userAdapter.remove(user);
   }
-}) || _class$9) || _class$9);
+}) || _class$a) || _class$a);
 
-var _dec$8, _dec2$8, _class$8;
-let ServiceAuthTokenAdapter = (_dec$8 = Service(), _dec2$8 = BeanInfo({
+var _dec$9, _dec2$9, _class$9;
+let ServiceAuthTokenAdapter = (_dec$9 = Service(), _dec2$9 = BeanInfo({
   module: "a-user"
-}), _dec$8(_class$8 = _dec2$8(_class$8 = class ServiceAuthTokenAdapter extends BeanBase {
+}), _dec$9(_class$9 = _dec2$9(_class$9 = class ServiceAuthTokenAdapter extends BeanBase {
   async create(payloadData) {
     const authIdStr = this._getAuthId(payloadData)?.toString();
     const token = authIdStr === '-1' ? createHash(authIdStr) : uuidv4();
@@ -419,15 +439,12 @@ let ServiceAuthTokenAdapter = (_dec$8 = Service(), _dec2$8 = BeanInfo({
   _getAuthId(payloadData) {
     return payloadData[this.scope.config.payloadData.fields.authId];
   }
-}) || _class$8) || _class$8);
+}) || _class$9) || _class$9);
 
-var _dec$7, _dec2$7, _class$7;
-let ServiceRedisToken = (_dec$7 = Service(), _dec2$7 = BeanInfo({
+var _dec$8, _dec2$8, _class$8;
+let ServiceRedisToken = (_dec$8 = Service(), _dec2$8 = BeanInfo({
   module: "a-user"
-}), _dec$7(_class$7 = _dec2$7(_class$7 = class ServiceRedisToken extends BeanBase {
-  get redisAuth() {
-    return this.bean.redis.get('auth');
-  }
+}), _dec$8(_class$8 = _dec2$8(_class$8 = class ServiceRedisToken extends BeanBase {
   async verify(payloadData) {
     const payloadData2 = await this.retrieve(payloadData);
     if (!payloadData2) return false;
@@ -437,7 +454,7 @@ let ServiceRedisToken = (_dec$7 = Service(), _dec2$7 = BeanInfo({
   async retrieve(payloadData) {
     const key = this._getAuthRedisKey(payloadData);
     if (!key) return;
-    const token = await this.redisAuth.get(key);
+    const token = await this.scope.cacheRedis.authToken.get(key);
     if (!token) return;
     return {
       ...payloadData,
@@ -447,33 +464,29 @@ let ServiceRedisToken = (_dec$7 = Service(), _dec2$7 = BeanInfo({
   async create(payloadData) {
     const key = this._getAuthRedisKey(payloadData);
     if (!key || !this._getToken(payloadData)) return this.app.throw(401);
-    await this.redisAuth.set(key, this._getToken(payloadData), 'EX', this.scope.config.redisToken.maxAge);
+    await this.scope.cacheRedis.authToken.set(this._getToken(payloadData), key);
   }
   async refresh(payloadData) {
     const key = this._getAuthRedisKey(payloadData);
     if (!key) return this.app.throw(401);
-    await this.redisAuth.expire(key, this.scope.config.redisToken.maxAge);
+    await this.scope.cacheRedis.authToken.expire(key);
   }
   async remove(payloadData) {
     const key = this._getAuthRedisKey(payloadData);
     if (!key) return;
-    await this.redisAuth.del(key);
+    await this.scope.cacheRedis.authToken.del(key);
   }
   async removeAll(user) {
-    const keyPrefix = this.redisAuth.options.keyPrefix;
-    const keyPattern = this._getAuthRedisKeyPattern(user, keyPrefix);
-    const keys = await this.redisAuth.keys(keyPattern);
-    for (const fullKey of keys) {
-      const key = keyPrefix ? fullKey.substring(keyPrefix.length) : fullKey;
-      await this.redisAuth.del(key);
-    }
+    const keyPrefix = this._getAuthRedisKeyPrefix(user);
+    const keys = await this.scope.cacheRedis.authToken.lookupKeys(keyPrefix, true);
+    await this.scope.cacheRedis.authToken.mdel(keys);
   }
   _getAuthRedisKey(payloadData) {
     if (!this.ctx.instance) return;
-    return `authToken:${this.ctx.instance.id}:${this._getUserId(payloadData)}:${this._getAuthId(payloadData)}`;
+    return `${this._getUserId(payloadData)}:${this._getAuthId(payloadData)}`;
   }
-  _getAuthRedisKeyPattern(user, keyPrefix) {
-    return `${keyPrefix ?? ''}authToken:${this.ctx.instance.id}:${user.id}:*`;
+  _getAuthRedisKeyPrefix(user) {
+    return `${user.id}`;
   }
   _getToken(payloadData) {
     return payloadData[this.scope.config.payloadData.fields.token];
@@ -484,7 +497,15 @@ let ServiceRedisToken = (_dec$7 = Service(), _dec2$7 = BeanInfo({
   _getUserId(payloadData) {
     return payloadData[this.scope.config.payloadData.fields.userId];
   }
-}) || _class$7) || _class$7);
+}) || _class$8) || _class$8);
+
+var _dec$7, _dec2$7, _class$7;
+let CacheRedisAuthToken = (_dec$7 = CacheRedis({
+  ttl: 30 * 24 * 60 * 60 * 1000,
+  disableTransactionCompensate: true
+}), _dec2$7 = BeanInfo({
+  module: "a-user"
+}), _dec$7(_class$7 = _dec2$7(_class$7 = class CacheRedisAuthToken extends BeanCacheRedisBase {}) || _class$7) || _class$7);
 
 var _dec$6, _dec2$6, _class$6;
 let EventActivate = (_dec$6 = Event(), _dec2$6 = BeanInfo({
@@ -551,9 +572,6 @@ function config(_app) {
         userId: 'userId',
         token: 'token'
       }
-    },
-    redisToken: {
-      maxAge: 30 * 24 * 60 * 60
     }
   };
 }
@@ -600,4 +618,4 @@ function $getUserIdSystem(_userName, userId) {
   return userId;
 }
 
-export { $getAuthIdSystem, $getUserIdSystem, BeanPassport, BeanRole, BeanUser, EventActivate, EventCreateUserAnonymous, EventRegister, EventSignin, EventSignout, GuardPassport, GuardRoleName, GuardUserName, MetaPrintTip, Passport, ScopeModuleAUser, ServiceAuthTokenAdapter, ServiceRedisToken, config };
+export { $getAuthIdSystem, $getUserIdSystem, BeanPassport, BeanRole, BeanUser, CacheRedisAuthToken, EventActivate, EventCreateUserAnonymous, EventRegister, EventSignin, EventSignout, GuardPassport, GuardRoleName, GuardUserName, MetaPrintTip, Passport, ScopeModuleAUser, ServiceAuthTokenAdapter, ServiceRedisToken, config };

package/dist/service/redisToken.d.ts

@@ -2,7 +2,6 @@ import type { IPayloadDataBase } from 'vona-module-a-jwt';
 import type { IUserBase } from 'vona-module-a-user';
 import { BeanBase } from 'vona';
 export declare class ServiceRedisToken extends BeanBase {
-    private get redisAuth();
     verify(payloadData: IPayloadDataBase): Promise<boolean>;
     retrieve(payloadData: IPayloadDataBase): Promise<IPayloadDataBase | undefined>;
     create(payloadData: IPayloadDataBase): Promise<undefined>;
@@ -10,7 +9,7 @@ export declare class ServiceRedisToken extends BeanBase {
     remove(payloadData: IPayloadDataBase): Promise<void>;
     removeAll(user: IUserBase): Promise<void>;
     private _getAuthRedisKey;
-    private _getAuthRedisKeyPattern;
+    private _getAuthRedisKeyPrefix;
     private _getToken;
     private _getAuthId;
     private _getUserId;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-user",
   "type": "module",
-  "version": "5.0.24",
+  "version": "5.0.26",
   "title": "a-user",
   "vonaModule": {
     "dependencies": {}