Merge branch 'master' into apryka-result-parsers

Author: Artur Pryka

dist/keen-analysis.js

@@ -26,12 +26,16 @@ export default function request(method, httpHandlers){
       return this;
     }
 
+    if (requestUrlAndOptions && requestUrlAndOptions.params) {
+      requestUrlAndOptions.params = mapKeysToUnderscore(requestUrlAndOptions.params);
+    }
+
     this.config = {
       api_key : undefined,
       params  : {},
       method,
       headers : {
-        'Authorization' : requestUrlAndOptions.api_key,
+        'Authorization' : (requestUrlAndOptions.api_key || requestUrlAndOptions.apiKey),
         'Content-type'  : 'application/json',
         'keen-sdk': `javascript-${version}`
       },
@@ -67,7 +71,7 @@ request.prototype.timeout = function(num){
 };
 
 request.prototype.send = function(obj){
-  if (this.config && !this.config.api_key) throw new Error('Please provide valid API key');
+  if (this.config && !this.config.api_key && !this.config.apiKey) throw new Error('Please provide a valid API key');
   if (obj) {
     this.config.params = (obj && typeof obj === 'object') ? mapKeysToUnderscore(obj) : {};
   }

dist/keen-analysis.js.map

@@ -1,7 +1,6 @@
 import https from 'https';
 import url from 'url';
 
-import extend from 'keen-core/lib/utils/extend';
 import serialize from 'keen-core/lib/utils/serialize';
 
 const handleRequest = (config, args = {}) => {