vona-module-a-jwt 5.0.22 → 5.0.24

package/dist/index.js

@@ -26,8 +26,8 @@ let ServiceJwtClient = (_dec$4 = Service(), _dec2$4 = BeanInfo({
     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, {
+    const secret = configJwt.base.secret ?? this.app.config.server.keys[0];
+    this._clientOptions = deepExtend({}, configJwt.base, {
       secret
     }, configClient);
     this._clientName = clientName;
@@ -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
@@ -104,7 +104,7 @@ let BeanJwt = (_dec$3 = Bean(), _dec2$3 = BeanInfo({
     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);
+    if (typeof expiresIn === 'string') expiresIn = Math.floor(ms(expiresIn) / 1000);
     // ok
     return {
       accessToken,
@@ -226,15 +226,18 @@ function config(app) {
         cookie: 'token'
       }
     },
-    tempToken: {
+    tempAuthToken: {
       signOptions: {
         expiresIn: 10 * 60
       }
     },
-    default: {
+    base: {
       secret: undefined,
       signOptions: {
         issuer: app.meta.env.APP_NAME
+      },
+      verifyOptions: {
+        issuer: app.meta.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,12 +41,12 @@ export interface ConfigJwt {
             cookie: string;
         };
     };
-    tempToken: {
+    tempAuthToken: {
         signOptions: {
-            expiresIn: number;
+            expiresIn: StringValue | number;
         };
     };
-    default: IJwtClientOptions;
+    base: IJwtClientOptions;
     clients: Record<keyof IJwtClientRecord, IJwtClientOptions>;
 }
 export interface IPayloadData {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-jwt",
   "type": "module",
-  "version": "5.0.22",
+  "version": "5.0.24",
   "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"
   },