Merge pull request #739 from watson-developer-cloud/apikey-username

perf: use token manager when user gives username as `apikey`

Author: germanattanasio

lib/base_service.ts

@@ -73,7 +73,7 @@ function hasCredentials(obj: any): boolean {
 }
 
 function hasBasicCredentials(obj: any): boolean {
-  return obj && obj.username && obj.password;
+  return obj && obj.username && obj.password && obj.username !== 'apikey';
 }
 
 export class BaseService {
@@ -131,6 +131,11 @@ export class BaseService {
         iamAccessToken: _options.iam_access_token,
         iamUrl: _options.iam_url
       });
+    } else if (_options.username === 'apikey') {
+      this.tokenManager = new IamTokenManagerV1({
+        iamApikey: _options.password,
+        iamUrl: _options.iam_url
+      });
     } else {
       this.tokenManager = null;
     }

test/unit/test.base_service.js

@@ -231,4 +231,15 @@ describe('BaseService', function() {
     assert.deepEqual(actual, expected);
     assert.notEqual(instance.tokenManager, null);
   });
+
+  it('should create a token manager instance if username is `apikey` and use the password as the API key', function() {
+    const apikey = 'abcd-1234';
+    const instance = new TestService({
+      username: 'apikey',
+      password: apikey,
+    });
+    assert.notEqual(instance.tokenManager, null);
+    assert.equal(instance.tokenManager.iamApikey, apikey);
+    assert.equal(instance._options.headers, undefined);
+  });
 });