Update all nodes to credentials system and auth middleware

io/emoncms/88-emoncms.html

@@ -82,33 +82,11 @@
             server: {value:"http://localhost",required:true},
             name: {value:""}
         },
+        credentials: {
+            apikey: {type:"text"}
+        },
         label: function() {
             return this.name||this.server;
-        },
-        oneditprepare: function() {
-            $.getJSON('emoncms-server/'+this.id,function(data) {
-                if (data.apikey) {
-                    $('#node-config-input-apikey').val(data.apikey);
-                }
-            });
-        },
-        oneditsave: function() {
-            var newApikey = $('#node-config-input-apikey').val();
-            var credentials = {};
-            credentials.apikey = newApikey;
-            $.ajax({
-                url: 'emoncms-server/'+this.id,
-                type: 'POST',
-                data: credentials,
-                success:function(result){}
-            });
-        },
-        ondelete: function() {
-            $.ajax({
-                url: 'emoncms-server/'+this.id,
-                type: 'DELETE',
-                success: function(result) {}
-            });
         }
     });
 </script>

io/emoncms/88-emoncms.js

@@ -20,56 +20,20 @@ function EmoncmsServerNode(n) {
     RED.nodes.createNode(this,n);
     this.server = n.server;
     this.name = n.name;
-    var credentials = RED.nodes.getCredentials(n.id);
-    if (credentials) {
-        this.apikey = credentials.apikey;
-    }
-
 }
-RED.nodes.registerType("emoncms-server",EmoncmsServerNode);
-
-var querystring = require('querystring');
-
-RED.httpAdmin.get('/emoncms-server/:id',function(req,res) {
-    var credentials = RED.nodes.getCredentials(req.params.id);
-    if (credentials) {
-        res.send(JSON.stringify({apikey:credentials.apikey}));
-    } else {
-        res.send(JSON.stringify({}));
+RED.nodes.registerType("emoncms-server",EmoncmsServerNode,{
+    credentials: {
+        apikey: {type:"text"}
     }
 });
 
-RED.httpAdmin.delete('/emoncms-server/:id',function(req,res) {
-    RED.nodes.deleteCredentials(req.params.id);
-    res.send(200);
-});
-
-RED.httpAdmin.post('/emoncms-server/: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.apikey == null || newCreds.apikey == "") {
-            delete credentials.apikey;
-        } else {
-            credentials.apikey = newCreds.apikey;
-        }
-        RED.nodes.addCredentials(req.params.id,credentials);
-        res.send(200);
-    });
-});
-
 function Emoncms(n) {
     RED.nodes.createNode(this,n);
     this.emonServer = n.emonServer;
     var sc = RED.nodes.getNode(this.emonServer);
 
     this.baseurl = sc.server;
-    this.apikey = sc.apikey;
+    this.apikey = sc.credentials.apikey;
 
     this.nodegroup = n.nodegroup || "";
     var node = this;

io/emoncms/package.json

@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-emoncms",
-    "version"       : "0.0.1",
+    "version"       : "0.0.2",
     "description"   : "A Node-RED node to send energy data to emoncms.org.",
     "dependencies"  : {
     },

io/stomp/18-stomp.html

@@ -110,7 +110,7 @@
     </div>
     <div class="form-row">
         <label for="node-config-input-pass"><i class="fa fa-lock"></i> Password</label>
-        <input type="password" id="node-config-input-pass">
+        <input type="password" id="node-config-input-password">
     </div>
     <div class="form-row">
         <label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
@@ -126,44 +126,12 @@
             port: {value:61618,required:true,validate:RED.validators.number()},
             name: {}
         },
+        credentials: {
+            user: {type:"text"},
+            password: {type: "password"}
+        },
         label: function() {
             return (this.name?this.name:this.server+":"+this.port);
-        },
-        oneditprepare: function() {
-            $.getJSON('stomp-server/'+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('');
-                }
-                if (data.global) $('#node-config-cred-tip').show();
-                else $('#node-config-cred-tip').hide();
-            });
-        },
-        oneditsave: function() {
-            var credentials = {};
-            var newUser = $('#node-config-input-user').val();
-            var newPass = $('#node-config-input-pass').val();
-            credentials.user = newUser;
-            if (newPass != '__PWRD__') {
-                credentials.password = newPass;
-            }
-            $.ajax({
-                url: 'stomp-server/'+this.id,
-                type: 'POST',
-                data: credentials,
-                success: function(result){}
-            });
-        },
-        ondelete: function() {
-            $.ajax({
-                url: 'stomp-server/'+this.id,
-                type: 'DELETE',
-                success: function(result) {}
-            });
         }
     });
 </script>

io/stomp/18-stomp.js

@@ -24,52 +24,16 @@ module.exports = function(RED) {
         this.server = n.server;
         this.port = n.port;
         this.name = n.name;
-        var credentials = RED.nodes.getCredentials(n.id);
-        if (credentials) {
-            this.username = credentials.user;
-            this.password = credentials.password;
-        }
+        this.username = this.credentials.user;
+        this.password = this.credentials.password;
     }
-    RED.nodes.registerType("stomp-server",StompServerNode);
-
-    RED.httpAdmin.get('/stomp-server/: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.nodes.registerType("stomp-server",StompServerNode,{
+        credentials: {
+            user: {type:"text"},
+            password: {type: "password"}
         }
     });
 
-    RED.httpAdmin.delete('/stomp-server/:id',function(req,res) {
-        RED.nodes.deleteCredentials(req.params.id);
-        res.send(200);
-    });
-
-    RED.httpAdmin.post('/stomp-server/: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 StompInNode(n) {
         RED.nodes.createNode(this,n);
         this.server = n.server;

io/stomp/package.json

@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-stomp",
-    "version"       : "0.0.1",
+    "version"       : "0.0.2",
     "description"   : "A Node-RED node to publish and subscribe to/from a Stomp server",
     "dependencies"  : {
         "stomp-client"   : "0.5.0"