Update all nodes to credentials system and auth middleware

social/xmpp/92-xmpp.html

@@ -1,5 +1,5 @@
 <!--
-  Copyright 2013,2014 IBM Corp.
+  Copyright 2013,2015 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -138,9 +138,8 @@
     </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-tips" id="node-config-cred-tip"><b>Note:</b> Using credentials from global xmppkey.js file.</div>
 </script>
 
 <script type="text/javascript">
@@ -151,44 +150,12 @@
             port: {value:5222,required:true,validate:RED.validators.number()},
             nickname: {}
         },
+        credentials: {
+            user: {type:"text"},
+            password: {type: "password"}
+        },
         label: function() {
             return (this.nickname?this.nickname+"@":"")+this.server+":"+this.port;
-        },
-        oneditprepare: function() {
-            $.getJSON('xmpp-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: 'xmpp-server/'+this.id,
-                type: 'POST',
-                data: credentials,
-                success: function(result){}
-            });
-        },
-        ondelete: function() {
-            $.ajax({
-                url: 'xmpp-server/'+this.id,
-                type: 'DELETE',
-                success: function(result) {}
-            });
         }
     });
 </script>

social/xmpp/92-xmpp.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013,2014 IBM Corp.
+ * Copyright 2013,2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,56 +26,19 @@ function XMPPServerNode(n) {
     this.server = n.server;
     this.port = n.port;
     this.nickname = n.nickname;
-    var credentials = RED.nodes.getCredentials(n.id);
+    var credentials = this.credentials;
     if (credentials) {
         this.username = credentials.user;
         this.password = credentials.password;
     }
 }
-RED.nodes.registerType("xmpp-server",XMPPServerNode);
-
-var querystring = require('querystring');
-
-RED.httpAdmin.get('/xmpp-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 if (xmppkey && xmppkey.jid && xmppkey.password) {
-        RED.nodes.addCredentials(req.params.id,{user:xmppkey.jid, password:xmppkey.password, global:true});
-        credentials = RED.nodes.getCredentials(req.params.id);
-        res.send(JSON.stringify({user:credentials.user,global:credentials.global,hasPassword:(credentials.password&&credentials.password!=="")}));
-    } else {
-        res.send(JSON.stringify({}));
+RED.nodes.registerType("xmpp-server",XMPPServerNode,{
+    credentials: {
+        user: {type:"text"},
+        password: {type: "password"}
     }
 });
 
-RED.httpAdmin.delete('/xmpp-server/:id',function(req,res) {
-    RED.nodes.deleteCredentials(req.params.id);
-    res.send(200);
-});
-
-RED.httpAdmin.post('/xmpp-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 XmppInNode(n) {

social/xmpp/package.json

@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-xmpp",
-    "version"       : "0.0.2",
+    "version"       : "0.0.3",
     "description"   : "A Node-RED node to talk to an XMPP server",
     "dependencies"  : {
         "simple-xmpp"   : "0.1.19"