vona-module-a-jwt 5.0.13 → 5.0.15

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

@@ -1,63 +1,28 @@
-import type { BeanScopeUtil, TypeModuleConfig } from 'vona';
 import type { TypeEntityOptionsFields } from 'vona-module-a-openapi';
-/** bean: end */
-/** bean: begin */
-import type { BeanJwt } from '../bean/bean.jwt.ts';
-import type { config } from '../config/config.ts';
-import type { IDtoOptionsJwtToken } from '../dto/jwtToken.ts';
-/** dto: end */
-/** dto: begin */
-import type { DtoJwtToken } from '../dto/jwtToken.ts';
-/** service: end */
-/** service: begin */
-import type { ServiceJwtClient } from '../service/jwtClient.ts';
-import type { ServiceJwtExtract } from '../service/jwtExtract.ts';
-/** config: end */
-/** scope: begin */
-import { BeanScopeBase } from 'vona';
-import 'vona';
-/** service: end */
-/** service: begin */
-import 'vona';
-import 'vona';
-import 'vona';
-import 'vona';
-import 'vona';
 /** bean: begin */
 export * from '../bean/bean.jwt.ts';
+import 'vona';
 declare module 'vona' {
 }
 declare module 'vona-module-a-jwt' {
     interface BeanJwt {
     }
 }
+/** bean: end */
+/** bean: begin */
+import type { BeanJwt } from '../bean/bean.jwt.ts';
+import 'vona';
 declare module 'vona' {
     interface IBeanRecordGlobal {
-        jwt: BeanJwt;
-    }
-}
-/** service: end */
-/** config: begin */
-export * from '../config/config.ts';
-declare module 'vona-module-a-web' {
-    interface IDtoRecord {
-        'a-jwt:jwtToken': Omit<IDtoOptionsJwtToken, '_fieldsMore_'>;
-    }
-}
-declare module 'vona-module-a-jwt' {
-}
-declare module 'vona-module-a-jwt' {
-    interface IDtoOptionsJwtToken {
-        fields?: TypeEntityOptionsFields<DtoJwtToken, IDtoOptionsJwtToken['_fieldsMore_']>;
+        'jwt': BeanJwt;
     }
 }
 /** bean: end */
-/** dto: begin */
-export * from '../dto/jwtToken.ts';
-/** dto: end */
 /** service: begin */
 export * from '../service/jwtClient.ts';
-declare module 'vona-module-a-web' {
+export * from '../service/jwtExtract.ts';
+import 'vona';
+declare module 'vona-module-a-bean' {
     interface IServiceRecord {
         'a-jwt:jwtClient': never;
         'a-jwt:jwtExtract': never;
@@ -69,17 +34,50 @@ declare module 'vona-module-a-jwt' {
     interface ServiceJwtExtract {
     }
 }
+/** service: end */
+/** service: begin */
+import type { ServiceJwtClient } from '../service/jwtClient.ts';
+import type { ServiceJwtExtract } from '../service/jwtExtract.ts';
 export interface IModuleService {
-    jwtClient: ServiceJwtClient;
-    jwtExtract: ServiceJwtExtract;
+    'jwtClient': ServiceJwtClient;
+    'jwtExtract': ServiceJwtExtract;
 }
+/** service: end */
+/** service: begin */
+import 'vona';
 declare module 'vona' {
     interface IBeanRecordGeneral {
         'a-jwt.service.jwtClient': ServiceJwtClient;
         'a-jwt.service.jwtExtract': ServiceJwtExtract;
     }
 }
-export * from '../service/jwtExtract.ts';
+/** 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': 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 */
+/** config: begin */
+export * from '../config/config.ts';
+import type { config } from '../config/config.ts';
+/** config: end */
+/** scope: begin */
+import { BeanScopeBase, type BeanScopeUtil, type TypeModuleConfig } from 'vona';
 export declare class ScopeModuleAJwt extends BeanScopeBase {
 }
 export interface ScopeModuleAJwt {
@@ -87,6 +85,7 @@ export interface ScopeModuleAJwt {
     config: TypeModuleConfig<typeof config>;
     service: IModuleService;
 }
+import 'vona';
 declare module 'vona' {
     interface IBeanScopeRecord {
         'a-jwt': ScopeModuleAJwt;

package/dist/index.js

@@ -1,9 +1,9 @@
 import { BeanInfo, BeanBase, deepExtend, cast, BeanScopeBase } from 'vona';
-import { Bean, Scope } from 'vona-module-a-bean';
 import ms from 'ms';
+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({
@@ -122,6 +122,88 @@ 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) {
+    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({
+  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 {
+  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$1) || _class$1);
+
 function config(app) {
   return {
     field: {
@@ -179,88 +261,6 @@ function config(app) {
   };
 }
 
-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"

package/package.json

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