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"  : {
     },