Update all nodes to credentials system and auth middleware

social/prowl/57-prowl.html

@@ -32,7 +32,6 @@
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
-    <div class="form-tips" id="node-tip"><b>Note:</b> Using credentials from global pushkey.js file.</div>
 </script>
 
 <script type="text/x-red" data-help-name="prowl">
@@ -52,6 +51,9 @@
             priority: {value:0,required:true,validate:RED.validators.number()},
             name: {value:""}
         },
+        credentials: {
+            pushkey: {type: "password"}
+        }
         color:"#a7c9a0",
         inputs:1,
         outputs:0,
@@ -62,37 +64,6 @@
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";
-        },
-        oneditprepare: function() {
-            $.getJSON('prowl/'+this.id,function(data) {
-                if (data.hasPassword) {
-                    $('#node-config-input-pushkey').val('__PWRD__');
-                } else {
-                    $('#node-config-input-pushkey').val('');
-                }
-                if (data.global) $('#node-tip').show();
-                else $('#node-tip').hide();
-            });
-        },
-        oneditsave: function() {
-            var credentials = {};
-            var newPass = $('#node-config-input-pushkey').val();
-            if (newPass != '__PWRD__') {
-                credentials.pushkey = newPass;
-                $.ajax({
-                    url: 'prowl/'+this.id,
-                    type: 'POST',
-                    data: credentials,
-                    success: function(result){}
-                });
-            }
-        },
-        ondelete: function() {
-            $.ajax({
-                url: 'prowl/'+this.id,
-                type: 'DELETE',
-                success: function(result) {}
-            });
         }
     });
 </script>

social/prowl/57-prowl.js

@@ -18,11 +18,6 @@ module.exports = function(RED) {
     "use strict";
     var Prowl = require('node-prowl');
 
-    // Either add a line like this to settings.js
-    //    prowl: {prowlkey:'My-API-KEY'},
-    // or create pushkey.js in dir ABOVE node-red, it just needs to be like
-    //    module.exports = {prowlkey:'My-API-KEY'}
-
     try {
         var pushkeys = RED.settings.prowl || require(process.env.NODE_RED_HOME+"/../pushkey.js");
     }
@@ -34,7 +29,7 @@ module.exports = function(RED) {
         this.priority = parseInt(n.priority);
         if (this.priority > 2) { this.priority = 2; }
         if (this.priority < -2) { this.priority = -2; }
-        var credentials = RED.nodes.getCredentials(n.id);
+        var credentials = this.credentials;
         if ((credentials) && (credentials.hasOwnProperty("pushkey"))) { this.pushkey = credentials.pushkey; }
         else {
             if (pushkeys) { this.pushkey = pushkeys.prowlkey; }
@@ -67,45 +62,9 @@ module.exports = function(RED) {
             }
         });
     }
-    RED.nodes.registerType("prowl",ProwlNode);
-
-    var querystring = require('querystring');
-
-    RED.httpAdmin.get('/prowl/:id',function(req,res) {
-        var credentials = RED.nodes.getCredentials(req.params.id);
-        if (credentials) {
-            res.send(JSON.stringify({hasPassword:(credentials.pushkey&&credentials.pushkey!=="")}));
+    RED.nodes.registerType("prowl",ProwlNode,{
+        credentials: {
+            pushkey: {type: "password"}
         }
-        else if (pushkeys && pushkeys.prowlkey) {
-            RED.nodes.addCredentials(req.params.id,{pushkey:pushkeys.prowlkey,global:true});
-            credentials = RED.nodes.getCredentials(req.params.id);
-            res.send(JSON.stringify({hasPassword:(credentials.pushkey&&credentials.pushkey!==""),global:credentials.global}));
-        }
-        else {
-            res.send(JSON.stringify({}));
-        }
-    });
-
-    RED.httpAdmin.delete('/prowl/:id',function(req,res) {
-        RED.nodes.deleteCredentials(req.params.id);
-        res.send(200);
-    });
-
-    RED.httpAdmin.post('/prowl/: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.pushkey === "") {
-                delete credentials.pushkey;
-            } else {
-                credentials.pushkey = newCreds.pushkey||credentials.pushkey;
-            }
-            RED.nodes.addCredentials(req.params.id,credentials);
-            res.send(200);
-        });
     });
 }

social/prowl/package.json

@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-prowl",
-    "version"       : "0.0.1",
+    "version"       : "0.0.2",
     "description"   : "A Node-RED node to send alerts via Prowl",
     "dependencies"  : {
         "node-prowl"   : "0.1.7"