Fixed content type mismatch at root

Author: jaxoncreed

lib/handlers/get.js

@@ -39,7 +39,8 @@ async function handler (req, res, next) {
     'path': path,
     'includeBody': includeBody,
     'possibleRDFType': possibleRDFType,
-    'range': req.headers.range
+    'range': req.headers.range,
+    'contentType': req.headers.accept
   }
 
   let ret

lib/ldp.js

@@ -329,7 +329,9 @@ class LDP {
   async get (options, searchIndex = true) {
     let path, contentType, stats
     try {
-      ({ path, contentType } = await this.resourceMapper.mapUrlToFile({ url: options, searchIndex }))
+      ({ path, contentType } = await this.resourceMapper.mapUrlToFile({
+        url: options, contentType: options.contentType, searchIndex
+      }))
       stats = await this.stat(path)
     } catch (err) {
       throw error(404, 'Can\'t find file requested: ' + options)

lib/resource-mapper.js

@@ -55,7 +55,6 @@ class ResourceMapper {
       }
       fullPath += this._indexFilename
     }
-
     // Create the path for a new file
     if (createIfNotExists) {
       path = fullPath
@@ -70,7 +69,11 @@ class ResourceMapper {
       const folder = fullPath.substr(0, fullPath.length - filename.length)
 
       // Find a file with the same name (minus the dollar extension)
-      let match = searchIndex ? await this._getMatchingFile(folder, filename, isIndex) : ''
+      let match = searchIndex ? await this._getMatchingFile(folder, filename, isIndex) : '';
+      // Do not match with html if the content type won't allow it
+      if (!(contentType.includes('text/html') || contentType.includes('*/*'))) {
+        match = '';
+      }
       if (match === undefined) {
         // Error if no match was found,
         // unless the URL ends with a '/',