vona-module-a-jwt 5.0.30 → 5.1.1

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

@@ -107,3 +107,4 @@ declare module 'vona' {
     }
 }
 /** scope: end */
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/.metadata/index.ts"],"names":[],"mappings":"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"}

package/dist/.metadata/this.d.ts

@@ -1,2 +1,3 @@
 export declare const __ThisModule__ = "a-jwt";
 export { ScopeModuleAJwt as ScopeModule } from './index.ts';
+//# sourceMappingURL=this.d.ts.map

package/dist/.metadata/this.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"this.d.ts","sourceRoot":"","sources":["../../src/.metadata/this.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc,UAAU,CAAC;AACtC,OAAO,EAAE,eAAe,IAAI,WAAW,EAAE,MAAM,YAAY,CAAC"}

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

@@ -1,6 +1,6 @@
 import type { IAuthenticateStrategyState } from 'vona-module-a-auth';
-import type { IJwtClientRecord, IJwtSignOptions, IJwtToken, IPayloadData } from '../types/jwt.ts';
 import { BeanBase } from 'vona';
+import type { IJwtClientRecord, IJwtSignOptions, IJwtToken, IPayloadData } from '../types/jwt.ts';
 import { ServiceJwtClient } from '../service/jwtClient.ts';
 export declare class BeanJwt extends BeanBase {
     get(clientName?: keyof IJwtClientRecord): ServiceJwtClient;
@@ -11,3 +11,4 @@ export declare class BeanJwt extends BeanBase {
     createOauthCode(payloadData: IPayloadData, options?: IJwtSignOptions): Promise<string>;
     extractAuthTokenFromAllWays(): string | undefined;
 }
+//# sourceMappingURL=bean.jwt.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"bean.jwt.d.ts","sourceRoot":"","sources":["../../src/bean/bean.jwt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAGrE,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAGhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAElG,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,qBACa,OAAQ,SAAQ,QAAQ;IACnC,GAAG,CAAC,UAAU,CAAC,EAAE,MAAM,gBAAgB;IAIjC,MAAM,CAAC,WAAW,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC;IAgBhF,mBAAmB,CAAC,WAAW,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,eAAe;IAIxE,oBAAoB,CAAC,WAAW,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,eAAe;IAIzE,gBAAgB,CAAC,WAAW,EAAE,0BAA0B,EAAE,OAAO,CAAC,EAAE,eAAe;IAInF,eAAe,CAAC,WAAW,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,eAAe;IAI1E,2BAA2B;CAG5B"}

package/dist/config/config.d.ts

@@ -1,3 +1,4 @@
 import type { VonaApplication, VonaConfigEnv } from 'vona';
 import type { ConfigJwt } from '../types/jwt.ts';
 export declare function config(_app: VonaApplication, env: VonaConfigEnv): ConfigJwt;
+//# sourceMappingURL=config.d.ts.map

package/dist/config/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAE3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,wBAAgB,MAAM,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,EAAE,aAAa,GAyCzD,SAAS,CACf"}

package/dist/dto/jwtToken.d.ts

@@ -7,3 +7,4 @@ export declare class DtoJwtToken implements IJwtToken {
     refreshToken: string;
     expiresIn: number;
 }
+//# sourceMappingURL=jwtToken.d.ts.map

package/dist/dto/jwtToken.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jwtToken.d.ts","sourceRoot":"","sources":["../../src/dto/jwtToken.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAK9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,WAAW,mBAAoB,SAAQ,oBAAoB;CAAG;AAEpE,qBACa,WAAY,YAAW,SAAS;IAE3C,WAAW,EAAE,MAAM,CAAC;IAGpB,YAAY,EAAE,MAAM,CAAC;IAGrB,SAAS,EAAE,MAAM,CAAC;CACnB"}

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export * from './.metadata/index.ts';
 export * from './lib/index.ts';
 export * from './types/index.ts';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC"}

package/dist/index.js

@@ -169,8 +169,10 @@ let ServiceJwtExtract = class ServiceJwtExtract extends BeanBase {
   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];
+  fromAuthHeaderWithScheme(headerValue) {
+    if (!headerValue) {
+      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;
@@ -272,4 +274,12 @@ ScopeModuleAJwt = __decorate([Scope(), BeanInfo({
 
 const ErrorMessageJwtExpired = 'jwt expired';
 
-export { BeanJwt, DtoJwtToken, ErrorMessageJwtExpired, ScopeModuleAJwt, ServiceJwtClient, ServiceJwtExtract, config, parseAuthHeader };
+// throw error only when ErrorMessageJwtExpired
+function checkErrorJwtExpired(err, headers) {
+  if (err && err.message === ErrorMessageJwtExpired && (headers['x-vona-jwt-authtoken'] === true || headers['x-vona-jwt-authtoken'] === 'true')) {
+    throw err;
+  }
+}
+
+export { BeanJwt, DtoJwtToken, ErrorMessageJwtExpired, ScopeModuleAJwt, ServiceJwtClient, ServiceJwtExtract, checkErrorJwtExpired, config, parseAuthHeader };
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sources":["../src/service/jwtClient.ts","../src/bean/bean.jwt.ts","../src/lib/authHeader.ts","../src/service/jwtExtract.ts","../src/dto/jwtToken.ts","../src/config/config.ts","../src/.metadata/index.ts","../src/lib/const.ts","../src/lib/checkErrorJwtExpired.ts"],"sourcesContent":[null,null,null,null,null,null,null,null,null],"names":["ServiceJwtClient","BeanBase","constructor","args","_jwtInstance","_clientName","_clientOptions","instance","__init__","clientName","_createClient","configJwt","scope","config","configClient","clients","Error","secret","base","app","server","keys","deepExtend","jwt","fieldClient","field","payload","client","fieldPath","path","fieldData","data","sign","payloadData","options","res","error","catchError","_signInner","$loggerChild","debug","message","Promise","resolve","reject","signOptions","dev","Object","assign","expiresIn","refresh","temp","tempAuthToken","err","encoded","verify","token","service","jwtExtract","fromAllWays","_verifyInner","undefined","verifyOptions","decoded","cast","throw","_checkVerifyPath","pathTarget","pathReal","String","ctx","route","routePathRaw","Array","isArray","includes","__decorate","Service","__z_BeanInfo","module","BeanJwt","get","bean","_getBeanSelector","create","accessToken","refreshToken","access","Math","floor","ms","createTempAuthToken","createOauthAuthToken","createOauthState","createOauthCode","extractAuthTokenFromAllWays","Bean","re","parseAuthHeader","headerValue","matches","match","scheme","value","ServiceJwtExtract","fromHeader","extract","header","request","headers","fromQuery","query","fromAuthHeaderWithScheme","headerAuth","auth","toLocaleLowerCase","headerAuthScheme","fromCookie","cookies","cookie","DtoJwtToken","Api","prototype","Dto","_app","env","issuer","APP_NAME","oauth","oauthstate","code","ScopeModuleAJwt","BeanScopeBase","Scope","ErrorMessageJwtExpired","checkErrorJwtExpired"],"mappings":"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"}

package/dist/lib/authHeader.d.ts

@@ -2,3 +2,4 @@ export declare function parseAuthHeader(headerValue?: any): {
     scheme: string;
     value: string;
 } | null | undefined;
+//# sourceMappingURL=authHeader.d.ts.map

package/dist/lib/authHeader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"authHeader.d.ts","sourceRoot":"","sources":["../../src/lib/authHeader.ts"],"names":[],"mappings":"AAEA,wBAAgB,eAAe,CAAC,WAAW,CAAC,EAAE,GAAG;;;qBAIhD"}

package/dist/lib/checkErrorJwtExpired.d.ts

@@ -0,0 +1,2 @@
+export declare function checkErrorJwtExpired(err: Error | undefined, headers: any): void;
+//# sourceMappingURL=checkErrorJwtExpired.d.ts.map

package/dist/lib/checkErrorJwtExpired.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkErrorJwtExpired.d.ts","sourceRoot":"","sources":["../../src/lib/checkErrorJwtExpired.ts"],"names":[],"mappings":"AAGA,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,KAAK,GAAG,SAAS,EAAE,OAAO,EAAE,GAAG,QAIxE"}

package/dist/lib/const.d.ts

@@ -0,0 +1,2 @@
+export declare const ErrorMessageJwtExpired = "jwt expired";
+//# sourceMappingURL=const.d.ts.map

package/dist/lib/const.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"const.d.ts","sourceRoot":"","sources":["../../src/lib/const.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,sBAAsB,gBAAgB,CAAC"}

package/dist/lib/index.d.ts

@@ -1 +1,4 @@
 export * from './authHeader.ts';
+export * from './checkErrorJwtExpired.ts';
+export * from './const.ts';
+//# sourceMappingURL=index.d.ts.map

package/dist/lib/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,YAAY,CAAC"}

package/dist/service/jwtClient.d.ts

@@ -1,6 +1,6 @@
-import type { IJwtClientRecord, IJwtSignOptions, IJwtVerifyOptions, IPayloadData } from '../types/jwt.ts';
 import jwt from 'jsonwebtoken';
 import { BeanBase } from 'vona';
+import type { IJwtClientRecord, IJwtSignOptions, IJwtVerifyOptions, IPayloadData } from '../types/jwt.ts';
 export declare class ServiceJwtClient extends BeanBase {
     private _jwtInstance;
     private _clientName;
@@ -17,3 +17,4 @@ export declare class ServiceJwtClient extends BeanBase {
     private _verifyInner;
     _checkVerifyPath(pathTarget: string | string[] | undefined, pathReal: string | undefined): boolean;
 }
+//# sourceMappingURL=jwtClient.d.ts.map

package/dist/service/jwtClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jwtClient.d.ts","sourceRoot":"","sources":["../../src/service/jwtClient.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,cAAc,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAoB,MAAM,MAAM,CAAC;AAGlD,OAAO,KAAK,EAAqB,gBAAgB,EAAe,eAAe,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE1I,qBACa,gBAAiB,SAAQ,QAAQ;IAC5C,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,WAAW,CAAyB;IAC5C,OAAO,CAAC,cAAc,CAAoB;IAE1C,IAAI,QAAQ,IAAI,OAAO,GAAG,CAEzB;IAED,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,gBAAgB;IAItD,OAAO,CAAC,aAAa;IAWrB,OAAO,KAAK,WAAW,GAEtB;IAED,OAAO,KAAK,SAAS,GAEpB;IAED,OAAO,KAAK,SAAS,GAEpB;IAEK,IAAI,CAAC,WAAW,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC;YASnE,UAAU;IAqBlB,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;YAU9E,YAAY;IAkB1B,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS;CAMzF"}

package/dist/service/jwtExtract.d.ts

@@ -2,7 +2,8 @@ import { BeanBase } from 'vona';
 export declare class ServiceJwtExtract extends BeanBase {
     fromHeader(): string | undefined;
     fromQuery(): string;
-    fromAuthHeaderWithScheme(): string | undefined;
+    fromAuthHeaderWithScheme(headerValue?: string): string | undefined;
     fromCookie(): string | undefined;
     fromAllWays(): string | undefined;
 }
+//# sourceMappingURL=jwtExtract.d.ts.map

package/dist/service/jwtExtract.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jwtExtract.d.ts","sourceRoot":"","sources":["../../src/service/jwtExtract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAKhC,qBACa,iBAAkB,SAAQ,QAAQ;IAC7C,UAAU,IAAI,MAAM,GAAG,SAAS;IAKhC,SAAS;IAIT,wBAAwB,CAAC,WAAW,CAAC,EAAE,MAAM;IAS7C,UAAU;IAIV,WAAW;CAOZ"}

package/dist/types/index.d.ts

@@ -1 +1,2 @@
 export * from './jwt.ts';
+//# sourceMappingURL=index.d.ts.map

package/dist/types/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC"}

package/dist/types/jwt.d.ts

@@ -1,7 +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;
     refreshToken: string;
@@ -59,3 +58,4 @@ declare module 'vona' {
         jwt: never;
     }
 }
+//# sourceMappingURL=jwt.d.ts.map

package/dist/types/jwt.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jwt.d.ts","sourceRoot":"","sources":["../../src/types/jwt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;AAEtC,OAAO,MAAM,CAAC;AAEd,MAAM,WAAW,SAAS;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,KAAK,CAAC;IACd,OAAO,EAAE,KAAK,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,KAAK,CAAC;IAClB,IAAI,EAAE,KAAK,CAAC;CACb;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACzB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE;QACL,OAAO,EAAE;YACP,MAAM,EAAE,MAAM,CAAC;YACf,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,MAAM,CAAC;SACd,CAAC;QACF,OAAO,EAAE;YACP,MAAM,EAAE,MAAM,CAAC;YACf,UAAU,EAAE,MAAM,CAAC;YACnB,gBAAgB,EAAE,MAAM,CAAC;YACzB,KAAK,EAAE,MAAM,CAAC;YACd,MAAM,EAAE,MAAM,CAAC;SAChB,CAAC;KACH,CAAC;IACF,aAAa,EAAE;QACb,WAAW,EAAE;YAAE,SAAS,EAAE,WAAW,GAAG,MAAM,CAAA;SAAE,CAAC;KAClD,CAAC;IACF,IAAI,EAAE,iBAAiB,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,YAAY;CAAG;AAEhC,MAAM,WAAW,WAAW;CAAG;AAE/B,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAiB,kBAAkB;QACjC,GAAG,EAAE,KAAK,CAAC;KACZ;CACF"}

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "vona-module-a-jwt",
-  "type": "module",
-  "version": "5.0.30",
-  "title": "a-jwt",
-  "vonaModule": {
-    "dependencies": {}
-  },
+  "version": "5.1.1",
   "description": "",
-  "author": "",
   "keywords": [
     "Vona Module"
   ],
+  "author": "",
+  "files": [
+    "assets",
+    "dist",
+    "src"
+  ],
+  "type": "module",
   "exports": {
     ".": {
       "types": [
@@ -21,10 +22,13 @@
     },
     "./package.json": "./package.json"
   },
-  "files": [
-    "assets",
-    "dist"
-  ],
+  "scripts": {
+    "clean": "rimraf dist tsconfig.build.tsbuildinfo",
+    "tsc:publish": "npm run clean && vona :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
+    "prepublishOnly": "npm run tsc:publish",
+    "prepack": "clean-package",
+    "postpack": "clean-package restore && npm run clean"
+  },
   "dependencies": {
     "@types/jsonwebtoken": "^9.0.10",
     "@types/ms": "^2.1.0",
@@ -35,8 +39,9 @@
     "clean-package": "^2.2.0",
     "rimraf": "^6.0.1"
   },
-  "scripts": {
-    "clean": "rimraf dist tsconfig.build.tsbuildinfo",
-    "tsc:publish": "npm run clean && vona :bin:buildModule && tsc -p tsconfig.build.json"
-  }
-}
+  "title": "a-jwt",
+  "vonaModule": {
+    "dependencies": {}
+  },
+  "gitHead": "991189da4443b789fcf77872990b901ccf43bccb"
+}

package/src/.metadata/index.ts

@@ -0,0 +1,146 @@
+// eslint-disable
+import type { TypeSymbolKeyFieldsMore } from 'vona-module-a-orm';
+import type { TypeEntityOptionsFields } from 'vona-module-a-openapi';
+/** bean: begin */
+export * from '../bean/bean.jwt.ts';
+
+import 'vona';
+declare module 'vona' {
+  
+  
+}
+declare module 'vona-module-a-jwt' {
+  
+        export interface BeanJwt {
+          /** @internal */
+          get scope(): ScopeModuleAJwt;
+        } 
+}
+/** bean: end */
+/** bean: begin */
+import type { BeanJwt } from '../bean/bean.jwt.ts';
+import 'vona';  
+declare module 'vona' {
+  export interface IBeanRecordGlobal {
+    'jwt': BeanJwt;
+  }
+}
+/** bean: end */
+/** service: begin */
+export * from '../service/jwtClient.ts';
+export * from '../service/jwtExtract.ts';
+
+import 'vona-module-a-bean';
+declare module 'vona-module-a-bean' {
+  
+    export interface IServiceRecord {
+      'a-jwt:jwtClient': never;
+'a-jwt:jwtExtract': never;
+    }
+
+  
+}
+declare module 'vona-module-a-jwt' {
+  
+        export interface ServiceJwtClient {
+          /** @internal */
+          get scope(): ScopeModuleAJwt;
+        }
+
+          export interface ServiceJwtClient {
+            get $beanFullName(): 'a-jwt.service.jwtClient';
+            get $onionName(): 'a-jwt:jwtClient';
+            
+          }
+
+        export interface ServiceJwtExtract {
+          /** @internal */
+          get scope(): ScopeModuleAJwt;
+        }
+
+          export interface ServiceJwtExtract {
+            get $beanFullName(): 'a-jwt.service.jwtExtract';
+            get $onionName(): 'a-jwt:jwtExtract';
+            
+          } 
+}
+/** 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;
+}
+/** service: end */
+/** service: begin */
+
+import 'vona';
+declare module 'vona' {
+  export interface IBeanRecordGeneral {
+    'a-jwt.service.jwtClient': ServiceJwtClient;
+'a-jwt.service.jwtExtract': ServiceJwtExtract;
+  }
+}
+/** service: end */
+/** dto: begin */
+export * from '../dto/jwtToken.ts';
+import type { IDtoOptionsJwtToken } from '../dto/jwtToken.ts';
+import 'vona-module-a-web';
+declare module 'vona-module-a-web' {
+  
+    export 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' {
+  
+    export interface IDtoOptionsJwtToken {
+      fields?: TypeEntityOptionsFields<DtoJwtToken, IDtoOptionsJwtToken[TypeSymbolKeyFieldsMore]>;
+    }
+}
+/** 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';
+import { Scope } from 'vona-module-a-bean';
+
+@Scope()
+export class ScopeModuleAJwt extends BeanScopeBase {}
+
+export interface ScopeModuleAJwt {
+  util: BeanScopeUtil;
+config: TypeModuleConfig<typeof config>;
+service: IModuleService;
+}
+
+import 'vona';
+declare module 'vona' {
+  export interface IBeanScopeRecord {
+    'a-jwt': ScopeModuleAJwt;
+  }
+
+  export interface IBeanScopeContainer {
+    jwt: ScopeModuleAJwt;
+  }
+  
+  export interface IBeanScopeConfig {
+    'a-jwt': ReturnType<typeof config>;
+  }
+
+  
+
+  
+}
+/** scope: end */

package/src/.metadata/this.ts

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

package/src/bean/bean.jwt.ts

@@ -0,0 +1,52 @@
+import type { IAuthenticateStrategyState } from 'vona-module-a-auth';
+
+import ms from 'ms';
+import { BeanBase } from 'vona';
+import { Bean } from 'vona-module-a-bean';
+
+import type { IJwtClientRecord, IJwtSignOptions, IJwtToken, IPayloadData } from '../types/jwt.ts';
+
+import { ServiceJwtClient } from '../service/jwtClient.ts';
+
+@Bean()
+export class BeanJwt extends BeanBase {
+  get(clientName?: keyof IJwtClientRecord) {
+    return this.app.bean._getBeanSelector(ServiceJwtClient, clientName);
+  }
+
+  async create(payloadData: IPayloadData, options?: IJwtSignOptions): Promise<IJwtToken> {
+    // 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 = Math.floor(ms(expiresIn) / 1000);
+    // ok
+    return {
+      accessToken,
+      refreshToken,
+      expiresIn,
+    };
+  }
+
+  async createTempAuthToken(payloadData: IPayloadData, options?: IJwtSignOptions) {
+    return await this.get('access').sign(payloadData, Object.assign({}, options, { temp: true }));
+  }
+
+  async createOauthAuthToken(payloadData: IPayloadData, options?: IJwtSignOptions) {
+    return await this.get('oauth').sign(payloadData, options);
+  }
+
+  async createOauthState(payloadData: IAuthenticateStrategyState, options?: IJwtSignOptions) {
+    return await this.get('oauthstate').sign(payloadData as IPayloadData, options);
+  }
+
+  async createOauthCode(payloadData: IPayloadData, options?: IJwtSignOptions) {
+    return await this.get('code').sign(payloadData, options);
+  }
+
+  extractAuthTokenFromAllWays() {
+    return this.scope.service.jwtExtract.fromAllWays();
+  }
+}

package/src/config/config.ts

@@ -0,0 +1,47 @@
+import type { VonaApplication, VonaConfigEnv } from 'vona';
+
+import type { ConfigJwt } from '../types/jwt.ts';
+
+export function config(_app: VonaApplication, env: VonaConfigEnv) {
+  return {
+    field: {
+      payload: {
+        client: 'client',
+        path: 'path',
+        data: 'data',
+      },
+      extract: {
+        header: '',
+        headerAuth: 'authorization',
+        headerAuthScheme: 'bearer',
+        query: 'auth_token',
+        cookie: 'token',
+      },
+    },
+    tempAuthToken: {
+      signOptions: { expiresIn: 10 * 60 },
+    },
+    base: {
+      secret: undefined,
+      signOptions: { issuer: env.APP_NAME },
+      verifyOptions: { issuer: 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 },
+      },
+    },
+  } as ConfigJwt;
+}

package/src/dto/jwtToken.ts

@@ -0,0 +1,20 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Api } from 'vona-module-a-openapiutils';
+import { Dto } from 'vona-module-a-web';
+
+import type { IJwtToken } from '../types/jwt.ts';
+
+export interface IDtoOptionsJwtToken extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsJwtToken>()
+export class DtoJwtToken implements IJwtToken {
+  @Api.field()
+  accessToken: string;
+
+  @Api.field()
+  refreshToken: string;
+
+  @Api.field()
+  expiresIn: number;
+}

package/src/index.ts

@@ -0,0 +1,3 @@
+export * from './.metadata/index.ts';
+export * from './lib/index.ts';
+export * from './types/index.ts';

package/src/lib/authHeader.ts

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

package/src/lib/checkErrorJwtExpired.ts

@@ -0,0 +1,8 @@
+import { ErrorMessageJwtExpired } from './const.ts';
+
+// throw error only when ErrorMessageJwtExpired
+export function checkErrorJwtExpired(err: Error | undefined, headers: any) {
+  if (err && err.message === ErrorMessageJwtExpired && (headers['x-vona-jwt-authtoken'] === true || headers['x-vona-jwt-authtoken'] === 'true')) {
+    throw err;
+  }
+}

package/src/lib/const.ts

@@ -0,0 +1 @@
+export const ErrorMessageJwtExpired = 'jwt expired';

package/src/lib/index.ts

@@ -0,0 +1,3 @@
+export * from './authHeader.ts';
+export * from './checkErrorJwtExpired.ts';
+export * from './const.ts';

package/src/service/jwtClient.ts

@@ -0,0 +1,109 @@
+import { catchError } from '@cabloy/utils';
+import jwt from 'jsonwebtoken';
+import { BeanBase, cast, deepExtend } from 'vona';
+import { Service } from 'vona-module-a-bean';
+
+import type { IJwtClientOptions, IJwtClientRecord, IJwtPayload, IJwtSignOptions, IJwtVerifyOptions, IPayloadData } from '../types/jwt.ts';
+
+@Service()
+export class ServiceJwtClient extends BeanBase {
+  private _jwtInstance: typeof jwt;
+  private _clientName: keyof IJwtClientRecord;
+  private _clientOptions: IJwtClientOptions;
+
+  get instance(): typeof jwt {
+    return this._jwtInstance;
+  }
+
+  protected __init__(clientName?: keyof IJwtClientRecord) {
+    this._createClient(clientName);
+  }
+
+  private _createClient(clientName?: keyof IJwtClientRecord) {
+    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.base.secret ?? this.app.config.server.keys[0];
+    this._clientOptions = deepExtend({}, configJwt.base, { secret }, configClient);
+    this._clientName = clientName;
+    this._jwtInstance = jwt;
+  }
+
+  private get fieldClient() {
+    return this.scope.config.field.payload.client;
+  }
+
+  private get fieldPath() {
+    return this.scope.config.field.payload.path;
+  }
+
+  private get fieldData() {
+    return this.scope.config.field.payload.data;
+  }
+
+  async sign(payloadData: IPayloadData, options?: IJwtSignOptions): Promise<string> {
+    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;
+  }
+
+  private async _signInner(payloadData: IPayloadData, options?: IJwtSignOptions): Promise<string> {
+    return new Promise((resolve, reject) => {
+      const payload: IJwtPayload = {
+        [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.tempAuthToken.signOptions.expiresIn });
+      }
+      this._jwtInstance.sign(payload, this._clientOptions.secret!, signOptions, (err, encoded) => {
+        if (err) return reject(err);
+        resolve(encoded!);
+      });
+    });
+  }
+
+  async verify(token?: string, options?: IJwtVerifyOptions): Promise<IPayloadData | undefined> {
+    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;
+  }
+
+  private async _verifyInner(token?: string, options?: IJwtVerifyOptions): Promise<IPayloadData | undefined> {
+    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);
+        }
+        const payload = cast<IJwtPayload>(decoded);
+        // check field client
+        if (payload[this.fieldClient] !== this._clientName) return this.app.throw(401);
+        // check field path
+        if (!this._checkVerifyPath(payload[this.fieldPath], options?.path)) return this.app.throw(401);
+        // passed
+        resolve(payload[this.fieldData]);
+      });
+    });
+  }
+
+  _checkVerifyPath(pathTarget: string | string[] | undefined, pathReal: string | undefined) {
+    if (!pathTarget) return true;
+    const path = pathReal ?? String(this.ctx.route.routePathRaw);
+    if (Array.isArray(pathTarget) && !pathTarget.includes(path)) return false;
+    return pathTarget === path;
+  }
+}

package/src/service/jwtExtract.ts

@@ -0,0 +1,37 @@
+import { BeanBase } from 'vona';
+import { Service } from 'vona-module-a-bean';
+
+import { parseAuthHeader } from '../lib/authHeader.ts';
+
+@Service()
+export class ServiceJwtExtract extends BeanBase {
+  fromHeader(): string | undefined {
+    if (!this.scope.config.field.extract.header) return;
+    return this.ctx.request.headers[this.scope.config.field.extract.header] as string | undefined;
+  }
+
+  fromQuery() {
+    return this.ctx.request.query[this.scope.config.field.extract.query];
+  }
+
+  fromAuthHeaderWithScheme(headerValue?: string) {
+    if (!headerValue) {
+      headerValue = this.ctx.request.headers[this.scope.config.field.extract.headerAuth] as string | undefined;
+    }
+    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: string | undefined = this.fromQuery();
+    if (!token) token = this.fromAuthHeaderWithScheme();
+    if (!token) token = this.fromHeader();
+    if (!token) token = this.fromCookie();
+    return token;
+  }
+}

package/src/types/index.ts

@@ -0,0 +1 @@
+export * from './jwt.ts';

package/src/types/jwt.ts

@@ -0,0 +1,66 @@
+import type { SignOptions, VerifyOptions } from 'jsonwebtoken';
+import type { StringValue } from 'ms';
+
+import 'vona';
+
+export interface IJwtToken {
+  accessToken: string;
+  refreshToken: string;
+  expiresIn: number;
+}
+
+export interface IJwtClientRecord {
+  access: never;
+  refresh: never;
+  oauth: never;
+  oauthstate: never;
+  code: never;
+}
+
+export interface IJwtSignOptions {
+  path?: string | string[];
+  dev?: boolean;
+  temp?: boolean;
+}
+
+export interface IJwtVerifyOptions {
+  path?: string;
+}
+
+export interface IJwtClientOptions {
+  secret?: string;
+  signOptions: SignOptions;
+  verifyOptions?: VerifyOptions;
+}
+
+export interface ConfigJwt {
+  field: {
+    payload: {
+      client: string;
+      path: string;
+      data: string;
+    };
+    extract: {
+      header: string;
+      headerAuth: string;
+      headerAuthScheme: string;
+      query: string;
+      cookie: string;
+    };
+  };
+  tempAuthToken: {
+    signOptions: { expiresIn: StringValue | number };
+  };
+  base: IJwtClientOptions;
+  clients: Record<keyof IJwtClientRecord, IJwtClientOptions>;
+}
+
+export interface IPayloadData {}
+
+export interface IJwtPayload {}
+
+declare module 'vona' {
+  export interface ILoggerChildRecord {
+    jwt: never;
+  }
+}