vona-module-a-jwt 5.0.15 → 5.0.17

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

@@ -1,3 +1,4 @@
+import type { TypeSymbolKeyFieldsMore } from 'vona-module-a-orm';
 import type { TypeEntityOptionsFields } from 'vona-module-a-openapi';
 /** bean: begin */
 export * from '../bean/bean.jwt.ts';
@@ -31,7 +32,15 @@ declare module 'vona-module-a-bean' {
 declare module 'vona-module-a-jwt' {
     interface ServiceJwtClient {
     }
+    interface ServiceJwtClient {
+        get $beanFullName(): 'a-jwt.service.jwtClient';
+        get $onionName(): 'a-jwt:jwtClient';
+    }
+    interface ServiceJwtExtract {
+    }
     interface ServiceJwtExtract {
+        get $beanFullName(): 'a-jwt.service.jwtExtract';
+        get $onionName(): 'a-jwt:jwtExtract';
     }
 }
 /** service: end */
@@ -58,7 +67,7 @@ import type { IDtoOptionsJwtToken } from '../dto/jwtToken.ts';
 import 'vona';
 declare module 'vona-module-a-web' {
     interface IDtoRecord {
-        'a-jwt:jwtToken': Omit<IDtoOptionsJwtToken, '_fieldsMore_'>;
+        'a-jwt:jwtToken': IDtoOptionsJwtToken;
     }
 }
 declare module 'vona-module-a-jwt' {
@@ -68,7 +77,7 @@ declare module 'vona-module-a-jwt' {
 import type { DtoJwtToken } from '../dto/jwtToken.ts';
 declare module 'vona-module-a-jwt' {
     interface IDtoOptionsJwtToken {
-        fields?: TypeEntityOptionsFields<DtoJwtToken, IDtoOptionsJwtToken['_fieldsMore_']>;
+        fields?: TypeEntityOptionsFields<DtoJwtToken, IDtoOptionsJwtToken[TypeSymbolKeyFieldsMore]>;
     }
 }
 /** dto: end */

package/dist/bean/bean.jwt.d.ts

@@ -4,8 +4,8 @@ import { ServiceJwtClient } from '../service/jwtClient.ts';
 export declare class BeanJwt extends BeanBase {
     get(clientName?: keyof IJwtClientRecord): ServiceJwtClient;
     create(payloadData: IPayloadDataBase, options?: IJwtSignOptions): Promise<IJwtToken>;
-    createTemp(payloadData: IPayloadDataBase, options?: IJwtSignOptions): Promise<string>;
-    createOauth(payloadData: IPayloadDataBase, options?: IJwtSignOptions): Promise<string>;
+    createTempAuthToken(payloadData: IPayloadDataBase, options?: IJwtSignOptions): Promise<string>;
+    createOauthAuthToken(payloadData: IPayloadDataBase, options?: IJwtSignOptions): Promise<string>;
     createOauthState(payloadData: IPayloadDataBase, options?: IJwtSignOptions): Promise<string>;
     createOauthCode(payloadData: IPayloadDataBase, options?: IJwtSignOptions): Promise<string>;
 }

package/dist/index.js

@@ -66,7 +66,7 @@ let ServiceJwtClient = (_dec$4 = Service(), _dec2$4 = BeanInfo({
       });
     });
   }
-  async verify(token) {
+  async verify(token, options) {
     if (!token && this._clientName === 'access') token = this.scope.service.jwtExtract.fromAllWays();
     if (!token) return undefined;
     return new Promise((resolve, reject) => {
@@ -76,12 +76,18 @@ let ServiceJwtClient = (_dec$4 = Service(), _dec2$4 = BeanInfo({
         // check field client
         if (payload[this.fieldClient] !== this._clientName) return this.app.throw(401);
         // check field path
-        if (payload[this.fieldPath] && payload[this.fieldPath] !== this.ctx.route.routePathRaw) return this.app.throw(401);
+        if (!this._checkVerifyPath(payload[this.fieldPath], options?.path)) return this.app.throw(401);
         // passed
         resolve(payload[this.fieldData]);
       });
     });
   }
+  _checkVerifyPath(pathTarget, pathReal) {
+    if (!pathTarget) return true;
+    const path = pathReal ?? String(this.ctx.route.routePathRaw);
+    if (Array.isArray(pathTarget) && !pathTarget.includes(path)) return false;
+    return pathTarget === path;
+  }
 }) || _class$4) || _class$4);
 
 var _dec$3, _dec2$3, _class$3;
@@ -106,12 +112,12 @@ let BeanJwt = (_dec$3 = Bean(), _dec2$3 = BeanInfo({
       expiresIn
     };
   }
-  async createTemp(payloadData, options) {
+  async createTempAuthToken(payloadData, options) {
     return await this.get('access').sign(payloadData, Object.assign({}, options, {
       temp: true
     }));
   }
-  async createOauth(payloadData, options) {
+  async createOauthAuthToken(payloadData, options) {
     return await this.get('oauth').sign(payloadData, options);
   }
   async createOauthState(payloadData, options) {

package/dist/service/jwtClient.d.ts

@@ -1,4 +1,4 @@
-import type { IJwtClientRecord, IJwtSignOptions, IPayloadDataBase } from '../types/jwt.ts';
+import type { IJwtClientRecord, IJwtSignOptions, IJwtVerifyOptions, IPayloadDataBase } from '../types/jwt.ts';
 import jwt from 'jsonwebtoken';
 import { BeanBase } from 'vona';
 export declare class ServiceJwtClient extends BeanBase {
@@ -12,5 +12,6 @@ export declare class ServiceJwtClient extends BeanBase {
     private get fieldPath();
     private get fieldData();
     sign(payloadData: IPayloadDataBase, options?: IJwtSignOptions): Promise<string>;
-    verify(token?: string): Promise<IPayloadDataBase | undefined>;
+    verify(token?: string, options?: IJwtVerifyOptions): Promise<IPayloadDataBase | undefined>;
+    _checkVerifyPath(pathTarget: string | string[] | undefined, pathReal: string | undefined): boolean;
 }

package/dist/types/jwt.d.ts

@@ -17,6 +17,9 @@ export interface IJwtSignOptions {
     dev?: boolean;
     temp?: boolean;
 }
+export interface IJwtVerifyOptions {
+    path?: string;
+}
 export interface IJwtClientOptions {
     secret?: string;
     signOptions: SignOptions;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-jwt",
   "type": "module",
-  "version": "5.0.15",
+  "version": "5.0.17",
   "title": "a-jwt",
   "vonaModule": {
     "dependencies": {}