more apikey/apikey stuff

Author: nfriedly

CHANGELOG.md

@@ -1,4 +1,4 @@
-# v2.4.2
+# v2.4.3
 * Fix issue with automatically loading Alchemy* credentials from the Bluemix environment
 
 # v2.4.1

lib/base_service.js

@@ -19,7 +19,6 @@
 var extend       = require('extend');
 var vcapServices = require('vcap_services');
 var helper       = require('./helper');
-var omit         = require('object.omit');
 var request      = require('request');
 
 
@@ -44,8 +43,6 @@ function BaseService(user_options) {
 
   options = this.initCredentials(options);
 
-  options = omit(options, ['version', 'username', 'password', 'use_unauthenticated', 'apikey']);
-
   if (options.url)
     options.url = helper.stripTrailingSlash(options.url);
 

lib/base_service_alchemy.js

@@ -22,20 +22,20 @@ util.inherits(BaseServiceAlchemy, BaseService);
  * @private
  */
 BaseServiceAlchemy.prototype.initCredentials = function(options) {
-  options.api_key = options.apikey || options.api_key;
+  options.apikey = options.apikey || options.api_key;
   options = extend(
     {},
     this.getCredentialsFromBluemix('alchemy_api'), // this is the same for all Alchemy* services
     this.getCredentialsFromEnvironment(this.name),
     options
   );
   if (!options.use_unauthenticated) {
-    if (!options.api_key) {
+    if (!options.apikey) {
       throw new Error('Argument error: api_key was not specified');
     }
     // Per documentation, Alchemy* services use `apikey`, but Visual Recognition uses (`api_key`)
     // (Either will work in most cases, but there are a few exceptions.)
-    options.qs = extend({ apikey : options.api_key }, options.qs);
+    options.qs = extend({ apikey : options.apikey }, options.qs);
   }
   return options
 };
@@ -48,7 +48,7 @@ BaseServiceAlchemy.prototype.initCredentials = function(options) {
  */
 BaseServiceAlchemy.prototype.getCredentialsFromEnvironment = function(name) {
   return {
-    api_key: process.env[name.toUpperCase() + '_API_KEY']
+    apikey: process.env[name.toUpperCase() + '_API_KEY']
   }
 };
 

test/test.wrapper.js

@@ -108,12 +108,12 @@ describe('wrapper', function() {
 
     it('should use apikey (not documented) for alchemy service', function() {
       var service = watson.alchemy_language({ apikey: 'not-gonna-work'});
-      assert.equal(service._options.api_key, 'not-gonna-work');
+      assert.equal(service._options.qs.apikey, 'not-gonna-work');
     });
 
     it('should use api_key for alchemy service', function() {
       var service = watson.alchemy_language({ api_key: 'not-gonna-work'});
-      assert.equal(service._options.api_key, 'not-gonna-work');
+      assert.equal(service._options.qs.apikey, 'not-gonna-work');
     });
 
     it('should not use VCAP_SERVICES if use_vcap_services is false', function() {