add generate access token of Qiniu type

Author: jemygraw

examples/atlab_check_qiniu_auth.js

@@ -0,0 +1,20 @@
+const qiniu = require("../index.js");
+const proc = require("process");
+
+var accessKey = proc.env.QINIU_ACCESS_KEY;
+var secretKey = proc.env.QINIU_SECRET_KEY;
+
+var mac = new qiniu.auth.digest.Mac(accessKey, secretKey);
+var reqURL = "http://serve.atlab.ai/v1/eval/facex-detect";
+var contentType = 'application/json';
+var reqBody = '{"data":{"uri":"https://ors35x6a7.qnssl.com/atshow-face-detection-20170703/1.png"}}';
+var accessToken = qiniu.util.generateAccessTokenV2(mac, reqURL, 'POST', contentType, reqBody);
+var headers = {
+    'Authorization': accessToken,
+    'Content-Type': contentType,
+}
+
+qiniu.rpc.post(reqURL, reqBody, headers, function(err, body, info) {
+    console.log(info);
+    console.log(body);
+});

index.d.ts

@@ -331,11 +331,22 @@ export declare namespace util {
     /**
      * 创建AccessToken凭证
      * @param mac AK&SK对象
-     * @param requestURI 回调的URL中的requestURI 请求Body，仅当请求的ContentType为application/x-www-form-urlencoded时才需要传入该参数
-     * @param reqBody
+     * @param requestURI 请求URL
+     * @param reqBody  请求Body，仅当请求的ContentType为application/x-www-form-urlencoded 时才需要传入该参数
      */
     function generateAccessToken(mac: auth.digest.Mac, requestURI: string, reqBody?: string): string;
 
+
+    /**
+     * 创建AccessToken凭证
+     * @param mac            AK&SK对象
+     * @param requestURI     请求URL
+     * @param reqMethod      请求方法，例如 GET，POST 
+     * @param reqContentType 请求类型，例如 application/json 或者  application/x-www-form-urlencoded
+     * @param reqBody        请求Body，仅当请求的 ContentType 为 application/json 或者 application/x-www-form-urlencoded 时才需要传入该参数
+     */
+    function generateAccessTokenV2(mac: auth.digest.Mac, requestURI: string, reqMethod: string, reqContentType: string, reqBody?: string) 
+
     /**
      * 校验七牛上传回调的Authorization
      * @param mac AK&SK对象

package.json

@@ -1,6 +1,6 @@
 {
   "name": "qiniu",
-  "version": "7.0.8",
+  "version": "7.0.9",
   "description": "Node wrapper for Qiniu Resource (Cloud) Storage API",
   "main": "index.js",
   "directories": {

qiniu/util.js

@@ -63,10 +63,10 @@ exports.hmacSha1 = function(encodedFlags, secretKey) {
   return hmac.digest('base64');
 }
 
-// 创建AccessToken凭证
+// 创建 AccessToken 凭证
 // @param mac         AK&SK对象
-// @param requestURI 回调的URL中的requestURI
-// @param reqBody    请求Body，仅当请求的ContentType为
+// @param requestURI 请求URL
+// @param reqBody    请求Body，仅当请求的 ContentType 为
 //                   application/x-www-form-urlencoded时才需要传入该参数
 exports.generateAccessToken = function(mac, requestURI, reqBody) {
   var u = url.parse(requestURI);
@@ -82,6 +82,50 @@ exports.generateAccessToken = function(mac, requestURI, reqBody) {
   return 'QBox ' + mac.accessKey + ':' + safeDigest;
 }
 
+// 创建 AccessToken 凭证
+// @param mac            AK&SK对象
+// @param requestURI     请求URL
+// @param reqMethod      请求方法，例如 GET，POST
+// @param reqContentType 请求类型，例如 application/json 或者  application/x-www-form-urlencoded
+// @param reqBody        请求Body，仅当请求的 ContentType 为 application/json 或者 
+//                       application/x-www-form-urlencoded 时才需要传入该参数
+exports.generateAccessTokenV2 = function (mac, requestURI, reqMethod, reqContentType, reqBody) {
+  var u = url.parse(requestURI);
+  var path = u.path;
+  var query = u.query;
+  var host = u.host;
+  var port = u.port;
+
+  var access = reqMethod.toUpperCase() + ' ' + path;
+  if (query) {
+    access += '?' + query;
+  }
+  // add host
+  access += '\nHost: ' + host;
+  // add port
+  if (port) {
+    access += ':' + port;
+  }
+
+  // add content type
+  if (reqContentType && (reqContentType=="application/json" || reqContentType=="application/x-www-form-urlencoded")) {
+    access += '\nContent-Type: ' + reqContentType;
+  }
+
+  access += '\n\n';
+
+  // add reqbody
+  if (reqBody) {
+    access += reqBody;
+  }
+
+  console.log(access);
+
+  var digest = exports.hmacSha1(access, mac.secretKey);
+  var safeDigest = exports.base64ToUrlSafe(digest);
+  return 'Qiniu ' + mac.accessKey + ':' + safeDigest;
+}
+
 // 校验七牛上传回调的Authorization
 // @param mac           AK&SK对象
 // @param requestURI   回调的URL中的requestURI