vona-module-a-jwt 5.0.14 → 5.0.16

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';
@@ -18,31 +19,11 @@ declare module 'vona' {
     }
 }
 /** bean: end */
-/** dto: begin */
-export * from '../dto/jwtToken.ts';
-import type { IDtoOptionsJwtToken } from '../dto/jwtToken.ts';
-import 'vona';
-declare module 'vona-module-a-web' {
-    interface IDtoRecord {
-        'a-jwt:jwtToken': Omit<IDtoOptionsJwtToken, '_fieldsMore_'>;
-    }
-}
-declare module 'vona-module-a-jwt' {
-}
-/** dto: end */
-/** dto: begin */
-import type { DtoJwtToken } from '../dto/jwtToken.ts';
-declare module 'vona-module-a-jwt' {
-    interface IDtoOptionsJwtToken {
-        fields?: TypeEntityOptionsFields<DtoJwtToken, IDtoOptionsJwtToken['_fieldsMore_']>;
-    }
-}
-/** dto: end */
 /** service: begin */
 export * from '../service/jwtClient.ts';
 export * from '../service/jwtExtract.ts';
 import 'vona';
-declare module 'vona-module-a-web' {
+declare module 'vona-module-a-bean' {
     interface IServiceRecord {
         'a-jwt:jwtClient': never;
         'a-jwt:jwtExtract': never;
@@ -51,8 +32,16 @@ declare module 'vona-module-a-web' {
 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 */
 /** service: begin */
@@ -72,6 +61,26 @@ declare module 'vona' {
     }
 }
 /** service: end */
+/** dto: begin */
+export * from '../dto/jwtToken.ts';
+import type { IDtoOptionsJwtToken } from '../dto/jwtToken.ts';
+import 'vona';
+declare module 'vona-module-a-web' {
+    interface IDtoRecord {
+        'a-jwt:jwtToken': IDtoOptionsJwtToken;
+    }
+}
+declare module 'vona-module-a-jwt' {
+}
+/** dto: end */
+/** dto: begin */
+import type { DtoJwtToken } from '../dto/jwtToken.ts';
+declare module 'vona-module-a-jwt' {
+    interface IDtoOptionsJwtToken {
+        fields?: TypeEntityOptionsFields<DtoJwtToken, IDtoOptionsJwtToken[TypeSymbolKeyFieldsMore]>;
+    }
+}
+/** dto: end */
 /** config: begin */
 export * from '../config/config.ts';
 import type { config } from '../config/config.ts';

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

@@ -1,9 +1,9 @@
 import { BeanInfo, BeanBase, deepExtend, cast, BeanScopeBase } from 'vona';
 import ms from 'ms';
-import { Bean, Scope } from 'vona-module-a-bean';
+import { Service, Bean, Scope } from 'vona-module-a-bean';
 import jwt from 'jsonwebtoken';
-import { Service, Dto } from 'vona-module-a-web';
 import { Api } from 'vona-module-a-openapi';
+import { Dto } from 'vona-module-a-web';
 
 var _dec$4, _dec2$4, _class$4;
 let ServiceJwtClient = (_dec$4 = Service(), _dec2$4 = BeanInfo({
@@ -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) {
@@ -122,6 +128,45 @@ let BeanJwt = (_dec$3 = Bean(), _dec2$3 = BeanInfo({
   }
 }) || _class$3) || _class$3);
 
+const re = /(\S+)\s+(\S+)/;
+function parseAuthHeader(headerValue) {
+  if (typeof headerValue !== 'string') return;
+  const matches = headerValue.match(re);
+  return matches && {
+    scheme: matches[1],
+    value: matches[2]
+  };
+}
+
+var _dec$2, _dec2$2, _class$2;
+let ServiceJwtExtract = (_dec$2 = Service(), _dec2$2 = BeanInfo({
+  module: "a-jwt"
+}), _dec$2(_class$2 = _dec2$2(_class$2 = class ServiceJwtExtract extends BeanBase {
+  fromHeader() {
+    if (!this.scope.config.field.extract.header) return;
+    return this.ctx.request.headers[this.scope.config.field.extract.header];
+  }
+  fromQuery() {
+    return this.ctx.request.query[this.scope.config.field.extract.query];
+  }
+  fromAuthHeaderWithScheme() {
+    const headerValue = this.ctx.request.headers[this.scope.config.field.extract.headerAuth];
+    const auth = parseAuthHeader(headerValue);
+    if (!auth || auth.scheme.toLocaleLowerCase() !== this.scope.config.field.extract.headerAuthScheme.toLocaleLowerCase()) return;
+    return auth.value;
+  }
+  fromCookie() {
+    return this.ctx.cookies.get(this.scope.config.field.extract.cookie);
+  }
+  fromAllWays() {
+    let token = this.fromQuery();
+    if (!token) token = this.fromAuthHeaderWithScheme();
+    if (!token) token = this.fromHeader();
+    if (!token) token = this.fromCookie();
+    return token;
+  }
+}) || _class$2) || _class$2);
+
 function _applyDecoratedDescriptor(i, e, r, n, l) {
   var a = {};
   return Object.keys(n).forEach(function (i) {
@@ -139,10 +184,10 @@ function _initializerDefineProperty(e, i, r, l) {
   });
 }
 
-var _dec$2, _dec2$2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _class$2, _class2, _descriptor, _descriptor2, _descriptor3;
-let DtoJwtToken = (_dec$2 = Dto(), _dec2$2 = BeanInfo({
+var _dec$1, _dec2$1, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _class$1, _class2, _descriptor, _descriptor2, _descriptor3;
+let DtoJwtToken = (_dec$1 = Dto(), _dec2$1 = BeanInfo({
   module: "a-jwt"
-}), _dec3 = Api.field(), _dec4 = Reflect.metadata("design:type", String), _dec5 = Api.field(), _dec6 = Reflect.metadata("design:type", String), _dec7 = Api.field(), _dec8 = Reflect.metadata("design:type", Number), _dec$2(_class$2 = _dec2$2(_class$2 = (_class2 = class DtoJwtToken {
+}), _dec3 = Api.field(), _dec4 = Reflect.metadata("design:type", String), _dec5 = Api.field(), _dec6 = Reflect.metadata("design:type", String), _dec7 = Api.field(), _dec8 = Reflect.metadata("design:type", Number), _dec$1(_class$1 = _dec2$1(_class$1 = (_class2 = class DtoJwtToken {
   constructor() {
     _initializerDefineProperty(this, "accessToken", _descriptor, this);
     _initializerDefineProperty(this, "refreshToken", _descriptor2, this);
@@ -163,46 +208,7 @@ let DtoJwtToken = (_dec$2 = Dto(), _dec2$2 = BeanInfo({
   enumerable: true,
   writable: true,
   initializer: null
-}), _class2)) || _class$2) || _class$2);
-
-const re = /(\S+)\s+(\S+)/;
-function parseAuthHeader(headerValue) {
-  if (typeof headerValue !== 'string') return;
-  const matches = headerValue.match(re);
-  return matches && {
-    scheme: matches[1],
-    value: matches[2]
-  };
-}
-
-var _dec$1, _dec2$1, _class$1;
-let ServiceJwtExtract = (_dec$1 = Service(), _dec2$1 = BeanInfo({
-  module: "a-jwt"
-}), _dec$1(_class$1 = _dec2$1(_class$1 = class ServiceJwtExtract extends BeanBase {
-  fromHeader() {
-    if (!this.scope.config.field.extract.header) return;
-    return this.ctx.request.headers[this.scope.config.field.extract.header];
-  }
-  fromQuery() {
-    return this.ctx.request.query[this.scope.config.field.extract.query];
-  }
-  fromAuthHeaderWithScheme() {
-    const headerValue = this.ctx.request.headers[this.scope.config.field.extract.headerAuth];
-    const auth = parseAuthHeader(headerValue);
-    if (!auth || auth.scheme.toLocaleLowerCase() !== this.scope.config.field.extract.headerAuthScheme.toLocaleLowerCase()) return;
-    return auth.value;
-  }
-  fromCookie() {
-    return this.ctx.cookies.get(this.scope.config.field.extract.cookie);
-  }
-  fromAllWays() {
-    let token = this.fromQuery();
-    if (!token) token = this.fromAuthHeaderWithScheme();
-    if (!token) token = this.fromHeader();
-    if (!token) token = this.fromCookie();
-    return token;
-  }
-}) || _class$1) || _class$1);
+}), _class2)) || _class$1) || _class$1);
 
 function config(app) {
   return {

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.14",
+  "version": "5.0.16",
   "title": "a-jwt",
   "vonaModule": {
     "dependencies": {}