Add username/password to Mongo nodes

Fixes #159

nodes/core/storage/66-mongodb.html

@@ -29,6 +29,14 @@
         <label for="node-config-input-name"><i class="icon-tag"></i> Name</label>
         <input type="text" id="node-config-input-name" placeholder="Name">
     </div>
+    <div class="form-row">
+        <label for="node-config-input-user"><i class="icon-user"></i> Username</label>
+        <input type="text" id="node-config-input-user">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-pass"><i class="icon-lock"></i> Password</label>
+        <input type="password" id="node-config-input-pass">
+    </div>
 </script>
 
 <script type="text/javascript">
@@ -39,10 +47,47 @@
             hostname: { value:"127.0.0.1",required:true},
             port: { value: 27017,required:true},
             db: { value:"",required:true},
-            name: { value:"" }
+            name: { value:"" },
+            //user -> credentials
+            //pass -> credentials
         },
         label: function() {
-            return this.name||this.hostname+":"+this.port+"//"+this.db;
+            return this.name||this.hostname+":"+this.port+"/"+this.db;
+        },
+        oneditprepare: function() {
+            $.getJSON('mongodb/'+this.id,function(data) {
+                if (data.user) {
+                    $('#node-config-input-user').val(data.user);
+                }
+                if (data.hasPassword) {
+                    $('#node-config-input-pass').val('__PWRD__');
+                } else {
+                    $('#node-config-input-pass').val('');
+                }
+
+            });
+        },
+        oneditsave: function() {
+            var newUser = $('#node-config-input-user').val();
+            var newPass = $('#node-config-input-pass').val();
+            var credentials = {};
+            credentials.user = newUser;
+            if (newPass != '__PWRD__') {
+                credentials.password = newPass;
+            }
+            $.ajax({
+                url: 'mongodb/'+this.id,
+                type: 'POST',
+                data: credentials,
+                success:function(result){}
+            });
+        },
+        ondelete: function() {
+            $.ajax({
+                url: 'mongodb/'+this.id,
+                type: 'DELETE',
+                success: function(result) {}
+            });
         }
     });
 </script>
@@ -110,7 +155,7 @@
         align: "right",
         label: function() {
             var mongoNode = RED.nodes.node(this.mongodb);
-            return this.name||(mongoNode?mongoNode.label()+"//"+this.collection:"mongodb");
+            return this.name||(mongoNode?mongoNode.label()+" "+this.collection:"mongodb");
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";
@@ -154,7 +199,7 @@
         icon: "mongodb.png",
         label: function() {
             var mongoNode = RED.nodes.node(this.mongodb);
-            return this.name||(mongoNode?mongoNode.label()+"//"+this.collection:"mongodb");
+            return this.name||(mongoNode?mongoNode.label()+" "+this.collection:"mongodb");
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";

nodes/core/storage/66-mongodb.js

@@ -16,6 +16,7 @@
 
 var RED = require(process.env.NODE_RED_HOME+"/red/red");
 var mongo = require('mongodb');
+var MongoClient = mongo.MongoClient;
 
 function MongoNode(n) {
     RED.nodes.createNode(this,n);
@@ -23,9 +24,62 @@ function MongoNode(n) {
     this.port = n.port;
     this.db = n.db;
     this.name = n.name;
+    var credentials = RED.nodes.getCredentials(n.id);
+    if (credentials) {
+        this.username = credentials.user;
+        this.password = credentials.password;
+    }
+    
+    var url = "mongodb://";
+    if (this.username && this.password) {
+        url += this.username+":"+this.password+"@";
+    }
+    url += this.hostname+":"+this.port+"/"+this.db;
+    
+    this.url = url;
 }
+
 RED.nodes.registerType("mongodb",MongoNode);
 
+var querystring = require('querystring');
+
+RED.httpAdmin.get('/mongodb/:id',function(req,res) {
+    var credentials = RED.nodes.getCredentials(req.params.id);
+    if (credentials) {
+        res.send(JSON.stringify({user:credentials.user,hasPassword:(credentials.password&&credentials.password!="")}));
+    } else {
+        res.send(JSON.stringify({}));
+    }
+});
+
+RED.httpAdmin.delete('/mongodb/:id',function(req,res) {
+    RED.nodes.deleteCredentials(req.params.id);
+    res.send(200);
+});
+
+RED.httpAdmin.post('/mongodb/:id',function(req,res) {
+    var body = "";
+    req.on('data', function(chunk) {
+        body+=chunk;
+    });
+    req.on('end', function(){
+        var newCreds = querystring.parse(body);
+        var credentials = RED.nodes.getCredentials(req.params.id)||{};
+        if (newCreds.user == null || newCreds.user == "") {
+            delete credentials.user;
+        } else {
+            credentials.user = newCreds.user;
+        }
+        if (newCreds.password == "") {
+            delete credentials.password;
+        } else {
+            credentials.password = newCreds.password||credentials.password;
+        }
+        RED.nodes.addCredentials(req.params.id,credentials);
+        res.send(200);
+    });
+});
+
 
 function MongoOutNode(n) {
     RED.nodes.createNode(this,n);
@@ -37,29 +91,30 @@ function MongoOutNode(n) {
 
     if (this.mongoConfig) {
         var node = this;
-        this.clientDb = new mongo.Db(node.mongoConfig.db, new mongo.Server(node.mongoConfig.hostname, node.mongoConfig.port, {}), {w: 1});
+        MongoClient.connect(this.mongoConfig.url, function(err,db) {
-        this.clientDb.open(function(err,cli) {
+            if (err) {
-            if (err) { node.error(err); }
+                node.error(err);
-            else {
+            } else {
-                node.clientDb.collection(node.collection,function(err,coll) {
+                node.clientDb = db;
-                    if (err) { node.error(err); }
+                var coll = db.collection(node.collection);
-                    else {
                 node.on("input",function(msg) {
                     if (node.operation == "store") {
                         delete msg._topic;
                         if (node.payonly) {
                             if (typeof msg.payload !== "object") { msg.payload = {"payload":msg.payload}; }
                             coll.save(msg.payload,function(err,item){ if (err){node.error(err);} });
+                        } else {
+                            coll.save(msg,function(err,item){if (err){node.error(err);}});
                         }
-                                else coll.save(msg,function(err,item){if (err){node.error(err);}});
                     }
                     else if (node.operation == "insert") {
                         delete msg._topic;
                         if (node.payonly) {
                             if (typeof msg.payload !== "object") { msg.payload = {"payload":msg.payload}; }
                             coll.insert(msg.payload,function(err,item){ if (err){node.error(err);} });
+                        } else {
+                            coll.insert(msg,function(err,item){if (err){node.error(err);}});
                         }
-                                else coll.insert(msg,function(err,item){if (err){node.error(err);}});
                     }
                     if (node.operation == "delete") {
                         coll.remove(msg.payload, {w:1}, function(err, items){ if (err) node.error(err); });
@@ -67,8 +122,6 @@ function MongoOutNode(n) {
                 });
             }
         });
-            }
-        });
     } else {
         this.error("missing mongodb configuration");
     }
@@ -90,26 +143,26 @@ function MongoInNode(n) {
 
     if (this.mongoConfig) {
         var node = this;
-        this.clientDb = new mongo.Db(node.mongoConfig.db, new mongo.Server(node.mongoConfig.hostname, node.mongoConfig.port, {}), {w: 1});
+        MongoClient.connect(this.mongoConfig.url, function(err,db) {
-        this.clientDb.open(function(err,cli) {
+            if (err) {
-            if (err) { node.error(err); }
+                node.error(err);
-            else {
+            } else {
-                node.clientDb.collection(node.collection,function(err,coll) {
+                node.clientDb = db;
-                    if (err) { node.error(err); }
+                var coll = db.collection(node.collection);
-                    else {
                 node.on("input",function(msg) {
                     msg.projection = msg.projection || {};
                     coll.find(msg.payload,msg.projection).sort(msg.sort).limit(msg.limit).toArray(function(err, items) {
-                                if (err) { node.error(err); }
+                        if (err) {
+                            node.error(err);
+                        } else {
                             msg.payload = items;
                             delete msg.projection;
                             delete msg.sort;
                             delete msg.limit;
                             node.send(msg);
-                            });
-                        });
                         }
                     });
+                });
             }
         });
     } else {