Merge pull request #831 from solid/feature/454

Setting contentType for HEAD requests

Author: kjetilk

lib/handlers/get.js

@@ -17,6 +17,7 @@ const translate = require('../utils.js').translate
 const error = require('../http-error')
 
 const RDFs = require('../ldp').RDF_MIME_TYPES
+const LegacyResourceMapper = require('../legacy-resource-mapper')
 
 function handler (req, res, next) {
   const ldp = req.app.locals.ldp
@@ -76,8 +77,18 @@ function handler (req, res, next) {
     // Till here it must exist
     if (!includeBody) {
       debug('HEAD only')
-      res.sendStatus(200)
-      return next()
+      const rootUrl = utils.getBaseUri(req)
+      const mapper = new LegacyResourceMapper({
+        rootUrl,
+        rootPath: ldp.root,
+        includeHost: ldp.multiuser
+      })
+      return mapper.mapFileToUrl({ path }).then(mappedFile => {
+        contentType = mappedFile.contentType
+        res.setHeader('Content-Type', contentType)
+        res.status(200).send('OK')
+        return next()
+      })
     }
 
     // Handle dataBrowser

test/integration/http-test.js

@@ -368,6 +368,23 @@ describe('HTTP APIs', function () {
   })
 
   describe('HEAD API', function () {
+    it('should return content-type turtle by default', function (done) {
+      server.head('/sampleContainer/blank')
+        .expect('Content-Type', 'text/turtle; charset=utf-8')
+        .end(done)
+    })
+    it('should have set content-type for turtle files',
+      function (done) {
+        server.head('/sampleContainer/example1.ttl')
+          .expect('Content-Type', 'text/turtle; charset=utf-8')
+          .end(done)
+      })
+    it('should have set content-type for image files',
+      function (done) {
+        server.head('/sampleContainer/solid.png')
+          .expect('Content-Type', 'image/png; charset=utf-8')
+          .end(done)
+      })
     it('should have Access-Control-Allow-Origin as Origin', function (done) {
       server.head('/sampleContainer/example1.ttl')
         .set('Origin', 'http://example.com')

test/integration/ldp-test.js

@@ -250,7 +250,7 @@ describe('LDP', function () {
         if (err) done(err)
         fs.readdir(path.join(__dirname, '../resources/sampleContainer/'), function (err, expectedFiles) {
           const graph = $rdf.graph()
-          $rdf.parse(data, graph, 'https://server.tld/sampleContainer', 'text/turtle')
+          $rdf.parse(data, graph, 'https://server.tld/sampleContainer/', 'text/turtle')
           const statements = graph.match(null, ns.ldp('contains'), null)
           const files = statements
             .map(s => s.object.value.replace(/.*\//, ''))