Implement own IAM Token retrieval

Author: chughts

README.md

@@ -8,14 +8,17 @@ Node-RED Watson Nodes for IBM Cloud
 <a href="https://cla-assistant.io/watson-developer-cloud/node-red-node-watson"><img src="https://cla-assistant.io/readme/badge/watson-developer-cloud/node-red-node-watson" alt="CLA assistant" /></a>
 
 ### New in version 0.7.0
-- Assistant, Discovery, Natural Language Understanding, Personality Insights,
+- In this release STT in Stream mode with IAM Keys does not work.
+- Assistant, Discovery, Language Identify, Language Translator,
+Natural Language Understanding, Personality Insights,
 Speech to Text, Text to Speech, Tone Analyzer nodes updated
-to allow for use of iam key for authentication.
+to allow for use of IAM key for authentication.
 - Migrated STT node off deprecated methods.
 - Fix to Tone Analyzer Node to preserve credentials on config reopen.
 - Fix to Tone Analyzer to allow json objects and arrays as payload.
 - Fix to STT where auto-connect was not being preserved when reopening configuration.
 - Bump to 2018-03-05 version date for Discovery service.
+- Move to V3 of Language Translator
 - Migrated Discovery Nodes off deprecated methods.
 - Remove Deprecated Retrieve and Rank Nodes
 

package.json

@@ -10,7 +10,7 @@
     "temp": "^0.8.3",
     "qs": "6.x",
     "image-type": "^2.0.2",
-    "watson-developer-cloud": "^3.4.5",
+    "watson-developer-cloud": "^3.5.0",
     "kuromoji": "^0.1.1",
     "word-count": "^0.2.2",
     "is-docx": "^0.0.3",
@@ -40,9 +40,9 @@
       "watson-discovery-v1": "services/discovery/v1.js",
       "watson-discovery-v1-document-loader": "services/discovery/v1-document-loader.js",
       "watson-discovery-v1-query-builder": "services/discovery/v1-query-builder.js",
-      "watson-language-translator-v2": "services/language_translator/v2.js",
-      "watson-language-translator-identify-v2": "services/language_translator_identify/v2.js",
-      "watson-language-translator-util-v2": "services/language_translator_util/v2.js",
+      "watson-language-translator-v3": "services/language_translator/v3.js",
+      "watson-language-translator-identify-v3": "services/language_translator_identify/v3.js",
+      "watson-language-translator-util-v3": "services/language_translator_util/v3.js",
       "watson-natural-language-classifier-v1": "services/natural_language_classifier/v1.js",
       "watson-natural-language-understanding-v1": "services/natural_language_understanding/v1.js",
       "watson-personality-insights-v3": "services/personality_insights/v3.js",

services/speech_to_text/v1.js

@@ -272,17 +272,21 @@ module.exports = function (RED) {
     function getService() {
       var p = new Promise(function resolver(resolve, reject){
         let sttService = determineService();
-        if (apikey) {
-          sttService.preAuthenticate((ready) => {
-            if (!ready) {
-              reject('Service is not ready');
-            } else {
-              resolve(sttService);
-            }
-          });
-        } else {
-          resolve(sttService);
-        }
+        // preAuthenticate was a temp fix, but now that we are
+        // processing IAM Keys directly, no need for this, but
+        // we will keep the commented out code for now, as we
+        // may come back to this.
+        // if (apikey) {
+        //   sttService.preAuthenticate((ready) => {
+        //     if (!ready) {
+        //       reject('Service is not ready');
+        //     } else {
+        //       resolve(sttService);
+        //     }
+        //   });
+        // } else {
+        resolve(sttService);
+        // }
       });
       return p;
     }
@@ -298,7 +302,9 @@ module.exports = function (RED) {
         // creds.iamApikey = apikey;
         // console.log('Creating token with endpoint ', endpoint);
         // tokenService = new AuthIAMV1.IamTokenManagerV1({iamApikey : apikey, iamUrl: endpoint});
+
         tokenService = new AuthIAMV1.IamTokenManagerV1({iamApikey : apikey});
+        //tokenService = new iamutils(apikey);
 
       } else {
         // console.log('Standard Key');
@@ -336,7 +342,7 @@ module.exports = function (RED) {
       let requestSettings = {
         qs : cloneQS(params),
         method : 'POST',
-        uri : endpoint + '/recognize',
+        uri : endpoint + '/v1/recognize',
         headers : {
           //Authorization: "Bearer " + t,
           'Content-Type': params.content_type,
@@ -356,7 +362,7 @@ module.exports = function (RED) {
     function executePostRequest(requestSettings) {
       var p = new Promise(function resolver(resolve, reject){
         request(requestSettings, (error, response, body) => {
-          console.log('--------- request has been executed ---------------');
+          //console.log('--------- request has been executed ---------------');
 
           if (!error && response.statusCode == 200) {
             data = JSON.parse(body);
@@ -371,6 +377,8 @@ module.exports = function (RED) {
                    errordata.errors.length &&
                    errordata.errors[0].message) {
               reject('Error ' + response.statusCode + ' ' + errordata.errors[0].message);
+            } else if (errordata.error) {
+              reject('Error performing request ' + errordata.error);
             } else {
               reject('Error performing request ' + response.statusCode);
             }
@@ -392,7 +400,6 @@ module.exports = function (RED) {
             return buildRequestSettings(params, t);
           })
           .then((requestSettings) => {
-            //console.log('Request parameters look like ', requestSettings);
             return executePostRequest(requestSettings);
           })
           .then((data) => {
@@ -430,13 +437,23 @@ module.exports = function (RED) {
         }
 
         // Everything is now in place to invoke the service
-        speech_to_text.recognize(params, function (err, res) {
-          if (err) {
+        if (apikey) {
+          iamRecognize(params)
+          .then((data) => {
+            resolve(data);
+          })
+          .catch((err) => {
             reject(err);
-          } else {
-            resolve(res);
-          }
+          })
+        } else {
+          speech_to_text.recognize(params, function (err, res) {
+            if (err) {
+              reject(err);
+            } else {
+              resolve(res);
+            }
         });
+        }
 
       });
       return p;
@@ -466,7 +483,7 @@ module.exports = function (RED) {
               tokenPending = false;
               tokenTime = now;
               token = res;
-              // console.log('We have the token ', token);
+              //console.log('We have the token ', token);
               resolve();
             }
           });
@@ -495,7 +512,7 @@ module.exports = function (RED) {
                              + '?watson-token=' + token + '&model=' + model;
         }
 
-        // console.log('wsURI is : ', wsURI);
+        //console.log('wsURI is : ', wsURI);
 
         if (!websocket && !socketCreationInProcess) {
           socketCreationInProcess = true;

utilities/iam-utils.js

@@ -23,7 +23,18 @@ const request = require('request');
 
 class IAMUtils {
 
-  constructor() {
+  constructor(key) {
+    this._key = key;
+  }
+
+  getToken(cb) {
+    IAMUtils.getIAMToken(this._key)
+    .then((token) => {
+      cb(null, token);
+    })
+    .catch((err) => {
+      cb(err, null);
+    });
   }
 
   static stashToken(key, tokenInfo) {
@@ -97,6 +108,7 @@ class IAMUtils {
     return p;
   }
 
+
   static getIAMToken(key) {
     var p = new Promise(function resolver(resolve, reject){
       IAMUtils.lookInStash(key)