vona-module-a-user 5.0.16 → 5.0.19

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

@@ -58,6 +58,40 @@ declare module 'vona' {
     }
 }
 /** bean: end */
+/** service: begin */
+export * from '../service/authTokenAdapter.ts';
+export * from '../service/redisToken.ts';
+import 'vona';
+declare module 'vona-module-a-bean' {
+    interface IServiceRecord {
+        'a-user:authTokenAdapter': never;
+        'a-user:redisToken': never;
+    }
+}
+declare module 'vona-module-a-user' {
+    interface ServiceAuthTokenAdapter {
+    }
+    interface ServiceRedisToken {
+    }
+}
+/** service: end */
+/** service: begin */
+import type { ServiceAuthTokenAdapter } from '../service/authTokenAdapter.ts';
+import type { ServiceRedisToken } from '../service/redisToken.ts';
+export interface IModuleService {
+    'authTokenAdapter': ServiceAuthTokenAdapter;
+    'redisToken': ServiceRedisToken;
+}
+/** service: end */
+/** service: begin */
+import 'vona';
+declare module 'vona' {
+    interface IBeanRecordGeneral {
+        'a-user.service.authTokenAdapter': ServiceAuthTokenAdapter;
+        'a-user.service.redisToken': ServiceRedisToken;
+    }
+}
+/** service: end */
 /** event: begin */
 export * from '../bean/event.createUserAnonymous.ts';
 export * from '../bean/event.signin.ts';
@@ -121,6 +155,7 @@ export declare class ScopeModuleAUser extends BeanScopeBase {
 export interface ScopeModuleAUser {
     util: BeanScopeUtil;
     config: TypeModuleConfig<typeof config>;
+    service: IModuleService;
     event: IModuleEvent;
 }
 import 'vona';

package/dist/config/config.d.ts

@@ -1,5 +1,5 @@
 import type { VonaApplication } from 'vona';
-import type { IServiceRecord } from 'vona-module-a-web';
+import type { IServiceRecord } from 'vona-module-a-bean';
 import type { TypeAuthToken } from '../types/auth.ts';
 export declare function config(_app: VonaApplication): {
     passport: {
@@ -12,4 +12,14 @@ export declare function config(_app: VonaApplication): {
         authInner: keyof IServiceRecord;
         roleInner: keyof IServiceRecord;
     };
+    payloadData: {
+        fields: {
+            authId: string;
+            userId: string;
+            token: string;
+        };
+    };
+    redisToken: {
+        maxAge: number;
+    };
 };

package/dist/index.js

@@ -1,18 +1,18 @@
-import { BeanInfo, BeanBase, beanFullNameFromOnionName, BeanScopeBase } from 'vona';
+import { BeanInfo, BeanBase, beanFullNameFromOnionName, createHash, uuidv4, BeanScopeBase } from 'vona';
 import { catchError } from '@cabloy/utils';
 import { Guard, Aspect } from 'vona-module-a-aspect';
-import { Bean, Scope } from 'vona-module-a-bean';
+import { Bean, Service, Scope } from 'vona-module-a-bean';
 import { Event, BeanEventBase } from 'vona-module-a-event';
 import { Meta } from 'vona-module-a-meta';
 
-var _dec$b, _dec2$b, _class$b;
-let GuardPassport = (_dec$b = Guard({
+var _dec$d, _dec2$d, _class$d;
+let GuardPassport = (_dec$d = Guard({
   global: true,
   public: false,
   checkAuthToken: true
-}), _dec2$b = BeanInfo({
+}), _dec2$d = BeanInfo({
   module: "a-user"
-}), _dec$b(_class$b = _dec2$b(_class$b = class GuardPassport extends BeanBase {
+}), _dec$d(_class$d = _dec2$d(_class$d = class GuardPassport extends BeanBase {
   async execute(options, next) {
     // auth token
     if (!this.bean.passport.getCurrent()) {
@@ -38,7 +38,7 @@ let GuardPassport = (_dec$b = Guard({
     // next
     return next();
   }
-}) || _class$b) || _class$b);
+}) || _class$d) || _class$d);
 
 let __roleAdapter;
 function setRoleAdapter(roleAdapter) {
@@ -74,12 +74,12 @@ function $getUserIdSystem(_userName, userId) {
   return userId;
 }
 
-var _dec$a, _dec2$a, _class$a;
-let GuardRoleName = (_dec$a = Guard({
+var _dec$c, _dec2$c, _class$c;
+let GuardRoleName = (_dec$c = Guard({
   passWhenMatched: true
-}), _dec2$a = BeanInfo({
+}), _dec2$c = BeanInfo({
   module: "a-user"
-}), _dec$a(_class$a = _dec2$a(_class$a = class GuardRoleName extends BeanBase {
+}), _dec$c(_class$c = _dec2$c(_class$c = class GuardRoleName extends BeanBase {
   async execute(options, next) {
     if (!options.name) return this.app.throw(403);
     const user = this.bean.passport.getCurrentUser();
@@ -93,14 +93,14 @@ let GuardRoleName = (_dec$a = Guard({
     // next
     return next();
   }
-}) || _class$a) || _class$a);
+}) || _class$c) || _class$c);
 
-var _dec$9, _dec2$9, _class$9;
-let GuardUserName = (_dec$9 = Guard({
+var _dec$b, _dec2$b, _class$b;
+let GuardUserName = (_dec$b = Guard({
   passWhenMatched: true
-}), _dec2$9 = BeanInfo({
+}), _dec2$b = BeanInfo({
   module: "a-user"
-}), _dec$9(_class$9 = _dec2$9(_class$9 = class GuardUserName extends BeanBase {
+}), _dec$b(_class$b = _dec2$b(_class$b = class GuardUserName extends BeanBase {
   async execute(options, next) {
     if (!options.name) return this.app.throw(403);
     const user = this.bean.passport.getCurrentUser();
@@ -112,12 +112,12 @@ let GuardUserName = (_dec$9 = Guard({
     // next
     return next();
   }
-}) || _class$9) || _class$9);
+}) || _class$b) || _class$b);
 
-var _dec$8, _dec2$8, _class$8;
-let BeanAuthInner = (_dec$8 = Bean(), _dec2$8 = BeanInfo({
+var _dec$a, _dec2$a, _class$a;
+let BeanAuthInner = (_dec$a = Bean(), _dec2$a = BeanInfo({
   module: "a-user"
-}), _dec$8(_class$8 = _dec2$8(_class$8 = class BeanAuthInner extends BeanBase {
+}), _dec$a(_class$a = _dec2$a(_class$a = class BeanAuthInner extends BeanBase {
   constructor(...args) {
     super(...args);
     this._authInnerAdapter = void 0;
@@ -133,7 +133,7 @@ let BeanAuthInner = (_dec$8 = Bean(), _dec2$8 = BeanInfo({
     if (String(auth.id).charAt(0) === '-') return auth;
     return await this.authInnerAdapter.findOne(auth);
   }
-}) || _class$8) || _class$8);
+}) || _class$a) || _class$a);
 
 let __authAdapter;
 function setAuthAdapter(authAdapter) {
@@ -146,10 +146,10 @@ function $getAuthIdSystem(_authName, authId) {
   return authId;
 }
 
-var _dec$7, _dec2$7, _class$7;
-let BeanPassport = (_dec$7 = Bean(), _dec2$7 = BeanInfo({
+var _dec$9, _dec2$9, _class$9;
+let BeanPassport = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
   module: "a-user"
-}), _dec$7(_class$7 = _dec2$7(_class$7 = class BeanPassport extends BeanBase {
+}), _dec$9(_class$9 = _dec2$9(_class$9 = class BeanPassport extends BeanBase {
   constructor(...args) {
     super(...args);
     this._authTokenAdapter = void 0;
@@ -340,12 +340,12 @@ let BeanPassport = (_dec$7 = Bean(), _dec2$7 = BeanInfo({
       return payloadData2;
     }
   }
-}) || _class$7) || _class$7);
+}) || _class$9) || _class$9);
 
-var _dec$6, _dec2$6, _class$6;
-let BeanRoleInner = (_dec$6 = Bean(), _dec2$6 = BeanInfo({
+var _dec$8, _dec2$8, _class$8;
+let BeanRoleInner = (_dec$8 = Bean(), _dec2$8 = BeanInfo({
   module: "a-user"
-}), _dec$6(_class$6 = _dec2$6(_class$6 = class BeanRoleInner extends BeanBase {
+}), _dec$8(_class$8 = _dec2$8(_class$8 = class BeanRoleInner extends BeanBase {
   constructor(...args) {
     super(...args);
     this._roleInnerAdapter = void 0;
@@ -366,12 +366,12 @@ let BeanRoleInner = (_dec$6 = Bean(), _dec2$6 = BeanInfo({
   findAllByUserId(userId) {
     return this.roleInnerAdapter.findAllByUserId(userId);
   }
-}) || _class$6) || _class$6);
+}) || _class$8) || _class$8);
 
-var _dec$5, _dec2$5, _class$5;
-let BeanUserInner = (_dec$5 = Bean(), _dec2$5 = BeanInfo({
+var _dec$7, _dec2$7, _class$7;
+let BeanUserInner = (_dec$7 = Bean(), _dec2$7 = BeanInfo({
   module: "a-user"
-}), _dec$5(_class$5 = _dec2$5(_class$5 = class BeanUserInner extends BeanBase {
+}), _dec$7(_class$7 = _dec2$7(_class$7 = class BeanUserInner extends BeanBase {
   constructor(...args) {
     super(...args);
     this._userInnerAdapter = void 0;
@@ -401,6 +401,104 @@ let BeanUserInner = (_dec$5 = Bean(), _dec2$5 = BeanInfo({
   remove(user) {
     return this.userInnerAdapter.remove(user);
   }
+}) || _class$7) || _class$7);
+
+var _dec$6, _dec2$6, _class$6;
+let ServiceAuthTokenAdapter = (_dec$6 = Service(), _dec2$6 = BeanInfo({
+  module: "a-user"
+}), _dec$6(_class$6 = _dec2$6(_class$6 = class ServiceAuthTokenAdapter extends BeanBase {
+  async create(payloadData) {
+    const authIdStr = this._getAuthId(payloadData)?.toString();
+    const token = authIdStr === '-1' ? createHash(authIdStr) : uuidv4();
+    const payloadDataNew = Object.assign({}, payloadData, {
+      [this.scope.config.payloadData.fields.token]: token
+    });
+    await this.scope.service.redisToken.create(payloadDataNew);
+    return payloadDataNew;
+  }
+  async retrieve(payloadData) {
+    return await this.scope.service.redisToken.retrieve(payloadData);
+  }
+  async verify(payloadData) {
+    return await this.scope.service.redisToken.verify(payloadData);
+  }
+  async refresh(payloadData) {
+    await this.scope.service.redisToken.refresh(payloadData);
+  }
+  async remove(payloadData) {
+    await this.scope.service.redisToken.remove(payloadData);
+  }
+  async removeAll(user) {
+    await this.scope.service.redisToken.removeAll(user);
+  }
+  _getAuthId(payloadData) {
+    return payloadData[this.scope.config.payloadData.fields.authId];
+  }
+}) || _class$6) || _class$6);
+
+var _dec$5, _dec2$5, _class$5;
+let ServiceRedisToken = (_dec$5 = Service(), _dec2$5 = BeanInfo({
+  module: "a-user"
+}), _dec$5(_class$5 = _dec2$5(_class$5 = class ServiceRedisToken extends BeanBase {
+  get redisAuth() {
+    return this.bean.redis.get('auth');
+  }
+  async verify(payloadData) {
+    const payloadData2 = await this.retrieve(payloadData);
+    if (!payloadData2) return false;
+    if (this._getToken(payloadData2) !== this._getToken(payloadData)) return false;
+    return true;
+  }
+  async retrieve(payloadData) {
+    const key = this._getAuthRedisKey(payloadData);
+    if (!key) return;
+    const token = await this.redisAuth.get(key);
+    if (!token) return;
+    return {
+      ...payloadData,
+      [this.scope.config.payloadData.fields.token]: token
+    };
+  }
+  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);
+  }
+  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);
+  }
+  async remove(payloadData) {
+    const key = this._getAuthRedisKey(payloadData);
+    if (!key) return;
+    await this.redisAuth.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);
+    }
+  }
+  _getAuthRedisKey(payloadData) {
+    if (!this.ctx.instance) return;
+    return `authToken:${this.ctx.instance.id}:${this._getUserId(payloadData)}:${this._getAuthId(payloadData)}`;
+  }
+  _getAuthRedisKeyPattern(user, keyPrefix) {
+    return `${keyPrefix ?? ''}authToken:${this.ctx.instance.id}:${user.id}:*`;
+  }
+  _getToken(payloadData) {
+    return payloadData[this.scope.config.payloadData.fields.token];
+  }
+  _getAuthId(payloadData) {
+    return payloadData[this.scope.config.payloadData.fields.authId];
+  }
+  _getUserId(payloadData) {
+    return payloadData[this.scope.config.payloadData.fields.userId];
+  }
 }) || _class$5) || _class$5);
 
 var _dec$4, _dec2$4, _class$4;
@@ -444,11 +542,21 @@ function config(_app) {
       refreshAuthToken: 'recreate'
     },
     adapter: {
-      authToken: 'home-user:authTokenAdapter',
+      authToken: 'a-user:authTokenAdapter',
       passport: 'home-user:passportAdapter',
       userInner: 'home-user:userInnerAdapter',
       authInner: 'home-user:authInnerAdapter',
       roleInner: 'home-user:roleInnerAdapter'
+    },
+    payloadData: {
+      fields: {
+        authId: 'authId',
+        userId: 'userId',
+        token: 'token'
+      }
+    },
+    redisToken: {
+      maxAge: 30 * 24 * 60 * 60
     }
   };
 }
@@ -484,4 +592,4 @@ const Passport = {
   admin: Admin
 };
 
-export { $getAuthId, $getAuthIdSystem, $getRoleId, $getRoleName, $getUserAnonymous, $getUserAvatar, $getUserId, $getUserIdSystem, $getUserLocale, $getUserName, BeanAuthInner, BeanPassport, BeanRoleInner, BeanUserInner, EventCreateUserAnonymous, EventSignin, EventSignout, GuardPassport, GuardRoleName, GuardUserName, MetaPrintTip, Passport, ScopeModuleAUser, config, setAuthAdapter, setRoleAdapter, setUserAdapter };
+export { $getAuthId, $getAuthIdSystem, $getRoleId, $getRoleName, $getUserAnonymous, $getUserAvatar, $getUserId, $getUserIdSystem, $getUserLocale, $getUserName, BeanAuthInner, BeanPassport, BeanRoleInner, BeanUserInner, EventCreateUserAnonymous, EventSignin, EventSignout, GuardPassport, GuardRoleName, GuardUserName, MetaPrintTip, Passport, ScopeModuleAUser, ServiceAuthTokenAdapter, ServiceRedisToken, config, setAuthAdapter, setRoleAdapter, setUserAdapter };

package/dist/service/authTokenAdapter.d.ts

@@ -0,0 +1,13 @@
+import type { IPayloadDataBase } from 'vona-module-a-jwt';
+import type { IAuthTokenAdapter } from '../types/authToken.ts';
+import type { IUserBase } from '../types/user.ts';
+import { BeanBase } from 'vona';
+export declare class ServiceAuthTokenAdapter extends BeanBase implements IAuthTokenAdapter {
+    create(payloadData: IPayloadDataBase): Promise<IPayloadDataBase>;
+    retrieve(payloadData: IPayloadDataBase): Promise<IPayloadDataBase | undefined>;
+    verify(payloadData: IPayloadDataBase): Promise<boolean>;
+    refresh(payloadData: IPayloadDataBase): Promise<void>;
+    remove(payloadData: IPayloadDataBase): Promise<void>;
+    removeAll(user: IUserBase): Promise<void>;
+    private _getAuthId;
+}

package/dist/service/redisToken.d.ts

@@ -0,0 +1,17 @@
+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>;
+    refresh(payloadData: IPayloadDataBase): Promise<undefined>;
+    remove(payloadData: IPayloadDataBase): Promise<void>;
+    removeAll(user: IUserBase): Promise<void>;
+    private _getAuthRedisKey;
+    private _getAuthRedisKeyPattern;
+    private _getToken;
+    private _getAuthId;
+    private _getUserId;
+}

package/package.json

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