Skip to content

Commit deb8235

Browse files
author
nicola
committed
Revert "NOT PROPELY TESTED but fixed the problem with base URI not including options.mount"
This reverts commit 5023db5.
1 parent 5023db5 commit deb8235

5 files changed

Lines changed: 8 additions & 4 deletions

File tree

‎acl.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function allow(mode, req, res) {
3838
for (var i = 0; i < depth.length; i++) {
3939
var pathAcl = S(filepath).endsWith(options.suffixAcl) ?
4040
filepath : filepath + options.suffixAcl;
41-
var uri = req.protocol + '://' + req.get('host') + options.mount ;
41+
var uri = file.uriAbs(req);
4242
var pathUri = file.filenameToBaseUri(filepath, uri, options.root);
4343
relativePath = path.relative(options.root, filepath);
4444

‎fileStore.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ function filenameToBaseUri(filename, uri, base) {
3030
return uri + '/' + uriPath;
3131
}
3232

33+
function uriBase(req) {
34+
return req.protocol + '://' + req.get('host') + (req.baseUrl || '');
35+
}
3336

3437
exports.uriToFilename = uriToFilename;
3538
exports.uriToRelativeFilename = uriToRelativeFilename;
3639
exports.filenameToBaseUri = filenameToBaseUri;
40+
exports.uriAbs = uriBase;

‎handlers/get.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var turtleExtension = '.ttl';
2323

2424
function get(req, res, includeBody) {
2525
var options = req.app.locals.ldp;
26-
var uri = req.protocol + '://' + req.get('host') + options.mount; // URI to mount point only
26+
var uri = file.uriAbs(req);
2727

2828
// Add request to subscription service
2929
if (req.path.slice(-options.suffixChanges.length) ===

‎handlers/patch.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function handler(req, res) {
1818
var filename = file.uriToFilename(req.path, options.root);
1919
var patchContentType = req.get('content-type').split(';')[0].trim(); // Ignore parameters
2020
var targetContentType = mime.lookup(filename);
21-
var targetURI = req.protocol + '://' + req.get('host') + options.mount + req.path;
21+
var targetURI = file.uriAbs(req) + req.path;
2222
var patchURI = targetURI ; // @@@ beware the triples from the patch ending up in the same place
2323
debug("PATCH -- Content-type " + patchContentType + " patching target " + targetContentType + " <" + targetURI + '>');
2424
var targetKB = $rdf.graph();

‎handlers/post.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ function handler(req, res) {
7777
var resourceGraph = $rdf.graph();
7878
// TODO make sure correct text is selected
7979
var requestText = req.convertedText || req.text;
80-
var uri = req.protocol + '://' + req.get('host') + options.mount;
80+
var uri = file.uriAbs(req);
8181
var resourceBaseUri = file.filenameToBaseUri(
8282
resourcePath,
8383
uri,

0 commit comments

Comments
 (0)