Compare commits

..

5 Commits

Author SHA1 Message Date
Nick O'Leary
d5b424910f Merge branch 'dev' into Fix-join-to-ignore-parts-in-manual-mode 2024-03-07 16:05:41 +00:00
Nick O'Leary
d94d13737f Merge pull request #4572 from kevinGodell/dev
let settings.httpNodeAuth accept single middleware or array of middlewares
2024-03-07 15:48:12 +00:00
Nick O'Leary
b1fa4918e3 Merge pull request #4386 from node-red/make-split/join-more-flexible
let split node specify property to split on, and join auto join correctly
2024-03-07 15:47:08 +00:00
Kevin Godell
74efaa3c2d let settings.httpNodeAuth accept single middleware or array of middlewares to replace built-in basic-auth middleware at top level of RED.httpNode 2024-02-19 16:42:14 -06:00
Dave Conway-Jones
10ce681d46 Fix join node to ignore parts in manual mode
to fix #1957
2023-11-01 13:59:09 +00:00
2 changed files with 17 additions and 1 deletions

View File

@@ -337,6 +337,7 @@ module.exports = function(RED) {
}
});
}
function reduceAndSendGroup(node, group, done) {
var is_right = node.reduce_right;
var flag = is_right ? -1 : 1;
@@ -610,6 +611,15 @@ module.exports = function(RED) {
return;
}
if (node.mode === 'custom' && msg.hasOwnProperty('parts')) {
if (msg.parts.hasOwnProperty('parts')) {
msg.parts = { parts: msg.parts.parts };
}
else {
delete msg.parts;
}
}
var payloadType;
var propertyKey;
var targetCount;

View File

@@ -415,9 +415,15 @@ httpsPromise.then(function(startupHttps) {
if (settings.httpAdminRoot !== false) {
app.use(settings.httpAdminRoot,RED.httpAdmin);
}
if (settings.httpNodeRoot !== false && settings.httpNodeAuth) {
app.use(settings.httpNodeRoot,basicAuthMiddleware(settings.httpNodeAuth.user,settings.httpNodeAuth.pass));
if (typeof settings.httpNodeAuth === "function" || Array.isArray(settings.httpNodeAuth)) {
app.use(settings.httpNodeRoot, settings.httpNodeAuth);
} else {
app.use(settings.httpNodeRoot, basicAuthMiddleware(settings.httpNodeAuth.user, settings.httpNodeAuth.pass));
}
}
if (settings.httpNodeRoot !== false) {
app.use(settings.httpNodeRoot,RED.httpNode);
}