vona-cli-set-api 1.0.107 → 1.0.111

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.107",
+  "version": "1.0.111",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -31,10 +31,10 @@
     "@babel/plugin-proposal-decorators": "^7.25.9",
     "@babel/plugin-transform-class-properties": "^7.25.9",
     "@babel/plugin-transform-typescript": "^7.26.8",
-    "@cabloy/cli": "^3.0.38",
+    "@cabloy/cli": "^3.0.40",
     "@cabloy/dotenv": "^1.1.10",
     "@cabloy/extend": "^3.1.10",
-    "@cabloy/module-glob": "^5.2.20",
+    "@cabloy/module-glob": "^5.2.22",
     "@cabloy/module-info": "^1.3.24",
     "@cabloy/word-utils": "^2.0.1",
     "@lcov-viewer/cli": "^1.3.0",
@@ -61,7 +61,7 @@
     "ts-node": "^10.9.2",
     "urllib": "^4.6.11",
     "uuid": "^11.1.0",
-    "vona-core": "^5.0.34",
+    "vona-core": "^5.0.36",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^21.1.1"
   },

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/service/authTokenAdapter.ts

@@ -1,34 +0,0 @@
-import type { IAuthTokenAdapter, IUserBase } from 'vona-module-a-user';
-import type { IPayloadData } from '../types/passport.ts';
-import { BeanBase, createHash, uuidv4 } from 'vona';
-import { Service } from 'vona-module-a-bean';
-
-@Service()
-export class ServiceAuthTokenAdapter extends BeanBase implements IAuthTokenAdapter {
-  async create(payloadData: IPayloadData): Promise<IPayloadData> {
-    const token = (payloadData.authId.toString() === '-1') ? createHash(payloadData.authId.toString()) : uuidv4();
-    const payloadDataNew = Object.assign({}, payloadData, { token });
-    await this.scope.service.redisToken.create(payloadDataNew);
-    return payloadDataNew;
-  }
-
-  async retrieve(payloadData: IPayloadData): Promise<IPayloadData | undefined> {
-    return await this.scope.service.redisToken.retrieve(payloadData);
-  }
-
-  async verify(payloadData: IPayloadData): Promise<boolean> {
-    return await this.scope.service.redisToken.verify(payloadData);
-  }
-
-  async refresh(payloadData: IPayloadData): Promise<void> {
-    await this.scope.service.redisToken.refresh(payloadData);
-  }
-
-  async remove(payloadData: IPayloadData): Promise<void> {
-    await this.scope.service.redisToken.remove(payloadData);
-  }
-
-  async removeAll(user: IUserBase): Promise<void> {
-    await this.scope.service.redisToken.removeAll(user);
-  }
-}

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/service/redisToken.ts

@@ -1,63 +0,0 @@
-import type { IUserBase } from 'vona-module-a-user';
-import type { IPayloadData } from '../types/passport.ts';
-import { BeanBase } from 'vona';
-import { Service } from 'vona-module-a-bean';
-
-@Service()
-export class ServiceRedisToken extends BeanBase {
-  private get redisAuth() {
-    return this.bean.redis.get('auth');
-  }
-
-  async verify(payloadData: IPayloadData) {
-    const payloadData2 = await this.retrieve(payloadData);
-    if (!payloadData2) return false;
-    if (payloadData2.token !== payloadData.token) return false;
-    return true;
-  }
-
-  async retrieve(payloadData: IPayloadData): Promise<IPayloadData | undefined> {
-    const key = this._getAuthRedisKey(payloadData);
-    if (!key) return;
-    const token = await this.redisAuth.get(key);
-    if (!token) return;
-    return { ...payloadData, token };
-  }
-
-  async create(payloadData: IPayloadData) {
-    const key = this._getAuthRedisKey(payloadData);
-    if (!key || !payloadData.token) return this.app.throw(401);
-    await this.redisAuth.set(key, payloadData.token, 'EX', this.scope.config.redisToken.maxAge);
-  }
-
-  async refresh(payloadData: IPayloadData) {
-    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: IPayloadData) {
-    const key = this._getAuthRedisKey(payloadData);
-    if (!key) return;
-    await this.redisAuth.del(key);
-  }
-
-  async removeAll(user: IUserBase) {
-    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);
-    }
-  }
-
-  private _getAuthRedisKey(payloadData: IPayloadData) {
-    if (!this.ctx.instance) return;
-    return `authToken:${this.ctx.instance.id}:${payloadData.userId}:${payloadData.authId}`;
-  }
-
-  private _getAuthRedisKeyPattern(user: IUserBase, keyPrefix: string | undefined) {
-    return `${keyPrefix ?? ''}authToken:${this.ctx.instance.id}:${user.id}:*`;
-  }
-}