ensure batch routing paths are posix (#3138)
This commit is contained in:
committed by
Florent Vilmart
parent
127629d4f7
commit
fbb2b086af
@@ -70,9 +70,9 @@
|
|||||||
"lint": "eslint ./",
|
"lint": "eslint ./",
|
||||||
"build": "babel src/ -d lib/",
|
"build": "babel src/ -d lib/",
|
||||||
"test": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.2.6} MONGODB_STORAGE_ENGINE=mmapv1 NODE_ENV=test TESTING=1 $COVERAGE_OPTION jasmine",
|
"test": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.2.6} MONGODB_STORAGE_ENGINE=mmapv1 NODE_ENV=test TESTING=1 $COVERAGE_OPTION jasmine",
|
||||||
"test:win": "npm run pretest && cross-env NODE_ENV=test TESTING=1 node ./node_modules/jasmine/bin/jasmine.js && npm run posttest",
|
"test:win": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.2.6} MONGODB_STORAGE_ENGINE=mmapv1 NODE_ENV=test TESTING=1 jasmine",
|
||||||
"coverage": "cross-env COVERAGE_OPTION='./node_modules/.bin/istanbul cover' npm test",
|
"coverage": "cross-env COVERAGE_OPTION='./node_modules/.bin/istanbul cover' npm test",
|
||||||
"coverage:win": "npm run pretest && cross-env NODE_ENV=test TESTING=1 node ./node_modules/babel-istanbul/lib/cli.js cover ./node_modules/jasmine/bin/jasmine.js && npm run posttest",
|
"coverage:win": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.2.6} MONGODB_STORAGE_ENGINE=mmapv1 NODE_ENV=test TESTING=1 node ./node_modules/istanbul/lib/cli.js cover ./node_modules/jasmine/bin/jasmine.js",
|
||||||
"start": "node ./bin/parse-server",
|
"start": "node ./bin/parse-server",
|
||||||
"prepublish": "npm run build"
|
"prepublish": "npm run build"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ function makeBatchRoutingPathFunction(originalUrl, serverURL, publicServerURL) {
|
|||||||
Parse.Error.INVALID_JSON,
|
Parse.Error.INVALID_JSON,
|
||||||
'cannot route batch path ' + requestPath);
|
'cannot route batch path ' + requestPath);
|
||||||
}
|
}
|
||||||
return path.join('/', requestPath.slice(apiPrefix.length));
|
return path.posix.join('/', requestPath.slice(apiPrefix.length));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (serverURL && publicServerURL
|
if (serverURL && publicServerURL
|
||||||
@@ -44,7 +44,7 @@ function makeBatchRoutingPathFunction(originalUrl, serverURL, publicServerURL) {
|
|||||||
return function(requestPath) {
|
return function(requestPath) {
|
||||||
// Build the new path by removing the public path
|
// Build the new path by removing the public path
|
||||||
// and joining with the local path
|
// and joining with the local path
|
||||||
let newPath = path.join('/', localPath, '/' , requestPath.slice(publicPath.length));
|
let newPath = path.posix.join('/', localPath, '/' , requestPath.slice(publicPath.length));
|
||||||
// Use the method for local routing
|
// Use the method for local routing
|
||||||
return makeRoutablePath(newPath);
|
return makeRoutablePath(newPath);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user