vona-module-a-jwt 5.0.23 → 5.0.25

package/dist/config/config.d.ts

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

package/dist/index.js

@@ -2,7 +2,7 @@ import { BeanInfo, BeanBase, deepExtend, cast, BeanScopeBase } from 'vona';
 import ms from 'ms';
 import { Service, Bean, Scope } from 'vona-module-a-bean';
 import jwt from 'jsonwebtoken';
-import { Api } from 'vona-module-a-openapi';
+import { Api } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 
 var _dec$4, _dec2$4, _class$4;
@@ -57,7 +57,7 @@ let ServiceJwtClient = (_dec$4 = Service(), _dec2$4 = BeanInfo({
       }
       if (options?.temp) {
         signOptions = Object.assign({}, signOptions, {
-          expiresIn: this.scope.config.tempToken.signOptions.expiresIn
+          expiresIn: this.scope.config.tempAuthToken.signOptions.expiresIn
         });
       }
       this._jwtInstance.sign(payload, this._clientOptions.secret, signOptions, (err, encoded) => {
@@ -70,7 +70,7 @@ let ServiceJwtClient = (_dec$4 = Service(), _dec2$4 = BeanInfo({
     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) => {
+      this._jwtInstance.verify(token, this._clientOptions.secret, this._clientOptions.verifyOptions, (err, decoded) => {
         if (err) return reject(err);
         const payload = cast(decoded);
         // check field client
@@ -210,7 +210,7 @@ let DtoJwtToken = (_dec$1 = Dto(), _dec2$1 = BeanInfo({
   initializer: null
 }), _class2)) || _class$1) || _class$1);
 
-function config(app) {
+function config(_app, env) {
   return {
     field: {
       payload: {
@@ -226,7 +226,7 @@ function config(app) {
         cookie: 'token'
       }
     },
-    tempToken: {
+    tempAuthToken: {
       signOptions: {
         expiresIn: 10 * 60
       }
@@ -234,7 +234,10 @@ function config(app) {
     base: {
       secret: undefined,
       signOptions: {
-        issuer: app.meta.env.APP_NAME
+        issuer: env.APP_NAME
+      },
+      verifyOptions: {
+        issuer: env.APP_NAME
       }
     },
     clients: {

package/dist/types/jwt.d.ts

@@ -1,4 +1,5 @@
-import type { SignOptions } from 'jsonwebtoken';
+import type { SignOptions, VerifyOptions } from 'jsonwebtoken';
+import type { StringValue } from 'ms';
 export declare const ErrorMessageJwtExpired = "jwt expired";
 export interface IJwtToken {
     accessToken: string;
@@ -23,6 +24,7 @@ export interface IJwtVerifyOptions {
 export interface IJwtClientOptions {
     secret?: string;
     signOptions: SignOptions;
+    verifyOptions?: VerifyOptions;
 }
 export interface ConfigJwt {
     field: {
@@ -39,9 +41,9 @@ export interface ConfigJwt {
             cookie: string;
         };
     };
-    tempToken: {
+    tempAuthToken: {
         signOptions: {
-            expiresIn: number;
+            expiresIn: StringValue | number;
         };
     };
     base: IJwtClientOptions;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-jwt",
   "type": "module",
-  "version": "5.0.23",
+  "version": "5.0.25",
   "title": "a-jwt",
   "vonaModule": {
     "dependencies": {}
@@ -26,7 +26,8 @@
     "dist"
   ],
   "dependencies": {
-    "@types/jsonwebtoken": "9.0.8",
+    "@types/jsonwebtoken": "^9.0.10",
+    "@types/ms": "^2.1.0",
     "jsonwebtoken": "^9.0.2",
     "ms": "^2.1.3"
   },