vona-module-a-jwt 5.1.4 → 5.1.6

package/dist/config/config.d.ts

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

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

@@ -1 +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"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAE5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,wBAAgB,MAAM,CAAC,GAAG,EAAE,eAAe,aA2C1C"}

package/dist/index.js

@@ -2,7 +2,7 @@ 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 { catchError, isNil, checkErrorJwtExpired } from '@cabloy/utils';
 import jwt from 'jsonwebtoken';
 import { Api } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
@@ -74,7 +74,7 @@ let ServiceJwtClient = class ServiceJwtClient extends BeanBase {
     });
   }
   async verify(token, options) {
-    if (!token && this._clientName === 'access') token = this.scope.service.jwtExtract.fromAllWays();
+    if (isNil(token) && this._clientName === 'access') token = this.scope.service.jwtExtract.fromAllWays();
     const [res, error] = await catchError(() => {
       return this._verifyInner(token, options);
     });
@@ -177,14 +177,14 @@ let ServiceJwtExtract = class ServiceJwtExtract extends BeanBase {
     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);
-  }
+  // 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();
+    // if (!token) token = this.fromCookie();
     return token;
   }
 };
@@ -206,8 +206,9 @@ DtoJwtToken = __decorate([Dto(), BeanInfo({
   module: "a-jwt"
 })], DtoJwtToken);
 
-function config(_app, env) {
-  return {
+function config(app) {
+  const env = app.meta.env;
+  const configJwt = {
     field: {
       payload: {
         client: 'client',
@@ -218,8 +219,7 @@ function config(_app, env) {
         header: '',
         headerAuth: 'authorization',
         headerAuthScheme: 'bearer',
-        query: 'auth_token',
-        cookie: 'token'
+        query: 'auth_token'
       }
     },
     tempAuthToken: {
@@ -264,6 +264,7 @@ function config(_app, env) {
       }
     }
   };
+  return configJwt;
 }
 
 let ScopeModuleAJwt = class ScopeModuleAJwt extends BeanScopeBase {};
@@ -272,14 +273,12 @@ ScopeModuleAJwt = __decorate([Scope(), BeanInfo({
 })], ScopeModuleAJwt);
 /** scope: end */
 
-const ErrorMessageJwtExpired = 'jwt expired';
-
 // 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')) {
+function checkErrorJwtExpiredAndThrow(err, headers) {
+  if (checkErrorJwtExpired(err) && (headers['x-vona-jwt-authtoken'] === true || headers['x-vona-jwt-authtoken'] === 'true')) {
     throw err;
   }
 }
 
-export { BeanJwt, DtoJwtToken, ErrorMessageJwtExpired, ScopeModuleAJwt, ServiceJwtClient, ServiceJwtExtract, checkErrorJwtExpired, config, parseAuthHeader };
+export { BeanJwt, DtoJwtToken, ScopeModuleAJwt, ServiceJwtClient, ServiceJwtExtract, checkErrorJwtExpiredAndThrow, config, parseAuthHeader };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +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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"}
+{"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/checkErrorJwtExpired.ts"],"sourcesContent":[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","isNil","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","DtoJwtToken","Api","prototype","Dto","env","meta","issuer","APP_NAME","oauth","oauthstate","code","ScopeModuleAJwt","BeanScopeBase","Scope","checkErrorJwtExpiredAndThrow","checkErrorJwtExpired"],"mappings":"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"}

package/dist/lib/checkErrorJwtExpired.d.ts

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

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

@@ -1 +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"}
+{"version":3,"file":"checkErrorJwtExpired.d.ts","sourceRoot":"","sources":["../../src/lib/checkErrorJwtExpired.ts"],"names":[],"mappings":"AAGA,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,KAAK,GAAG,SAAS,EAAE,OAAO,EAAE,GAAG,QAIhF"}

package/dist/lib/index.d.ts

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

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

@@ -1 +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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC"}

package/dist/service/jwtExtract.d.ts

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

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

@@ -1 +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"}
+{"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;IAa7C,WAAW;CAOZ"}

package/dist/types/jwt.d.ts

@@ -38,7 +38,6 @@ export interface ConfigJwt {
             headerAuth: string;
             headerAuthScheme: string;
             query: string;
-            cookie: string;
         };
     };
     tempAuthToken: {

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

@@ -1 +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"}
+{"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;SAEf,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,6 +1,6 @@
 {
   "name": "vona-module-a-jwt",
-  "version": "5.1.4",
+  "version": "5.1.6",
   "description": "",
   "keywords": [
     "Vona Module"

package/src/config/config.ts

@@ -1,9 +1,10 @@
-import type { VonaApplication, VonaConfigEnv } from 'vona';
+import type { VonaApplication } from 'vona';
 
 import type { ConfigJwt } from '../types/jwt.ts';
 
-export function config(_app: VonaApplication, env: VonaConfigEnv) {
-  return {
+export function config(app: VonaApplication) {
+  const env = app.meta.env;
+  const configJwt: ConfigJwt = {
     field: {
       payload: {
         client: 'client',
@@ -15,7 +16,6 @@ export function config(_app: VonaApplication, env: VonaConfigEnv) {
         headerAuth: 'authorization',
         headerAuthScheme: 'bearer',
         query: 'auth_token',
-        cookie: 'token',
       },
     },
     tempAuthToken: {
@@ -43,5 +43,6 @@ export function config(_app: VonaApplication, env: VonaConfigEnv) {
         signOptions: { expiresIn: 3 * 60 },
       },
     },
-  } as ConfigJwt;
+  };
+  return configJwt;
 }

package/src/lib/checkErrorJwtExpired.ts

@@ -1,8 +1,8 @@
-import { ErrorMessageJwtExpired } from './const.ts';
+import { checkErrorJwtExpired } from '@cabloy/utils';
 
 // 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')) {
+export function checkErrorJwtExpiredAndThrow(err: Error | undefined, headers: any) {
+  if (checkErrorJwtExpired(err) && (headers['x-vona-jwt-authtoken'] === true || headers['x-vona-jwt-authtoken'] === 'true')) {
     throw err;
   }
 }

package/src/lib/index.ts

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

package/src/service/jwtClient.ts

@@ -1,4 +1,4 @@
-import { catchError } from '@cabloy/utils';
+import { catchError, isNil } from '@cabloy/utils';
 import jwt from 'jsonwebtoken';
 import { BeanBase, cast, deepExtend } from 'vona';
 import { Service } from 'vona-module-a-bean';
@@ -73,7 +73,7 @@ export class ServiceJwtClient extends BeanBase {
   }
 
   async verify(token?: string, options?: IJwtVerifyOptions): Promise<IPayloadData | undefined> {
-    if (!token && this._clientName === 'access') token = this.scope.service.jwtExtract.fromAllWays();
+    if (isNil(token) && this._clientName === 'access') token = this.scope.service.jwtExtract.fromAllWays();
     const [res, error] = await catchError(() => {
       return this._verifyInner(token, options);
     });

package/src/service/jwtExtract.ts

@@ -23,15 +23,15 @@ export class ServiceJwtExtract extends BeanBase {
     return auth.value;
   }
 
-  fromCookie() {
-    return this.ctx.cookies.get(this.scope.config.field.extract.cookie);
-  }
+  // 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();
+    // if (!token) token = this.fromCookie();
     return token;
   }
 }

package/src/types/jwt.ts

@@ -45,7 +45,7 @@ export interface ConfigJwt {
       headerAuth: string;
       headerAuthScheme: string;
       query: string;
-      cookie: string;
+      // cookie: string;
     };
   };
   tempAuthToken: {

package/dist/lib/const.d.ts

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

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

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

package/src/lib/const.ts

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