Merge pull request #1173 from solid/fix/#1171

Fix/#1171

Author: jaxoncreed

lib/resource-mapper.js

@@ -42,7 +42,7 @@ class ResourceMapper {
   }
 
   // Maps the request for a given resource and representation format to a server file
-  // When searchIndex is true and the URL ends with a '/', indexFilename will be matched.
+  // When searchIndex is true and the URL ends with a '/', and contentType includes 'text/html' indexFilename will be matched.
   async mapUrlToFile ({ url, contentType, createIfNotExists, searchIndex = true }) {
     let fullPath = this.getFullPath(url)
     let isIndex = searchIndex && fullPath.endsWith('/')
@@ -53,7 +53,9 @@ class ResourceMapper {
       if (createIfNotExists && contentType !== this._indexContentType) {
         throw new Error(`Index file needs to have ${this._indexContentType} as content type`)
       }
-      fullPath += this._indexFilename
+      if (contentType && contentType.includes(this._indexContentType)) {
+        fullPath += this._indexFilename
+      }
     }
     // Create the path for a new file
     if (createIfNotExists) {
@@ -69,15 +71,7 @@ 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) : ''
-      // Do not match with html if the content type won't allow it
-      if (
-        contentType &&
-        !(contentType.includes('text/html') || contentType.includes('*/*')) &&
-        match === this._indexFilename
-      ) {
-        match = ''
-      }
+      let match = searchIndex ? await this._getMatchingFile(folder, filename, isIndex, contentType) : ''
       if (match === undefined) {
         // Error if no match was found,
         // unless the URL ends with a '/',
@@ -95,13 +89,13 @@ class ResourceMapper {
     return { path, contentType: contentType || this._defaultContentType }
   }
 
-  async _getMatchingFile (folder, filename, isIndex) {
+  async _getMatchingFile (folder, filename, isIndex, contentType) {
     const files = await this._readdir(folder)
     // Search for files with the same name (disregarding a dollar extension)
     if (!isIndex) {
       return files.find(f => this._removeDollarExtension(f) === filename)
     // Check if the index file exists
-    } else if (files.includes(this._indexFilename)) {
+    } else if (files.includes(this._indexFilename) && contentType && contentType.includes(this._indexContentType)) {
       return this._indexFilename
     }
   }

test/integration/http-test.js

@@ -165,7 +165,8 @@ describe('HTTP APIs', function () {
 
     it('should have set Link as resource on a implicit index page', function (done) {
       server.options('/sampleContainer/')
-        .expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Resource>; rel="type"/)
+        .expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#BasicContainer>; rel="type"/)
+        .expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Container>; rel="type"/)
         .end(done)
     })
 

test/unit/resource-mapper-test.js

@@ -239,7 +239,8 @@ describe('ResourceMapper', () => {
 
     itMapsUrl(mapper, 'a URL ending with a slash when index.html is available',
       {
-        url: 'http://localhost/space/'
+        url: 'http://localhost/space/',
+        contentType: 'text/html'
       },
       [
         `${rootPath}space/index.html`,