vona-module-a-jwt 5.0.10 → 5.0.12

package/dist/index.js

@@ -1,3 +1,273 @@
-export * from "./.metadata/index.js";
-export * from "./lib/index.js";
-export * from "./types/index.js";
+import { BeanInfo, BeanBase, deepExtend, cast, BeanScopeBase } from 'vona';
+import { Bean, Scope } from 'vona-module-a-bean';
+import ms from 'ms';
+import jwt from 'jsonwebtoken';
+import { Service, Dto } from 'vona-module-a-web';
+import { Api } from 'vona-module-a-openapi';
+
+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 {
+  constructor(...args) {
+    super(...args);
+    this._jwtInstance = void 0;
+    this._clientName = void 0;
+    this._clientOptions = void 0;
+  }
+  get instance() {
+    return this._jwtInstance;
+  }
+  __init__(clientName) {
+    this._createClient(clientName);
+  }
+  _createClient(clientName) {
+    clientName = clientName || 'access';
+    const configJwt = this.scope.config;
+    const configClient = configJwt.clients[clientName];
+    if (!configClient) throw new Error(`jwt client not found: ${clientName}`);
+    const secret = configJwt.default.secret ?? this.app.config.server.keys[0];
+    this._clientOptions = deepExtend({}, configJwt.default, {
+      secret
+    }, configClient);
+    this._clientName = clientName;
+    this._jwtInstance = jwt;
+  }
+  get fieldClient() {
+    return this.scope.config.field.payload.client;
+  }
+  get fieldPath() {
+    return this.scope.config.field.payload.path;
+  }
+  get fieldData() {
+    return this.scope.config.field.payload.data;
+  }
+  async sign(payloadData, options) {
+    return new Promise((resolve, reject) => {
+      const payload = {
+        [this.fieldClient]: this._clientName,
+        [this.fieldData]: payloadData
+      };
+      if (options?.path) payload[this.fieldPath] = options.path;
+      let signOptions = this._clientOptions.signOptions;
+      if (options?.dev) {
+        signOptions = Object.assign({}, signOptions, {
+          expiresIn: this.scope.config.clients.refresh.signOptions.expiresIn
+        });
+      }
+      if (options?.temp) {
+        signOptions = Object.assign({}, signOptions, {
+          expiresIn: this.scope.config.tempToken.signOptions.expiresIn
+        });
+      }
+      this._jwtInstance.sign(payload, this._clientOptions.secret, signOptions, (err, encoded) => {
+        if (err) return reject(err);
+        resolve(encoded);
+      });
+    });
+  }
+  async verify(token) {
+    if (!token && this._clientName === 'access') token = this.scope.service.jwtExtract.fromAllWays();
+    if (!token) return undefined;
+    return new Promise((resolve, reject) => {
+      this._jwtInstance.verify(token, this._clientOptions.secret, this._clientOptions.signOptions, (err, decoded) => {
+        if (err) return reject(err);
+        const payload = cast(decoded);
+        // 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);
+        // passed
+        resolve(payload[this.fieldData]);
+      });
+    });
+  }
+}) || _class$4) || _class$4);
+
+var _dec$3, _dec2$3, _class$3;
+let BeanJwt = (_dec$3 = Bean(), _dec2$3 = BeanInfo({
+  module: "a-jwt"
+}), _dec$3(_class$3 = _dec2$3(_class$3 = class BeanJwt extends BeanBase {
+  get(clientName) {
+    return this.app.bean._getBeanSelector(ServiceJwtClient, clientName);
+  }
+  async create(payloadData, options) {
+    // accessToken
+    const accessToken = await this.get('access').sign(payloadData, options);
+    // refreshToken
+    const refreshToken = await this.get('refresh').sign(payloadData, options);
+    // expiresIn
+    let expiresIn = this.scope.config.clients.access.signOptions.expiresIn;
+    if (typeof expiresIn === 'string') expiresIn = ms(expiresIn);
+    // ok
+    return {
+      accessToken,
+      refreshToken,
+      expiresIn
+    };
+  }
+  async createTemp(payloadData, options) {
+    return await this.get('access').sign(payloadData, Object.assign({}, options, {
+      temp: true
+    }));
+  }
+  async createOauth(payloadData, options) {
+    return await this.get('oauth').sign(payloadData, options);
+  }
+  async createOauthState(payloadData, options) {
+    return await this.get('oauthstate').sign(payloadData, options);
+  }
+  async createOauthCode(payloadData, options) {
+    return await this.get('code').sign(payloadData, options);
+  }
+}) || _class$3) || _class$3);
+
+function config(app) {
+  return {
+    field: {
+      payload: {
+        client: 'client',
+        path: 'path',
+        data: 'data'
+      },
+      extract: {
+        header: '',
+        headerAuth: 'authorization',
+        headerAuthScheme: 'bearer',
+        query: 'auth_token',
+        cookie: 'token'
+      }
+    },
+    tempToken: {
+      signOptions: {
+        expiresIn: 10 * 60
+      }
+    },
+    default: {
+      secret: undefined,
+      signOptions: {
+        issuer: app.meta.env.APP_NAME
+      }
+    },
+    clients: {
+      access: {
+        signOptions: {
+          expiresIn: 2 * 60 * 60
+        }
+      },
+      refresh: {
+        signOptions: {
+          expiresIn: 7 * 24 * 60 * 60
+        }
+      },
+      oauth: {
+        signOptions: {
+          expiresIn: 5 * 60
+        }
+      },
+      oauthstate: {
+        signOptions: {
+          expiresIn: 5 * 60
+        }
+      },
+      code: {
+        signOptions: {
+          expiresIn: 3 * 60
+        }
+      }
+    }
+  };
+}
+
+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$2, _dec2$2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _class$2, _class2, _descriptor, _descriptor2, _descriptor3;
+let DtoJwtToken = (_dec$2 = Dto(), _dec2$2 = 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 {
+  constructor() {
+    _initializerDefineProperty(this, "accessToken", _descriptor, this);
+    _initializerDefineProperty(this, "refreshToken", _descriptor2, this);
+    _initializerDefineProperty(this, "expiresIn", _descriptor3, this);
+  }
+}, _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$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);
+
+var _dec, _dec2, _class;
+let ScopeModuleAJwt = (_dec = Scope(), _dec2 = BeanInfo({
+  module: "a-jwt"
+}), _dec(_class = _dec2(_class = class ScopeModuleAJwt extends BeanScopeBase {}) || _class) || _class);
+
+/** scope: end */
+
+const ErrorMessageJwtExpired = 'jwt expired';
+
+export { BeanJwt, DtoJwtToken, ErrorMessageJwtExpired, ScopeModuleAJwt, ServiceJwtClient, ServiceJwtExtract, config, parseAuthHeader };

package/dist/types/jwt.d.ts

@@ -1,4 +1,5 @@
 import type { SignOptions } from 'jsonwebtoken';
+export declare const ErrorMessageJwtExpired = "jwt expired";
 export interface IJwtToken {
     accessToken: string;
     refreshToken: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-jwt",
   "type": "module",
-  "version": "5.0.10",
+  "version": "5.0.12",
   "title": "a-jwt",
   "vonaModule": {
     "dependencies": {}
@@ -36,6 +36,6 @@
   },
   "scripts": {
     "clean": "rimraf dist tsconfig.build.tsbuildinfo",
-    "tsc:publish": "npm run clean && tsc -p tsconfig.build.json"
+    "tsc:publish": "npm run clean && vona :bin:buildModule && tsc -p tsconfig.build.json"
   }
 }

package/dist/.metadata/index.js

@@ -1,37 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-/** config: end */
-/** scope: begin */
-import { BeanScopeBase } from 'vona';
-import { Scope } from 'vona-module-a-bean';
-import 'vona';
-/** service: end */
-/** service: begin */
-import 'vona';
-import 'vona';
-import 'vona';
-import 'vona';
-import 'vona';
-/** bean: begin */
-export * from "../bean/bean.jwt.js";
-/** service: end */
-/** config: begin */
-export * from "../config/config.js";
-/** bean: end */
-/** dto: begin */
-export * from "../dto/jwtToken.js";
-/** dto: end */
-/** service: begin */
-export * from "../service/jwtClient.js";
-export * from "../service/jwtExtract.js";
-let ScopeModuleAJwt = class ScopeModuleAJwt extends BeanScopeBase {
-};
-ScopeModuleAJwt = __decorate([
-    Scope()
-], ScopeModuleAJwt);
-export { ScopeModuleAJwt };
-/** scope: end */

package/dist/.metadata/this.js

@@ -1,2 +0,0 @@
-export const __ThisModule__ = 'a-jwt';
-export { ScopeModuleAJwt as ScopeModule } from "./index.js";

package/dist/bean/bean.jwt.js

@@ -1,47 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import ms from 'ms';
-import { BeanBase } from 'vona';
-import { Bean } from 'vona-module-a-bean';
-import { ServiceJwtClient } from "../service/jwtClient.js";
-let BeanJwt = class BeanJwt extends BeanBase {
-    get(clientName) {
-        return this.app.bean._getBeanSelector(ServiceJwtClient, clientName);
-    }
-    async create(payloadData, options) {
-        // accessToken
-        const accessToken = await this.get('access').sign(payloadData, options);
-        // refreshToken
-        const refreshToken = await this.get('refresh').sign(payloadData, options);
-        // expiresIn
-        let expiresIn = this.scope.config.clients.access.signOptions.expiresIn;
-        if (typeof expiresIn === 'string')
-            expiresIn = ms(expiresIn);
-        // ok
-        return {
-            accessToken,
-            refreshToken,
-            expiresIn,
-        };
-    }
-    async createTemp(payloadData, options) {
-        return await this.get('access').sign(payloadData, Object.assign({}, options, { temp: true }));
-    }
-    async createOauth(payloadData, options) {
-        return await this.get('oauth').sign(payloadData, options);
-    }
-    async createOauthState(payloadData, options) {
-        return await this.get('oauthstate').sign(payloadData, options);
-    }
-    async createOauthCode(payloadData, options) {
-        return await this.get('code').sign(payloadData, options);
-    }
-};
-BeanJwt = __decorate([
-    Bean()
-], BeanJwt);
-export { BeanJwt };

package/dist/config/config.js

@@ -1,42 +0,0 @@
-export function config(app) {
-    return {
-        field: {
-            payload: {
-                client: 'client',
-                path: 'path',
-                data: 'data',
-            },
-            extract: {
-                header: '',
-                headerAuth: 'authorization',
-                headerAuthScheme: 'bearer',
-                query: 'auth_token',
-                cookie: 'token',
-            },
-        },
-        tempToken: {
-            signOptions: { expiresIn: 10 * 60 },
-        },
-        default: {
-            secret: undefined,
-            signOptions: { issuer: app.meta.env.APP_NAME },
-        },
-        clients: {
-            access: {
-                signOptions: { expiresIn: 2 * 60 * 60 },
-            },
-            refresh: {
-                signOptions: { expiresIn: 7 * 24 * 60 * 60 },
-            },
-            oauth: {
-                signOptions: { expiresIn: 5 * 60 },
-            },
-            oauthstate: {
-                signOptions: { expiresIn: 5 * 60 },
-            },
-            code: {
-                signOptions: { expiresIn: 3 * 60 },
-            },
-        },
-    };
-}

package/dist/dto/jwtToken.js

@@ -1,32 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { Api } from 'vona-module-a-openapi';
-import { Dto } from 'vona-module-a-web';
-let DtoJwtToken = class DtoJwtToken {
-    accessToken;
-    refreshToken;
-    expiresIn;
-};
-__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()
-], DtoJwtToken);
-export { DtoJwtToken };

package/dist/lib/authHeader.js

@@ -1,7 +0,0 @@
-const re = /(\S+)\s+(\S+)/;
-export function parseAuthHeader(headerValue) {
-    if (typeof headerValue !== 'string')
-        return;
-    const matches = headerValue.match(re);
-    return matches && { scheme: matches[1], value: matches[2] };
-}

package/dist/lib/index.js

@@ -1 +0,0 @@
-export * from "./authHeader.js";

package/dist/service/jwtClient.js

@@ -1,87 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import jwt from 'jsonwebtoken';
-import { BeanBase, cast, deepExtend } from 'vona';
-import { Service } from 'vona-module-a-web';
-let ServiceJwtClient = class ServiceJwtClient extends BeanBase {
-    _jwtInstance;
-    _clientName;
-    _clientOptions;
-    get instance() {
-        return this._jwtInstance;
-    }
-    __init__(clientName) {
-        this._createClient(clientName);
-    }
-    _createClient(clientName) {
-        clientName = clientName || 'access';
-        const configJwt = this.scope.config;
-        const configClient = configJwt.clients[clientName];
-        if (!configClient)
-            throw new Error(`jwt client not found: ${clientName}`);
-        const secret = configJwt.default.secret ?? this.app.config.server.keys[0];
-        this._clientOptions = deepExtend({}, configJwt.default, { secret }, configClient);
-        this._clientName = clientName;
-        this._jwtInstance = jwt;
-    }
-    get fieldClient() {
-        return this.scope.config.field.payload.client;
-    }
-    get fieldPath() {
-        return this.scope.config.field.payload.path;
-    }
-    get fieldData() {
-        return this.scope.config.field.payload.data;
-    }
-    async sign(payloadData, options) {
-        return new Promise((resolve, reject) => {
-            const payload = {
-                [this.fieldClient]: this._clientName,
-                [this.fieldData]: payloadData,
-            };
-            if (options?.path)
-                payload[this.fieldPath] = options.path;
-            let signOptions = this._clientOptions.signOptions;
-            if (options?.dev) {
-                signOptions = Object.assign({}, signOptions, { expiresIn: this.scope.config.clients.refresh.signOptions.expiresIn });
-            }
-            if (options?.temp) {
-                signOptions = Object.assign({}, signOptions, { expiresIn: this.scope.config.tempToken.signOptions.expiresIn });
-            }
-            this._jwtInstance.sign(payload, this._clientOptions.secret, signOptions, (err, encoded) => {
-                if (err)
-                    return reject(err);
-                resolve(encoded);
-            });
-        });
-    }
-    async verify(token) {
-        if (!token && this._clientName === 'access')
-            token = this.scope.service.jwtExtract.fromAllWays();
-        if (!token)
-            return undefined;
-        return new Promise((resolve, reject) => {
-            this._jwtInstance.verify(token, this._clientOptions.secret, this._clientOptions.signOptions, (err, decoded) => {
-                if (err)
-                    return reject(err);
-                const payload = cast(decoded);
-                // 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);
-                // passed
-                resolve(payload[this.fieldData]);
-            });
-        });
-    }
-};
-ServiceJwtClient = __decorate([
-    Service()
-], ServiceJwtClient);
-export { ServiceJwtClient };

package/dist/service/jwtExtract.js

@@ -1,43 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { BeanBase } from 'vona';
-import { Service } from 'vona-module-a-web';
-import { parseAuthHeader } from "../lib/authHeader.js";
-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];
-    }
-    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;
-    }
-};
-ServiceJwtExtract = __decorate([
-    Service()
-], ServiceJwtExtract);
-export { ServiceJwtExtract };

package/dist/types/index.js

@@ -1 +0,0 @@
-export * from "./jwt.js";

package/dist/types/jwt.js

@@ -1 +0,0 @@
-export {};