frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Make the encode option a boolean value to determine whether to encode

This commit is contained in:
Hiroki Uchikawa 2019-02-01 17:15:07 +09:00
parent 7c6eb7c794
commit f3d2053878
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/node_modules/@node-red/nodes/core/io/21-httprequest.js vendored
View File

@ -161,9 +161,13 @@ module.exports = function(RED) {
// This case clears a cookie for HTTP In/Response nodes. // This case clears a cookie for HTTP In/Response nodes.
// Ignore for this node. // Ignore for this node.
} else if (typeof msg.cookies[name] === 'object') { } else if (typeof msg.cookies[name] === 'object') {
// If the encode option is specified, pass it. if(msg.cookies[name].encode === false){
var options = msg.cookies[name].encode ? {encode: msg.cookies[name].encode} : undefined; // If the encode option is false, the value is not encoded.
opts.jar.setCookie(cookie.serialize(name, msg.cookies[name].value, options), url); opts.jar.setCookie(cookie.serialize(name, msg.cookies[name].value, {encode: String}), url);
} else {
// The value is encoded by encodeURIComponent().
opts.jar.setCookie(cookie.serialize(name, msg.cookies[name].value), url);
}
} else { } else {
opts.jar.setCookie(cookie.serialize(name, msg.cookies[name]), url); opts.jar.setCookie(cookie.serialize(name, msg.cookies[name]), url);
} }

10
test/nodes/core/io/21-httprequest_spec.js
View File

@ -1106,27 +1106,27 @@ describe('HTTP Request Node', function() {
done(err); done(err);
} }
}); });
n1.receive({payload:"foo", cookies:{data:{value:value}}}); n1.receive({payload:"foo", cookies:{data:{value:value, encode:true}}});
}); });
}); });
it('should encode cookie by specified function', function(done) { it('should not encode cookie when encode option is false', function(done) {
var flow = [{id:"n1",type:"http request",wires:[["n2"]],method:"GET",ret:"obj",url:getTestURL('/checkCookie')}, var flow = [{id:"n1",type:"http request",wires:[["n2"]],method:"GET",ret:"obj",url:getTestURL('/checkCookie')},
{id:"n2", type:"helper"}]; {id:"n2", type:"helper"}];
helper.load(httpRequestNode, flow, function() { helper.load(httpRequestNode, flow, function() {
var n1 = helper.getNode("n1"); var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2"); var n2 = helper.getNode("n2");
var value = ',/?:@ &+$#'; var value = '!#$%&\'()*+-./:<>?@[]^_`{|}~';
n2.on("input", function(msg) { n2.on("input", function(msg) {
try { try {
msg.payload.should.have.property('data',encodeURI(value)); msg.payload.should.have.property('data',value);
msg.should.have.property('statusCode',200); msg.should.have.property('statusCode',200);
done(); done();
} catch(err) { } catch(err) {
done(err); done(err);
} }
}); });
n1.receive({payload:"foo", cookies:{data:{value:value,encode:encodeURI}}}); n1.receive({payload:"foo", cookies:{data:{value:value, encode:false}}});
}); });
}); });