abler-api 0.1.38 → 0.1.40

package/dist/cjs/pp-util.js

@@ -84,7 +84,7 @@ class apiUtil$2 {
 
 
   static signatureVerified(req) {
-    return req.signatureVerified;
+    return req?.signatureVerified;
   } //#endregion
   //#region ===== API服务相关工具
 
@@ -987,7 +987,7 @@ class apiUtil$2 {
       // // 没有设置ip白名单的就不检查了
       // if (whiteList == "" || ipMatched(tokenData.clientIp, whiteList + ",127.0.0.1,1"))
 
-      if (apiUtil$2.signatureVerified()) return companyInfo;
+      if (apiUtil$2.signatureVerified(req)) return companyInfo;
       return apiUtil$2.verifyApiSignature(tokenData, req).then(x => {
         return companyInfo;
       }, e => {
@@ -1275,7 +1275,7 @@ class apiUtil$2 {
   static $isMobile(req, res, next) {
     req.isMobile = true;
 
-    if (!req.signatureVerified) {
+    if (!apiUtil$2.signatureVerified(req)) {
       let params = apiUtil$2.extractParams(req);
       moveProperty(params, req.headers, "access_token");
       moveProperty(params, req.headers, "timestamp");
@@ -1297,8 +1297,8 @@ class apiUtil$2 {
 
   static $checkApiKeyOld(req, res, next) {
     //检查post的信息或者url查询参数或者头信息
-    let tokenData = apiUtil$2.extractTokenData(req);
-    let params = apiUtil$2.extractParams(req);
+    const tokenData = apiUtil$2.extractTokenData(req);
+    const params = apiUtil$2.extractParams(req);
     apiUtil$2.createApiCallRec(tokenData, req);
     let errResponse = null;
 
@@ -1313,7 +1313,7 @@ class apiUtil$2 {
     if (errResponse != null) {
       apiUtil$2._saveApiCallRec(req.apiCallRec, errResponse);
 
-      apiUtil$2.sendOrRedirect(req, res, errResponse);
+      apiUtil$2.sendOrRedirect(req, params.redirectUrl || params.callbackUrl, errResponse);
     } else {
       apiUtil$2.checkApiCallValid(tokenData, req).then(companyInfo => {
         params.companyId = params.companyId || companyInfo.companyId;
@@ -1325,7 +1325,7 @@ class apiUtil$2 {
 
         apiUtil$2._saveApiCallRec(req.apiCallRec, errResponse);
 
-        apiUtil$2.sendOrRedirect(req, res, errResponse);
+        apiUtil$2.sendOrRedirect(req, params.redirectUrl || params.callbackUrl, errResponse);
       });
     }
   }
@@ -1364,7 +1364,8 @@ class apiUtil$2 {
       req.tokenData = p;
       return apiUtil$2.$checkApiKeyOld(req, res, next);
     }).catch(e => {
-      apiUtil$2.sendOrRedirect(req, res, apiUtil$2.spoApiFail(err$2.TOKEN_INVALID, req));
+      const params = apiUtil$2.extractParams(req);
+      apiUtil$2.sendOrRedirect(req, params.redirectUrl || params.callbackUrl, apiUtil$2.spoApiFail(err$2.TOKEN_INVALID, req));
     });
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abler-api",
-  "version": "0.1.38",
+  "version": "0.1.40",
   "description": "API服务相关工具",
   "main": "./dist/cjs/pp-util.js",
   "-module": "./dist/es/pp-util.js",