Skip to content

actual fix for issue #43 #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jlank wants to merge 2 commits into
base: master
Choose a base branch
from
Open

actual fix for issue #43 #46

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e2a7e0
reverted slashJoin function, the faulty logic was outside the functio…
jlank Oct 24, 2015
3205362
slashJoin() should only combine p1 & p2 and add a slash if a slash ex…
jlank Oct 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module.exports = function proxyMiddleware(options) {

return function (req, resp, next) {
var url = req.url;

// You can pass the route within the options, as well
if (typeof options.route === 'string') {
if (url === options.route) {
Expand All @@ -32,13 +33,16 @@ module.exports = function proxyMiddleware(options) {

//options for this request
var opts = extend({}, options);
if (url && url.charAt(0) === '?') { // prevent /api/resource/?offset=0
if (url && url.charAt(1) === '?') { // prevent /api/resource/?offset=0 when url === '/?query=param'
if (options.pathname.length > 1 && options.pathname.charAt(options.pathname.length - 1) === '/') {
opts.path = options.pathname.substring(0, options.pathname.length - 1) + url;
} else {
opts.path = options.pathname + url;
} else { // if pathname doesn't have a trailing slash
opts.path = options.pathname + url.substring(1); // discard leading slash in url
}
} else if (url && url.charAt(0) === '?') { // prevent /api/resource/?offset=0 when url === '?query=param'
opts.path = options.pathname + url;
} else if (url) {
if (url.charAt(0) === '/' && url.charAt(1) === '?') url = url.substring(0)
opts.path = slashJoin(options.pathname, url);
} else {
opts.path = options.pathname;
Expand Down Expand Up @@ -119,11 +123,7 @@ function rewriteCookieHosts(existingHeaders, opts, applyTo, req) {
}

function slashJoin(p1, p2) {
var trailing_slash = false;

if (p1.length && p1[p1.length - 1] === '/') { trailing_slash = true; }
if (trailing_slash && p2.length && p2[0] === '/') {p2 = p2.substring(1); }

if (p1.length && p1[p1.length - 1] === '/' && p2.length && p2[0] === '/') {p2 = p2.substring(1); }
return p1 + p2;
}

Expand Down