Merge pull request #5 from jhellscream/master

feat: api key authentication v2

Author: 1bazinga25

.env.tpl.js

@@ -4,7 +4,8 @@ export default {
 		logFolder: '',
 		stdout: false,
 	},
-	key: '[你的 api key]',
-	secret: '[你的 api secret]',
-	passphrase: '[你的 api 密码]',
+	key: '[Your api key]',
+	secret: '[Your api secret]',
+	passphrase: '[Your api passphrase]',
+	keyVersion: 2
 }

README.md

@@ -17,7 +17,8 @@ copy .env.tpl.js .env.js
 export default {
 	key: '[Your api key]',
 	secret: '[Your api secret]',
-	passphrase: '[Your api passphrase]'
+	passphrase: '[Your api passphrase]',
+	keyVersion: '[Api key version]', // For v2 API-KEY, not required for v1 version
 }
 ```
 

src/lib/http.js

@@ -4,6 +4,7 @@ import request from 'request';
 import CryptoJS  from 'crypto';
 import codes from './codes';
 import log from './log';
+import { keyVersion2 } from './utils';
 
 const IS_PRODUCT = global._USE_KUMEX_ONLINE_ || process.env.PRODUCTION === 'true';
 const baseUrl = IS_PRODUCT ? 'https://api.kumex.com' : 'https://sandbox-api.kumex.com';
@@ -34,6 +35,8 @@ class Http {
     //
   static auth(configs, data = '', secret = '') {
 
+    const isKeyVersion2 = keyVersion2(HttpConfig.signatureConfig.keyVersion);
+
     const timestamp =  Date.now();
 
     const signature = Http.sign(timestamp + configs.method.toUpperCase() + configs.url + data, secret);
@@ -44,14 +47,21 @@ class Http {
     if (!HttpConfig.signatureConfig.passphrase) {
       log('KC-API-PASSPHRASE is not specified');
     }
-    return {
+    const headers = {
     //   ...(configs.headers || {}),
       'KC-API-KEY': HttpConfig.signatureConfig.key || '',
       'KC-API-SIGN': signature,
       'KC-API-TIMESTAMP': timestamp,
       'KC-API-PASSPHRASE': HttpConfig.signatureConfig.passphrase || '',
       'Content-Type': 'application/json',
     };
+
+    if (isKeyVersion2) {
+      headers['KC-API-PASSPHRASE'] = Http.sign(HttpConfig.signatureConfig.passphrase || '', secret);
+      headers['KC-API-KEY-VERSION'] = HttpConfig.signatureConfig.keyVersion;
+    };
+
+    return headers;
   }
 
 

src/lib/utils.js

@@ -6,6 +6,10 @@ export const targetTypesMap = {
     buy: 'bids',
 };
 
+export const keyVersion2 = (version) => {
+    return version && version === 2;
+};
+
 export const genUUID = (prefix = '')=> {
     return prefix + '__' +uuid();
 };