frodovdr/node-red-nodes
1
0
Fork 0
mirror of https://github.com/node-red/node-red-nodes.git synced 2023-10-10 13:36:58 +02:00
Code Issues Releases Wiki Activity

Fix defaulting of email auth value (and linting)

Browse Source
This commit is contained in:
Dave Conway-Jones 2023-03-27 20:34:46 +01:00
parent 9a57958a1e
commit 8320571630
No known key found for this signature in database
GPG Key ID: 1DDB0E91A28C2643
2 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
social/email/61-email.html
View File

@ -127,6 +127,10 @@
return (this.dname)?"node_label_italic":""; return (this.dname)?"node_label_italic":"";
}, },
oneditprepare: function() { oneditprepare: function() {
if (this.authtype === undefined) {
this.authtype = "BASIC";
$("#node-input-authtype").val('BASIC');
}
if (this.credentials.global) { if (this.credentials.global) {
$('#node-tip').show(); $('#node-tip').show();
} else { } else {
@ -335,6 +339,10 @@
}, },
oneditprepare: function() { oneditprepare: function() {
var that = this; var that = this;
if (this.authtype === undefined) {
this.authtype = "BASIC";
$("#node-input-authtype").val('BASIC');
}
if (this.credentials.global) { if (this.credentials.global) {
$('#node-tip').show(); $('#node-tip').show();
} else { } else {

18
social/email/61-email.js
View File

@ -57,7 +57,7 @@ module.exports = function(RED) {
this.error(RED._("email.errors.nouserid")); this.error(RED._("email.errors.nouserid"));
} }
} }
if(this.authtype === "BASIC" ) { if (this.authtype === "BASIC" ) {
if (this.credentials && this.credentials.hasOwnProperty("password")) { if (this.credentials && this.credentials.hasOwnProperty("password")) {
this.password = this.credentials.password; this.password = this.credentials.password;
} else { } else {
@ -89,7 +89,7 @@ module.exports = function(RED) {
tls: {rejectUnauthorized: node.tls} tls: {rejectUnauthorized: node.tls}
} }
if(node.authtype === "BASIC" ) { if (node.authtype === "BASIC" ) {
smtpOptions.auth = { smtpOptions.auth = {
user: node.userid, user: node.userid,
pass: node.password pass: node.password
@ -252,7 +252,7 @@ module.exports = function(RED) {
this.error(RED._("email.errors.nouserid")); this.error(RED._("email.errors.nouserid"));
} }
} }
if(this.authtype === "BASIC" ) { if (this.authtype === "BASIC" ) {
if (this.credentials && this.credentials.hasOwnProperty("password")) { if (this.credentials && this.credentials.hasOwnProperty("password")) {
this.password = this.credentials.password; this.password = this.credentials.password;
} else { } else {
@ -321,10 +321,10 @@ module.exports = function(RED) {
try { try {
node.status({fill:"grey",shape:"dot",text:"node-red:common.status.connecting"}); node.status({fill:"grey",shape:"dot",text:"node-red:common.status.connecting"});
await pop3.connect(); await pop3.connect();
if(node.authtype == "XOAUTH2") { if (node.authtype == "XOAUTH2") {
var value = RED.util.getMessageProperty(msg,node.token); var value = RED.util.getMessageProperty(msg,node.token);
if (value !== undefined) { if (value !== undefined) {
if(node.saslformat) { if (node.saslformat) {
//Make base64 string for access - compatible with outlook365 and gmail //Make base64 string for access - compatible with outlook365 and gmail
saslxoauth2 = Buffer.from("user="+node.userid+"\x01auth=Bearer "+value+"\x01\x01").toString('base64'); saslxoauth2 = Buffer.from("user="+node.userid+"\x01auth=Bearer "+value+"\x01\x01").toString('base64');
} else { } else {
@ -334,7 +334,7 @@ module.exports = function(RED) {
await pop3.command('AUTH', "XOAUTH2"); await pop3.command('AUTH', "XOAUTH2");
await pop3.command(saslxoauth2); await pop3.command(saslxoauth2);
} else if(node.authtype == "BASIC") { } else if (node.authtype == "BASIC") {
await pop3.command('USER', node.userid); await pop3.command('USER', node.userid);
await pop3.command('PASS', node.password); await pop3.command('PASS', node.password);
} }
@ -346,7 +346,7 @@ module.exports = function(RED) {
return; return;
} }
maxMessage = (await pop3.STAT()).split(" ")[0]; maxMessage = (await pop3.STAT()).split(" ")[0];
if(maxMessage>0) { if (maxMessage>0) {
node.status({fill:"blue", shape:"dot", text:"email.status.fetching"}); node.status({fill:"blue", shape:"dot", text:"email.status.fetching"});
while(currentMessage<=maxMessage) { while(currentMessage<=maxMessage) {
try { try {
@ -401,10 +401,10 @@ module.exports = function(RED) {
function checkIMAP(msg,send,done) { function checkIMAP(msg,send,done) {
var tout = (node.repeat > 0) ? node.repeat - 500 : 15000; var tout = (node.repeat > 0) ? node.repeat - 500 : 15000;
var saslxoauth2 = ""; var saslxoauth2 = "";
if(node.authtype == "XOAUTH2") { if (node.authtype == "XOAUTH2") {
var value = RED.util.getMessageProperty(msg,node.token); var value = RED.util.getMessageProperty(msg,node.token);
if (value !== undefined) { if (value !== undefined) {
if(node.saslformat) { if (node.saslformat) {
//Make base64 string for access - compatible with outlook365 and gmail //Make base64 string for access - compatible with outlook365 and gmail
saslxoauth2 = Buffer.from("user="+node.userid+"\x01auth=Bearer "+value+"\x01\x01").toString('base64'); saslxoauth2 = Buffer.from("user="+node.userid+"\x01auth=Bearer "+value+"\x01\x01").toString('base64');
} else { } else {