fix bug when using external service

Author: lgfa29

77-cloudant-cf.html

@@ -22,8 +22,8 @@
     </div>
 
     <div class="form-row">
-        <label for="node-config-input-user"><i class="fa fa-user"></i> Username</label>
-        <input type="text" id="node-config-input-user">
+        <label for="node-config-input-username"><i class="fa fa-user"></i> Username</label>
+        <input type="text" id="node-config-input-username">
     </div>
 
     <div class="form-row">
@@ -52,8 +52,8 @@
         },
         oneditprepare: function() {
             $.getJSON("cloudant/"+this.id, function(data) {
-                if (data.user) {
-                    $("#node-config-input-user").val(data.user);
+                if (data.username) {
+                    $("#node-config-input-username").val(data.username);
                 }
                 if (data.hasPassword) {
                     $("#node-config-input-pass").val("__PWRD__");
@@ -63,10 +63,10 @@
             });
         },
         oneditsave: function() {
-            var newUser = $("#node-config-input-user").val();
+            var newUser = $("#node-config-input-username").val();
             var newPass = $("#node-config-input-pass").val();
             var credentials = {};
-            credentials.user = newUser;
+            credentials.username = newUser;
             if (newPass != "__PWRD__") {
                 credentials.password = newPass;
             }

77-cloudant-cf.js

@@ -50,7 +50,7 @@ module.exports = function(RED) {
         if (credentials) {
             res.send(JSON.stringify(
               {
-                  user: credentials.user,
+                  username: credentials.username,
                   hasPassword: (credentials.password && credentials.password !== "")
               }
             ));
@@ -68,10 +68,10 @@ module.exports = function(RED) {
         var newCreds = req.body;
         var credentials = RED.nodes.getCredentials(req.params.id) || {};
 
-        if (newCreds.user == null || newCreds.user == "") {
-            delete credentials.user;
+        if (newCreds.username == null || newCreds.username == "") {
+            delete credentials.username;
         } else {
-            credentials.user = newCreds.user;
+            credentials.username = newCreds.username;
         }
 
         if (newCreds.password == "") {
@@ -95,7 +95,7 @@ module.exports = function(RED) {
 
         var credentials = RED.nodes.getCredentials(n.id);
         if (credentials) {
-            this.username = credentials.user;
+            this.username = credentials.username;
             this.password = credentials.password;
         }
 
@@ -117,11 +117,11 @@ module.exports = function(RED) {
         this.operation      = n.operation;
         this.payonly        = n.payonly || false;
         this.database       = n.database;
-        this.cloudantConfig = RED.nodes.getNode(n.cloudant);
+        this.cloudantConfig = _getCloudantConfig(n);
 
         var node = this;
         var credentials = {
-            account:  node.cloudantConfig.credentials.user,
+            account:  node.cloudantConfig.credentials.username,
             password: node.cloudantConfig.credentials.password
         };
 
@@ -213,7 +213,7 @@ module.exports = function(RED) {
     function CloudantInNode(n) {
         RED.nodes.createNode(this,n);
 
-        this.cloudantConfig = RED.nodes.getNode(n.cloudant);
+        this.cloudantConfig = _getCloudantConfig(n);
         this.database       = n.database;
         this.search         = n.search;
         this.design         = n.design;
@@ -222,7 +222,7 @@ module.exports = function(RED) {
 
         var node = this;
         var credentials = {
-            account:  node.cloudantConfig.credentials.user,
+            account:  node.cloudantConfig.credentials.username,
             password: node.cloudantConfig.credentials.password
         };
 
@@ -320,18 +320,11 @@ module.exports = function(RED) {
     }
     RED.nodes.registerType("cloudant in", CloudantInNode);
 
-    function _getUrl(node, n) {
-        if (n.service == "_ext_") {
-            var cloudantConfig = RED.nodes.getNode(node.cloudantConfig);
-            if (cloudantConfig) {
-                return cloudantConfig.url;
-            }
-        }
-        else if (n.service != "") {
-            var cloudantConfig = appEnv.getService(n.service);
-            if (cloudantConfig) {
-                return cloudantConfig.credentials.url;
-            }
+    function _getCloudantConfig(n) {
+        if (n.service === "_ext_") {
+            return RED.nodes.getNode(n.cloudant);
+        } else if (n.service !== "") {
+            return appEnv.getService(n.service);
         }
     }
 };