From 1f0ab0937d7c796fd096782a65b3b30c04072cbc Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Tue, 24 Sep 2019 21:44:56 +0100
Subject: [PATCH] Add done/complete to email node

and fix .from field
---
 social/email/61-email.js  | 7 ++++---
 social/email/package.json | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/social/email/61-email.js b/social/email/61-email.js
index fcae9f23..4aa19614 100644
--- a/social/email/61-email.js
+++ b/social/email/61-email.js
@@ -75,8 +75,9 @@ module.exports = function(RED) {
         }
         var smtpTransport = nodemailer.createTransport(smtpOptions);
 
-        this.on("input", function(msg) {
+        this.on("input", function(msg, send, done) {
             if (msg.hasOwnProperty("payload")) {
+                send = send || node.send;
                 if (smtpTransport) {
                     node.status({fill:"blue",shape:"dot",text:"email.status.sending"});
                     if (msg.to && node.name && (msg.to !== node.name)) {
@@ -123,6 +124,7 @@ module.exports = function(RED) {
                         } else {
                             node.log(RED._("email.status.messagesent",{response:info.response}));
                             node.status({text:"",response:info.response,msg:{to:msg.to,topic:msg.topic,id:msg._msgid}});
+                            if (done) { done(); }
                         }
                     });
                 }
@@ -208,12 +210,11 @@ module.exports = function(RED) {
             msg.date = mailMessage.date;
             msg.header = {};
             mailMessage.headers.forEach((v, k) => {msg.header[k] = v;});
-
             if (mailMessage.html) { msg.html = mailMessage.html; }
             if (mailMessage.to && mailMessage.to.length > 0) { msg.to = mailMessage.to; }
             if (mailMessage.cc && mailMessage.cc.length > 0) { msg.cc = mailMessage.cc; }
             if (mailMessage.bcc && mailMessage.bcc.length > 0) { msg.bcc = mailMessage.bcc; }
-            if (mailMessage.from && mailMessage.from.length > 0) { msg.from = mailMessage.from[0].address; }
+            if (mailMessage.from && mailMessage.from.value && mailMessage.from.value.length > 0) { msg.from = mailMessage.from.value[0].address; }
             if (mailMessage.attachments) { msg.attachments = mailMessage.attachments; }
             else { msg.attachments = []; }
             node.send(msg); // Propagate the message down the flow
diff --git a/social/email/package.json b/social/email/package.json
index 5a4a69a8..dae57898 100644
--- a/social/email/package.json
+++ b/social/email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-email",
-  "version": "1.6.3",
+  "version": "1.7.0",
   "description": "Node-RED nodes to send and receive simple emails",
   "dependencies": {
     "imap": "^0.8.19",