Merge branch 'master' into apikey-username

Author: germanattanasio

.travis.yml

@@ -3,7 +3,7 @@ sudo: false
 node_js:
 - 4
 - 6
-- stable
+- 8
 before_install:
 - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_320e4a7e27b3_key
   -iv $encrypted_320e4a7e27b3_iv -in auth.js.enc -out test/resources/auth.js -d ||
@@ -21,5 +21,3 @@ deploy:
 - provider: script
   skip_cleanup: true
   script: npx travis-deploy-once "npx semantic-release"
-  on:
-    node: stable

authorization/v1.ts

@@ -44,22 +44,31 @@ class AuthorizationV1 extends BaseService {
   }
 
   /**
-   * Get a percent-encoded authorization token based on resource query string param
+   * If using an RC service, get an IAM access token. If using a CF service,
+   * get a percent-encoded authorization token based on resource query string param
    *
    * @param {Object} [options]
    * @param {String} [options.url] defaults to url supplied to constructor (if any)
-   * @param {Function(err, token)} callback - called with a %-encoded token
+   * @param {Function(err, token)} callback - called with a %-encoded token if CF
    */
   getToken(params, callback) {
     if (typeof params === 'function') {
       callback = params;
       params = { url: this['target_url'] };
     }
+
+    // if the service is an RC instance, return an IAM access token
+    if (this.tokenManager) {
+      // callback should expect (err, token) format,
+      // which is what the token manager will pass in
+      return this.tokenManager.getToken(callback);
+    }
+
+    // otherwise, return a CF Watson token
     if (!params.url) {
       callback(new Error('Missing required parameters: url'));
       return;
     }
-
     const parameters = {
       options: {
         method: 'GET',

lib/recognize-stream.ts

@@ -112,6 +112,9 @@ class RecognizeStream extends Duplex {
    * @param {Boolean} [options.smart_formatting=false] - formats numeric values such as dates, times, currency, etc.
    * @param {String} [options.customization_id] - Customization ID
    * @param {IamTokenManagerV1} [options.token_manager] - Token manager for authenticating with IAM
+   * @param {string} [options.base_model_version] - The version of the specified base model that is to be used with recognition request or, for the **Create a session** method, with the new session.
+   * Multiple versions of a base model can exist when a model is updated for internal improvements. The parameter is intended primarily for use with custom models that have been upgraded for a new base model.
+   * The default value depends on whether the parameter is used with or without a custom model. For more information, see [Base model version](https://console.bluemix.net/docs/services/speech-to-text/input.html#version).
    *
    * @constructor
    */

speech-to-text/v1.ts

@@ -16,7 +16,6 @@ const protocols = {
 };
 
 const PARAMS_ALLOWED = [
-  'continuous',
   'max_alternatives',
   'timestamps',
   'word_confidence',
@@ -32,7 +31,8 @@ const PARAMS_ALLOWED = [
   'customization_id',
   'speaker_labels',
   'customization_weight',
-  'acoustic_customization_id'
+  'acoustic_customization_id',
+  'base_model_version'
 ];
 
 /**
@@ -474,7 +474,7 @@ class SpeechToTextV1 extends GeneratedSpeechToTextV1 {
    * @param {Object} params The parameters
    * @param {Stream} params.audio - Audio to be recognized
    * @param {String} params.content_type - Content-type
-   * @param {Boolean} [params.continuous]
+   * @param {String} [params.base_model_version]
    * @param {Number} [params.max_alternatives]
    * @param {Boolean} [params.timestamps]
    * @param {Boolean} [params.word_confidence]

test/unit/test.authorization.v1.js

@@ -4,6 +4,9 @@ const assert = require('assert');
 const watson = require('../../index');
 const nock = require('nock');
 
+const sinon = require('sinon');
+const IamTokenManagerV1 = require('../../iam-token-manager/v1').IamTokenManagerV1;
+
 describe('authorization', function() {
   // Test params
   const service_request = {
@@ -16,6 +19,11 @@ describe('authorization', function() {
     version: 'v1',
   };
 
+  const rc_service = {
+    iam_apikey: 'abc123',
+    version: 'v1',
+  };
+
   // tokens are URL-encoded when recieved from the service
   const mock_token = 'token';
 
@@ -67,5 +75,21 @@ describe('authorization', function() {
     it('should default to url from credentials', function(done) {
       authorization.getToken(checkToken(done));
     });
+
+    it('should return an iam access token if given iam_api_key', function(done) {
+      const rc_authorization = watson.authorization(rc_service);
+      assert.notEqual(rc_authorization.tokenManager, null);
+
+      // mock the token manager
+      const tokenManager = new IamTokenManagerV1({ iamApikey: rc_service.iam_apikey });
+      const requestStub = sinon.stub(tokenManager, 'requestToken');
+      requestStub.yields(null, { access_token: mock_token });
+
+      // use the mocked token manager - we have already asserted that the
+      // authorization object created a token manager for itself
+      rc_authorization.tokenManager = tokenManager;
+
+      rc_authorization.getToken(checkToken(done));
+    });
   });
 });

test/unit/test.iam_token_manager.js

@@ -20,7 +20,7 @@ describe('iam_token_manager_v1', function() {
   });
 
   it('should turn an iam apikey into an access token', function(done) {
-    const instance = new IamTokenManagerV1({ iam_api_key: 'abcd-1234' });
+    const instance = new IamTokenManagerV1({ iamApikey: 'abcd-1234' });
     const requestStub = sinon.stub(instance, 'requestToken');
     const refreshSpy = sinon.spy(instance, 'refreshToken');
 
@@ -43,7 +43,7 @@ describe('iam_token_manager_v1', function() {
   });
 
   it('should refresh an expired access token', function(done) {
-    const instance = new IamTokenManagerV1({ iam_api_key: 'abcd-1234' });
+    const instance = new IamTokenManagerV1({ iamApikey: 'abcd-1234' });
     const requestSpy = sinon.spy(instance, 'requestToken');
     const refreshStub = sinon.stub(instance, 'refreshToken');
 
@@ -76,7 +76,7 @@ describe('iam_token_manager_v1', function() {
   });
 
   it('should use a valid access token if one is stored', function(done) {
-    const instance = new IamTokenManagerV1({ iam_api_key: 'abcd-1234' });
+    const instance = new IamTokenManagerV1({ iamApikey: 'abcd-1234' });
     const requestSpy = sinon.spy(instance, 'requestToken');
     const refreshSpy = sinon.spy(instance, 'refreshToken');
 
@@ -100,7 +100,7 @@ describe('iam_token_manager_v1', function() {
   });
 
   it('should return a user-managed access token if one is set post-construction', function(done) {
-    const instance = new IamTokenManagerV1({ iam_api_key: 'abcd-1234' });
+    const instance = new IamTokenManagerV1({ iamApikey: 'abcd-1234' });
     const requestSpy = sinon.spy(instance, 'requestToken');
     const refreshSpy = sinon.spy(instance, 'refreshToken');