gc_rsa 1.3.4 → 1.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gc_rsa",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "main": "src/index.js",
   "license": "MIT",
   "scripts": {

package/src/lib/obj.js

@@ -1,4 +1,5 @@
 import { mapKeys, isEmpty, includes } from "lodash-es";
+import { stringify } from "qs"
 
 export const concat = obj => {
   let str = "";
@@ -18,5 +19,11 @@ export const concatURL = (pathname, query) => {
   return isEmpty(query)
     ? pathname
     : (includes(pathname, "?") ? pathname : pathname + "?") +
-        query.substring(1);
+    query.substring(1);
 };
+
+export const buildUrl = (pathname, params) => {
+  return isEmpty(params)
+    ? pathname
+    : `${pathname}?${stringify(params)}`;
+}

package/src/lib/signature.js

@@ -1,17 +1,20 @@
 // import stringify from "qs/lib/stringify";
-import { concat, concatURL } from "./obj";
+import { concat, concatURL, buildUrl } from "./obj";
 import parse from "qs/lib/parse";
-import { isObject, isString, isEmpty, now, random } from "lodash-es";
+import { isObject, isString, isEmpty, now, random, get } from "lodash-es";
 import { parse as urlParseLib } from "url";
 import crypto from "./crypto";
 import sort from "./sort";
 import transformHeaders from "./transformHeaders";
 
 const FormHeader = "application/x-www-form-urlencoded";
-const signature = (request, { appkey, appsecret, engineType }) => {
+const signature = (request, { appkey, appsecret, originQuery }) => {
   try {
     if (appkey && appsecret) {
-      const { method, headers, url } = request;
+      const { method, url: originUrl } = request;
+      let url = originQuery ? buildUrl(originUrl, originQuery) : originUrl
+      let headers = get(request, "headers") || get(request, "header")
+
       const { Accept } = headers;
       const urlParsed = urlParseLib(url, true),
         queryObject = urlParsed.query;
@@ -26,20 +29,15 @@ const signature = (request, { appkey, appsecret, engineType }) => {
       if (!headers["Accept"]) {
         headers["Accept"] = "*/*";
       }
-      //如果不是Form提交 对content签名
+      // 只有当 Body 非 Form 表单时才计算 MD5
       if (request.body && headers["Content-Type"].indexOf(FormHeader) === -1) {
         contentMD5 = crypto.md5Content(request.body);
         headers["Content-MD5"] = contentMD5;
       } else {
-        //如果是Form表单提交
         let formObject = request.body;
-        let obj;
-        if (isObject(formObject)) {
-          obj = sort(formObject);
-        }
+
         if (isString(formObject)) {
           const obj = parse(formObject);
-          console.log("objobj", obj);
           if (isEmpty(query)) {
             query = obj;
           } else {
@@ -55,11 +53,9 @@ const signature = (request, { appkey, appsecret, engineType }) => {
       headers["X-Gw-Key"] = appkey;
       headers["X-Gw-Timestamp"] = now();
       headers["X-Gw-Nonce"] = random(1000000000000, 9999999999999);
-      const stringToSign = `${method}\n${
-        Accept ? Accept : "*/*"
-      }\n${contentMD5}\n${ContentType}\n\n${
-        transformHeaders(headers).transformHeader
-      }${decodeURIComponent(urlPath)}`;
+      const stringToSign = `${method}\n${Accept ? Accept : "*/*"
+        }\n${contentMD5}\n${ContentType}\n\n${transformHeaders(headers).transformHeader
+        }${decodeURIComponent(urlPath)}`;
       console.log("==============", urlPath, "======================");
       console.log(stringToSign);
       console.log("==============", urlPath, "======================");