From d0ff3621c248d5d486a8ad2b4385bc53d8fd2d88 Mon Sep 17 00:00:00 2001
From: Darrell Taylor <darrell@Darrells-MBP.aircard>
Date: Thu, 22 Oct 2015 19:00:03 +0100
Subject: [PATCH 1/5] Username and password server credentials.  Specifically
 to allow connection to slack IRC.

---
 social/irc/91-irc.html | 16 +++++++++++++++-
 social/irc/91-irc.js   |  6 ++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/social/irc/91-irc.html b/social/irc/91-irc.html
index bbc5ad6c..6260a0f7 100644
--- a/social/irc/91-irc.html
+++ b/social/irc/91-irc.html
@@ -200,6 +200,14 @@
         <label for="node-config-input-nickname"><i class="fa fa-user"></i> <span data-i18n="irc.label.nickname"></span></label>
         <input type="text" id="node-config-input-nickname">
     </div>
+    <div class="form-row">
+        <label for="node-config-input-username"><i class="fa fa-user"></i> <span data-i18n="irc.label.username"></span></label>
+        <input type="text" id="node-config-input-username">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-password"><i class="fa fa-lock"></i> <span data-i18n="irc.label.password"></span></label>
+        <input type="text" id="node-config-input-password">
+    </div>
 </script>
 
 <script type="text/javascript">
@@ -210,7 +218,13 @@
             port: {value:"6667"},
             ssl: {value:false},
             cert: {value:false},
-            nickname: {value:"",required:true}
+            nickname: {value:"",required:true},
+            username: {value:""},
+            password: {value:""}
+        },
+        credentials: {
+            username: {type:"text"},
+            password: {type:"password"}
         },
         label: function() {
             return this.server;
diff --git a/social/irc/91-irc.js b/social/irc/91-irc.js
index b4a7d63c..1993aece 100644
--- a/social/irc/91-irc.js
+++ b/social/irc/91-irc.js
@@ -27,6 +27,8 @@ module.exports = function(RED) {
         this.cert = n.cert || false;
         this.channel = n.channel;
         this.nickname = n.nickname;
+        this.username = n.username;
+        this.password = n.password;
         this.lastseen = 0;
         this.ircclient = null;
         this.on("close", function() {
@@ -49,7 +51,7 @@ module.exports = function(RED) {
         if (node.serverConfig.ircclient === null) {
             node.log(RED._("irc.errors.connect")+": "+node.serverConfig.server);
             node.status({fill:"grey",shape:"dot",text:"node-red:common.status.connecting"});
-            var options = {autoConnect:true,autoRejoin:false,floodProtection:true,secure:node.serverConfig.ssl,selfSigned:node.serverConfig.cert,port:node.serverConfig.port,retryDelay:20000};
+            var options = {autoConnect:true,autoRejoin:false,floodProtection:true,secure:node.serverConfig.ssl,selfSigned:node.serverConfig.cert,port:node.serverConfig.port,retryDelay:20000,userName:node.serverConfig.username,password:node.serverConfig.password};
             node.serverConfig.ircclient = new irc.Client(node.serverConfig.server, node.serverConfig.nickname, options);
             node.serverConfig.ircclient.setMaxListeners(0);
             node.serverConfig.ircclient.addListener('error', function(message) {
@@ -184,7 +186,7 @@ module.exports = function(RED) {
         if (node.serverConfig.ircclient === null) {
             node.log(RED._("irc.errors.connect")+": "+node.serverConfig.server);
             node.status({fill:"grey",shape:"dot",text:"node-red:common.status.connecting"});
-            var options = {autoConnect:true,autoRejoin:false,floodProtection:true,secure:node.serverConfig.ssl,selfSigned:node.serverConfig.cert,port:node.serverConfig.port,retryDelay:20000};
+            var options = {autoConnect:true,autoRejoin:false,floodProtection:true,secure:node.serverConfig.ssl,selfSigned:node.serverConfig.cert,port:node.serverConfig.port,retryDelay:20000,userName:node.serverConfig.username,password:node.serverConfig.password};
             node.serverConfig.ircclient = new irc.Client(node.serverConfig.server, node.serverConfig.nickname, options);
             node.serverConfig.ircclient.setMaxListeners(0);
             node.serverConfig.ircclient.addListener('error', function(message) {

From 41f397add77739331ed1a5bc5708ecd805daa406 Mon Sep 17 00:00:00 2001
From: Darrell Taylor <git@darrelltaylor.com>
Date: Fri, 30 Oct 2015 18:34:35 +0000
Subject: [PATCH 2/5] =?UTF-8?q?moved=20username=20and=20password=20into=20?=
 =?UTF-8?q?credentials,=20and=20upped=20the=20version=20of=20irc=20as=20ss?=
 =?UTF-8?q?l=20didn=E2=80=99t=20work=20with=20the=20older=20version.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 social/irc/91-irc.html               |  8 +++++---
 social/irc/91-irc.js                 | 24 +++++++++++++++++++-----
 social/irc/locales/en-US/91-irc.json |  6 ++++--
 social/irc/package.json              |  2 +-
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/social/irc/91-irc.html b/social/irc/91-irc.html
index 6260a0f7..9dc209d3 100644
--- a/social/irc/91-irc.html
+++ b/social/irc/91-irc.html
@@ -92,6 +92,10 @@
             ircserver: {type:"irc-server", required:true},
             channel: {value:"",required:true,validate:RED.validators.regex(/^#/)}
         },
+        credentials: {
+          username: {type:"text"},
+          password: {type:"password"}
+        },
         color:"Silver",
         inputs:0,
         outputs:2,
@@ -218,9 +222,7 @@
             port: {value:"6667"},
             ssl: {value:false},
             cert: {value:false},
-            nickname: {value:"",required:true},
-            username: {value:""},
-            password: {value:""}
+            nickname: {value:"",required:true}
         },
         credentials: {
             username: {type:"text"},
diff --git a/social/irc/91-irc.js b/social/irc/91-irc.js
index 1993aece..2fb6f617 100644
--- a/social/irc/91-irc.js
+++ b/social/irc/91-irc.js
@@ -18,6 +18,7 @@ module.exports = function(RED) {
     "use strict";
     var irc = require("irc");
 
+
     // The Server Definition - this opens (and closes) the connection
     function IRCServerNode(n) {
         RED.nodes.createNode(this,n);
@@ -27,8 +28,6 @@ module.exports = function(RED) {
         this.cert = n.cert || false;
         this.channel = n.channel;
         this.nickname = n.nickname;
-        this.username = n.username;
-        this.password = n.password;
         this.lastseen = 0;
         this.ircclient = null;
         this.on("close", function() {
@@ -37,8 +36,23 @@ module.exports = function(RED) {
                 this.ircclient.disconnect();
             }
         });
+
+        this.username = null;
+        this.password = null;
+        if (this.credentials && this.credentials.hasOwnProperty("username")) {
+            this.username = this.credentials.username;
+        }
+        if (this.credentials && this.credentials.hasOwnProperty("password")) {
+            this.password = this.credentials.password;
+        }
+
     }
-    RED.nodes.registerType("irc-server",IRCServerNode);
+    RED.nodes.registerType("irc-server",IRCServerNode, {
+          credentials: {
+               username: {type:"text"},
+               password: {type:"password"}
+           }
+    });
 
 
     // The Input Node
@@ -49,7 +63,7 @@ module.exports = function(RED) {
         this.channel = n.channel || this.serverConfig.channel;
         var node = this;
         if (node.serverConfig.ircclient === null) {
-            node.log(RED._("irc.errors.connect")+": "+node.serverConfig.server);
+            node.log(RED._("irc.errors.connect")+": "+node.serverConfig.server+" "+node.serverConfig.username+" "+node.serverConfig.ssl);
             node.status({fill:"grey",shape:"dot",text:"node-red:common.status.connecting"});
             var options = {autoConnect:true,autoRejoin:false,floodProtection:true,secure:node.serverConfig.ssl,selfSigned:node.serverConfig.cert,port:node.serverConfig.port,retryDelay:20000,userName:node.serverConfig.username,password:node.serverConfig.password};
             node.serverConfig.ircclient = new irc.Client(node.serverConfig.server, node.serverConfig.nickname, options);
@@ -186,7 +200,7 @@ module.exports = function(RED) {
         if (node.serverConfig.ircclient === null) {
             node.log(RED._("irc.errors.connect")+": "+node.serverConfig.server);
             node.status({fill:"grey",shape:"dot",text:"node-red:common.status.connecting"});
-            var options = {autoConnect:true,autoRejoin:false,floodProtection:true,secure:node.serverConfig.ssl,selfSigned:node.serverConfig.cert,port:node.serverConfig.port,retryDelay:20000,userName:node.serverConfig.username,password:node.serverConfig.password};
+            var options = {autoConnect:true,autoRejoin:false,floodProtection:true,secure:node.serverConfig.ssl,selfSigned:node.serverConfig.cert,port:node.serverConfig.port,retryDelay:20000,userName:node.username,password:node.password};
             node.serverConfig.ircclient = new irc.Client(node.serverConfig.server, node.serverConfig.nickname, options);
             node.serverConfig.ircclient.setMaxListeners(0);
             node.serverConfig.ircclient.addListener('error', function(message) {
diff --git a/social/irc/locales/en-US/91-irc.json b/social/irc/locales/en-US/91-irc.json
index 233df59f..c935f2e2 100644
--- a/social/irc/locales/en-US/91-irc.json
+++ b/social/irc/locales/en-US/91-irc.json
@@ -7,7 +7,9 @@
             "port": "Port",
             "ssl": "Use Secure SSL connection?",
             "self": "Allow self-signed certificates?",
-            "nickname": "Nickname"
+            "nickname": "Nickname",
+            "username": "Server username",
+            "password": "Server password"
         },
         "payload": "Send payload to channel(s)",
         "topic": "Use msg.topic to set nickname or channel(s)",
@@ -36,4 +38,4 @@
             "topicnotset": "msg.topic not set"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/social/irc/package.json b/social/irc/package.json
index 7b82763d..fc1d6f41 100644
--- a/social/irc/package.json
+++ b/social/irc/package.json
@@ -3,7 +3,7 @@
     "version"       : "0.0.3",
     "description"   : "A Node-RED node to talk to an IRC server",
     "dependencies"  : {
-        "irc"   : "0.3.11"
+        "irc"   : "~0.4.0"
     },
     "repository" : {
         "type":"git",

From bb43dd31a01c738bb9e43d5934e3d227cf389ea7 Mon Sep 17 00:00:00 2001
From: Darrell Taylor <git@darrelltaylor.com>
Date: Fri, 30 Oct 2015 18:47:13 +0000
Subject: [PATCH 3/5] username and password for irc-out as well

---
 social/irc/91-irc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/social/irc/91-irc.js b/social/irc/91-irc.js
index 2fb6f617..ce95650d 100644
--- a/social/irc/91-irc.js
+++ b/social/irc/91-irc.js
@@ -200,7 +200,7 @@ module.exports = function(RED) {
         if (node.serverConfig.ircclient === null) {
             node.log(RED._("irc.errors.connect")+": "+node.serverConfig.server);
             node.status({fill:"grey",shape:"dot",text:"node-red:common.status.connecting"});
-            var options = {autoConnect:true,autoRejoin:false,floodProtection:true,secure:node.serverConfig.ssl,selfSigned:node.serverConfig.cert,port:node.serverConfig.port,retryDelay:20000,userName:node.username,password:node.password};
+            var options = {autoConnect:true,autoRejoin:false,floodProtection:true,secure:node.serverConfig.ssl,selfSigned:node.serverConfig.cert,port:node.serverConfig.port,retryDelay:20000,userName:node.serverConfig.username,password:node.serverConfig.password};
             node.serverConfig.ircclient = new irc.Client(node.serverConfig.server, node.serverConfig.nickname, options);
             node.serverConfig.ircclient.setMaxListeners(0);
             node.serverConfig.ircclient.addListener('error', function(message) {

From c7e1a865020b03fa107a2bcfa3b4ecfd7892cab1 Mon Sep 17 00:00:00 2001
From: Darrell Taylor <git@darrelltaylor.com>
Date: Sun, 1 Nov 2015 12:39:07 +0000
Subject: [PATCH 4/5] Only set username and password in the irc options if they
 are actually set in serverConfig

---
 social/irc/91-irc.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/social/irc/91-irc.js b/social/irc/91-irc.js
index ce95650d..48a2287c 100644
--- a/social/irc/91-irc.js
+++ b/social/irc/91-irc.js
@@ -65,7 +65,9 @@ module.exports = function(RED) {
         if (node.serverConfig.ircclient === null) {
             node.log(RED._("irc.errors.connect")+": "+node.serverConfig.server+" "+node.serverConfig.username+" "+node.serverConfig.ssl);
             node.status({fill:"grey",shape:"dot",text:"node-red:common.status.connecting"});
-            var options = {autoConnect:true,autoRejoin:false,floodProtection:true,secure:node.serverConfig.ssl,selfSigned:node.serverConfig.cert,port:node.serverConfig.port,retryDelay:20000,userName:node.serverConfig.username,password:node.serverConfig.password};
+            var options = {autoConnect:true,autoRejoin:false,floodProtection:true,secure:node.serverConfig.ssl,selfSigned:node.serverConfig.cert,port:node.serverConfig.port,retryDelay:20000};
+            if (node.serverConfig.username !== null) { options["userName"] = node.serverConfig.username }
+            if (node.serverConfig.password !== null) { options["password"] = node.serverConfig.password }
             node.serverConfig.ircclient = new irc.Client(node.serverConfig.server, node.serverConfig.nickname, options);
             node.serverConfig.ircclient.setMaxListeners(0);
             node.serverConfig.ircclient.addListener('error', function(message) {
@@ -200,7 +202,9 @@ module.exports = function(RED) {
         if (node.serverConfig.ircclient === null) {
             node.log(RED._("irc.errors.connect")+": "+node.serverConfig.server);
             node.status({fill:"grey",shape:"dot",text:"node-red:common.status.connecting"});
-            var options = {autoConnect:true,autoRejoin:false,floodProtection:true,secure:node.serverConfig.ssl,selfSigned:node.serverConfig.cert,port:node.serverConfig.port,retryDelay:20000,userName:node.serverConfig.username,password:node.serverConfig.password};
+            var options = {autoConnect:true,autoRejoin:false,floodProtection:true,secure:node.serverConfig.ssl,selfSigned:node.serverConfig.cert,port:node.serverConfig.port,retryDelay:20000};
+            if (node.serverConfig.username !== null) { options['userName'] = node.serverConfig.username }
+            if (node.serverConfig.password !== null) { options['password'] = node.serverConfig.password }
             node.serverConfig.ircclient = new irc.Client(node.serverConfig.server, node.serverConfig.nickname, options);
             node.serverConfig.ircclient.setMaxListeners(0);
             node.serverConfig.ircclient.addListener('error', function(message) {

From e4a9bca7d0fabe53b23147bc7832437c7579879f Mon Sep 17 00:00:00 2001
From: Darrell Taylor <git@darrelltaylor.com>
Date: Sun, 1 Nov 2015 12:40:07 +0000
Subject: [PATCH 5/5] bump package version

---
 social/irc/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/social/irc/package.json b/social/irc/package.json
index fc1d6f41..9e68f73f 100644
--- a/social/irc/package.json
+++ b/social/irc/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-irc",
-    "version"       : "0.0.3",
+    "version"       : "0.0.4",
     "description"   : "A Node-RED node to talk to an IRC server",
     "dependencies"  : {
         "irc"   : "~0.4.0"