Skip to content

Commit df8e38b

Browse files
author
nicola
committed
removing opts.uri from handlers and acl
1 parent 30dc1b5 commit df8e38b

4 files changed

Lines changed: 20 additions & 12 deletions

File tree

‎acl.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ function allow(mode, req, res) {
3535
for (var i = 0; i < depth.length; i++) {
3636
var pathAcl = S(filepath).endsWith(options.suffixAcl) ?
3737
filepath : filepath + options.suffixAcl;
38-
var pathUri = file.filenameToBaseUri(filepath, options.uri, options.base);
38+
var uri = options.uri || file.uriAbs(req);
39+
var pathUri = file.filenameToBaseUri(filepath, uri, options.base);
3940
relativePath = path.relative(options.base, filepath);
4041

4142
debug("Checking " + accessType + "<" + mode + "> to " +

‎fileStore.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +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+
}
36+
3337
exports.uriToFilename = uriToFilename;
3438
exports.uriToRelativeFilename = uriToRelativeFilename;
3539
exports.filenameToBaseUri = filenameToBaseUri;
40+
exports.uriAbs = uriBase;

‎handlers/get.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ var metaExtension = '.meta';
2222

2323
function get(req, res, includeBody) {
2424
var options = req.app.locals.ldp;
25+
var uri = options.uri || file.uriAbs(req);
2526

2627
// Add request to subscription service
2728
if (('' + req.path).slice(-options.suffixChanges.length) ===
@@ -118,7 +119,7 @@ function get(req, res, includeBody) {
118119
try {
119120
var fileData = fs.readFileSync(match,
120121
{encoding: "utf8"});
121-
var baseUri = file.filenameToBaseUri(match, options.uri, options.base);
122+
var baseUri = file.filenameToBaseUri(match, uri, options.base);
122123
//TODO integrate ACL
123124
if (S(match).endsWith(".ttl") && aclAllow(match)) {
124125
$rdf.parse(fileData, globGraph, baseUri,
@@ -153,7 +154,7 @@ function get(req, res, includeBody) {
153154

154155
function parseLinkedData(turtleData) {
155156
var accept = header.parseAcceptHeader(req);
156-
var baseUri = file.filenameToBaseUri(filename, options.uri, options.base);
157+
var baseUri = file.filenameToBaseUri(filename, uri, options.base);
157158

158159
// Handle Turtle Accept header
159160
if (accept === undefined || accept === null) {
@@ -190,7 +191,7 @@ function get(req, res, includeBody) {
190191

191192
function parseContainer(containerData) {
192193
//Handle other file types
193-
var baseUri = file.filenameToBaseUri(filename, options.uri, options.base);
194+
var baseUri = file.filenameToBaseUri(filename, uri, options.base);
194195
var resourceGraph = $rdf.graph();
195196
try {
196197
$rdf.parse(containerData, resourceGraph, baseUri, 'text/turtle');

‎handlers/post.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,19 @@ function handler(req, res) {
7878
// TODO make sure correct text is selected
7979
var requestText = req.convertedText || req.text;
8080

81-
var resourceBaseUri;
82-
try {
83-
resourceBaseUri = file.filenameToBaseUri(
84-
resourcePath,
85-
options.uri,
86-
options.base);
81+
var uri = options.uri || file.uriAbs(req);
82+
var resourceBaseUri = file.filenameToBaseUri(
83+
resourcePath,
84+
uri,
85+
options.base);
8786

87+
try {
88+
console.log(requestText);
8889
$rdf.parse(
8990
requestText,
9091
resourceGraph,
91-
resourceBaseUri,
92-
'text/turtle');
92+
uri,
93+
contentType);
9394
} catch (parseErr) {
9495
debug("POST -- Error parsing resource: " + parseErr);
9596
container.releaseResourceUri(options, resourcePath);

0 commit comments

Comments
 (0)