Merge pull request #238 from chughts/ccreds

Conversation Credentials

Author: chughts

README.md

@@ -9,6 +9,8 @@ Node-RED Watson Nodes for IBM Bluemix
 
 ### New in version 0.4.34
 - Added Keyword and Entity emotion and sentiment as options on Alchemy Feature Extract Node.
+- Allow Conversation credentials to be provided on msg.params
+- Similarity Search and Visual Recognition Nodes updated to use url based services to detect bound service.
 
 ### New in version 0.4.33
 - Personality Insights node updated to latest December 15, 2016 GloVe profiles.

services/conversation/v1.html

@@ -68,6 +68,9 @@
     <li><code>msg.params.entities</code> (optional) : see API documentation </li>
     <li><code>msg.params.output</code> (optional) : see API documentation </li>
     <li><code>msg.additional_context</code> (optional) : additional properties that will be added to the context object. Format: Object </li>
+    <br/>
+    <li><code>msg.params.username</code> : If provided will be used as the username credential for the Conversation service.</li>
+    <li><code>msg.params.password</code> : If provided will be used as the password credential for the Conversation service.</li>
     </ul>
     <p>See <a href="http://www.ibm.com/watson/developercloud/conversation/api/v1/#send_input" target="_blank">Conversation API documentation</a> for details.</p>
     <p>All Results will made available at <code>msg.payload</code> in JSON format. Check the  <a href="http://www.ibm.com/watson/developercloud/conversation/api/v1/#send_input" target="_blank">documentation</a> for details.</p>

services/conversation/v1.js

@@ -121,17 +121,20 @@ module.exports = function (RED) {
   function verifyServiceCredentials(node, msg) {
     // If it is present the newly provided user entered key
     // takes precedence over the existing one.
+    // If msg.params contain credentials then these will Overridde
+    // the bound or configured credentials.
     var userName = sUsername || node.credentials.username,
       passWord = sPassword || node.credentials.password;
 
-    if (!userName || !passWord) {
+    if ( !(userName || msg.params.username) ||
+           !(passWord || msg.params.password) ) {
       node.status({fill:'red', shape:'ring', text:'missing credentials'});
       node.error('Missing Watson Conversation API service credentials', msg);
       return false;
     }
     node.service = new ConversationV1({
-      username: userName,
-      password: passWord,
+      username: msg.params.username ? msg.params.username : userName,
+      password: msg.params.password ? msg.params.password :passWord,
       version_date: '2016-09-20'
     });
     return true;

services/similarity_search/v3.js

@@ -15,7 +15,8 @@
  **/
 
 module.exports = function (RED) {
-  var cfenv = require('cfenv'),
+  const SERVICE_IDENTIFIER = 'visual-recognition';
+  var serviceutils = require('../../utilities/service-utils'),
     watson = require('watson-developer-cloud'),
     imageType = require('image-type'),
     temp = require('temp'),
@@ -27,7 +28,7 @@ module.exports = function (RED) {
   // temp is being used for file streaming to allow the file to arrive so it can be processed.
   temp.track();
 
-  service = cfenv.getAppEnv().getServiceCreds(/visual recognition/i);
+  service = serviceutils.getServiceCreds(SERVICE_IDENTIFIER);
 
   if (service) {
     sAPIKey = service.api_key;

services/visual_recognition/v3.js

@@ -15,7 +15,8 @@
  **/
 
 module.exports = function (RED) {
-  var cfenv = require('cfenv'),
+  const SERVICE_IDENTIFIER = 'visual-recognition';
+  var serviceutils = require('../../utilities/service-utils'),
     watson = require('watson-developer-cloud'),
     imageType = require('image-type'),
     url = require('url'),
@@ -28,7 +29,7 @@ module.exports = function (RED) {
   // temp is being used for file streaming to allow the file to arrive so it can be processed.
   temp.track();
 
-  service = cfenv.getAppEnv().getServiceCreds(/visual recognition/i);
+  service = serviceutils.getServiceCreds(SERVICE_IDENTIFIER);
 
   if (service) {
     sAPIKey = service.api_key;