Skip to content

Commit 9a6a0b8

Browse files
author
deiu
committed
Moved acl and meta Link headers to the generic handler
1 parent 829f549 commit 9a6a0b8

2 files changed

Lines changed: 18 additions & 14 deletions

File tree

‎lib/handlers/get.js‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,6 @@ function get(req, res, includeBody) {
5757
debug('HEAD -- ' + req.originalUrl);
5858
}
5959

60-
// Add ACL and Meta Link in header
61-
var aclLink = utils.getResourceLink(
62-
filename, uri,
63-
ldp.root, ldp.suffixAcl,
64-
ldp.suffixMeta);
65-
66-
var metaLink = utils.getResourceLink(
67-
filename, uri,
68-
ldp.root, ldp.suffixMeta,
69-
ldp.suffixAcl);
70-
71-
header.addLink(res, aclLink, 'acl');
72-
header.addLink(res, metaLink, 'describedBy');
73-
7460
// Get resource or container
7561
ldp.get(filename, uri, includeBody, function(err, data, container) {
7662

‎lib/header.js‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ var path = require('path');
44
var S = require('string');
55
var Negotiator = require('negotiator');
66
var metadata = require('./metadata.js');
7+
var ldp = require('./ldp.js');
78
var utils = require('./utils.js');
89
var ldpVocab = require('./vocab/ldp.js');
910

@@ -30,6 +31,7 @@ function addLinks(res, fileMetadata) {
3031
}
3132

3233
function linksHandler(req, res, next) {
34+
var uri = utils.uriBase(req);
3335
var ldp = req.app.locals.ldp;
3436
var filename = utils.uriToFilename(req.url, ldp.root);
3537

@@ -45,6 +47,22 @@ function linksHandler(req, res, next) {
4547
} else {
4648
fileMetadata.isResource = true;
4749
}
50+
51+
// Add ACL and Meta Link in header
52+
var aclLink = utils.getResourceLink(
53+
filename, uri,
54+
ldp.root, ldp.suffixAcl,
55+
ldp.suffixMeta);
56+
57+
var metaLink = utils.getResourceLink(
58+
filename, uri,
59+
ldp.root, ldp.suffixMeta,
60+
ldp.suffixAcl);
61+
62+
addLink(res, aclLink, 'acl');
63+
addLink(res, metaLink, 'describedBy');
64+
65+
4866
addLinks(res, fileMetadata);
4967
next();
5068
}

0 commit comments

Comments
 (0)