vona-module-a-jwt 5.0.28 → 5.0.30

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

@@ -9,4 +9,5 @@ export declare class BeanJwt extends BeanBase {
     createOauthAuthToken(payloadData: IPayloadData, options?: IJwtSignOptions): Promise<string>;
     createOauthState(payloadData: IAuthenticateStrategyState, options?: IJwtSignOptions): Promise<string>;
     createOauthCode(payloadData: IPayloadData, options?: IJwtSignOptions): Promise<string>;
+    extractAuthTokenFromAllWays(): string | undefined;
 }

package/dist/index.js

@@ -1,14 +1,13 @@
 import { BeanInfo, BeanBase, deepExtend, cast, BeanScopeBase } from 'vona';
+import { __decorate, __metadata } from 'tslib';
 import ms from 'ms';
 import { Service, Bean, Scope } from 'vona-module-a-bean';
+import { catchError } from '@cabloy/utils';
 import jwt from 'jsonwebtoken';
 import { Api } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 
-var _dec$4, _dec2$4, _class$4;
-let ServiceJwtClient = (_dec$4 = Service(), _dec2$4 = BeanInfo({
-  module: "a-jwt"
-}), _dec$4(_class$4 = _dec2$4(_class$4 = class ServiceJwtClient extends BeanBase {
+let ServiceJwtClient = class ServiceJwtClient extends BeanBase {
   constructor(...args) {
     super(...args);
     this._jwtInstance = void 0;
@@ -43,6 +42,14 @@ let ServiceJwtClient = (_dec$4 = Service(), _dec2$4 = BeanInfo({
     return this.scope.config.field.payload.data;
   }
   async sign(payloadData, options) {
+    const [res, error] = await catchError(() => {
+      return this._signInner(payloadData, options);
+    });
+    this.$loggerChild('jwt').debug(() => `jwt.sign: client:${this._clientName}, token:${res}${error ? `, error: ${error.message}` : ''}`);
+    if (error) throw error;
+    return res;
+  }
+  async _signInner(payloadData, options) {
     return new Promise((resolve, reject) => {
       const payload = {
         [this.fieldClient]: this._clientName,
@@ -68,10 +75,20 @@ let ServiceJwtClient = (_dec$4 = Service(), _dec2$4 = BeanInfo({
   }
   async verify(token, options) {
     if (!token && this._clientName === 'access') token = this.scope.service.jwtExtract.fromAllWays();
+    const [res, error] = await catchError(() => {
+      return this._verifyInner(token, options);
+    });
+    this.$loggerChild('jwt').debug(() => `jwt.verify: client:${this._clientName}, token:${token}${error ? `, error: ${error.message}` : ''}`);
+    if (error) throw error;
+    return res;
+  }
+  async _verifyInner(token, options) {
     if (!token) return undefined;
     return new Promise((resolve, reject) => {
       this._jwtInstance.verify(token, this._clientOptions.secret, this._clientOptions.verifyOptions, (err, decoded) => {
-        if (err) return reject(err);
+        if (err) {
+          return reject(err);
+        }
         const payload = cast(decoded);
         // check field client
         if (payload[this.fieldClient] !== this._clientName) return this.app.throw(401);
@@ -88,12 +105,12 @@ let ServiceJwtClient = (_dec$4 = Service(), _dec2$4 = BeanInfo({
     if (Array.isArray(pathTarget) && !pathTarget.includes(path)) return false;
     return pathTarget === path;
   }
-}) || _class$4) || _class$4);
-
-var _dec$3, _dec2$3, _class$3;
-let BeanJwt = (_dec$3 = Bean(), _dec2$3 = BeanInfo({
+};
+ServiceJwtClient = __decorate([Service(), BeanInfo({
   module: "a-jwt"
-}), _dec$3(_class$3 = _dec2$3(_class$3 = class BeanJwt extends BeanBase {
+})], ServiceJwtClient);
+
+let BeanJwt = class BeanJwt extends BeanBase {
   get(clientName) {
     return this.app.bean._getBeanSelector(ServiceJwtClient, clientName);
   }
@@ -126,7 +143,13 @@ let BeanJwt = (_dec$3 = Bean(), _dec2$3 = BeanInfo({
   async createOauthCode(payloadData, options) {
     return await this.get('code').sign(payloadData, options);
   }
-}) || _class$3) || _class$3);
+  extractAuthTokenFromAllWays() {
+    return this.scope.service.jwtExtract.fromAllWays();
+  }
+};
+BeanJwt = __decorate([Bean(), BeanInfo({
+  module: "a-jwt"
+})], BeanJwt);
 
 const re = /(\S+)\s+(\S+)/;
 function parseAuthHeader(headerValue) {
@@ -138,10 +161,7 @@ function parseAuthHeader(headerValue) {
   };
 }
 
-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 {
+let ServiceJwtExtract = class ServiceJwtExtract extends BeanBase {
   fromHeader() {
     if (!this.scope.config.field.extract.header) return;
     return this.ctx.request.headers[this.scope.config.field.extract.header];
@@ -165,50 +185,24 @@ let ServiceJwtExtract = (_dec$2 = Service(), _dec2$2 = BeanInfo({
     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) {
-    a[i] = n[i];
-  }), a.enumerable = !!a.enumerable, a.configurable = !!a.configurable, ("value" in a || a.initializer) && (a.writable = true), a = r.slice().reverse().reduce(function (r, n) {
-    return n(i, e, r) || r;
-  }, a), void 0 === a.initializer ? (Object.defineProperty(i, e, a), null) : a;
-}
-function _initializerDefineProperty(e, i, r, l) {
-  r && Object.defineProperty(e, i, {
-    enumerable: r.enumerable,
-    configurable: r.configurable,
-    writable: r.writable,
-    value: r.initializer ? r.initializer.call(l) : void 0
-  });
-}
-
-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({
+};
+ServiceJwtExtract = __decorate([Service(), 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$1(_class$1 = _dec2$1(_class$1 = (_class2 = class DtoJwtToken {
+})], ServiceJwtExtract);
+
+let DtoJwtToken = class DtoJwtToken {
   constructor() {
-    _initializerDefineProperty(this, "accessToken", _descriptor, this);
-    _initializerDefineProperty(this, "refreshToken", _descriptor2, this);
-    _initializerDefineProperty(this, "expiresIn", _descriptor3, this);
+    this.accessToken = void 0;
+    this.refreshToken = void 0;
+    this.expiresIn = void 0;
   }
-}, _descriptor = _applyDecoratedDescriptor(_class2.prototype, "accessToken", [_dec3, _dec4], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "refreshToken", [_dec5, _dec6], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor3 = _applyDecoratedDescriptor(_class2.prototype, "expiresIn", [_dec7, _dec8], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _class2)) || _class$1) || _class$1);
+};
+__decorate([Api.field(), __metadata("design:type", String)], DtoJwtToken.prototype, "accessToken", void 0);
+__decorate([Api.field(), __metadata("design:type", String)], DtoJwtToken.prototype, "refreshToken", void 0);
+__decorate([Api.field(), __metadata("design:type", Number)], DtoJwtToken.prototype, "expiresIn", void 0);
+DtoJwtToken = __decorate([Dto(), BeanInfo({
+  module: "a-jwt"
+})], DtoJwtToken);
 
 function config(_app, env) {
   return {
@@ -270,11 +264,10 @@ function config(_app, env) {
   };
 }
 
-var _dec, _dec2, _class;
-let ScopeModuleAJwt = (_dec = Scope(), _dec2 = BeanInfo({
+let ScopeModuleAJwt = class ScopeModuleAJwt extends BeanScopeBase {};
+ScopeModuleAJwt = __decorate([Scope(), BeanInfo({
   module: "a-jwt"
-}), _dec(_class = _dec2(_class = class ScopeModuleAJwt extends BeanScopeBase {}) || _class) || _class);
-
+})], ScopeModuleAJwt);
 /** scope: end */
 
 const ErrorMessageJwtExpired = 'jwt expired';

package/dist/service/jwtClient.d.ts

@@ -12,6 +12,8 @@ export declare class ServiceJwtClient extends BeanBase {
     private get fieldPath();
     private get fieldData();
     sign(payloadData: IPayloadData, options?: IJwtSignOptions): Promise<string>;
+    private _signInner;
     verify(token?: string, options?: IJwtVerifyOptions): Promise<IPayloadData | undefined>;
+    private _verifyInner;
     _checkVerifyPath(pathTarget: string | string[] | undefined, pathReal: string | undefined): boolean;
 }

package/dist/types/jwt.d.ts

@@ -1,5 +1,6 @@
 import type { SignOptions, VerifyOptions } from 'jsonwebtoken';
 import type { StringValue } from 'ms';
+import 'vona';
 export declare const ErrorMessageJwtExpired = "jwt expired";
 export interface IJwtToken {
     accessToken: string;
@@ -53,3 +54,8 @@ export interface IPayloadData {
 }
 export interface IJwtPayload {
 }
+declare module 'vona' {
+    interface ILoggerChildRecord {
+        jwt: never;
+    }
+}

package/package.json

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