Merge fix/1324 with dev

Author: jaxoncreed

lib/ldp.js

@@ -158,7 +158,7 @@ class LDP {
 
     // HACK: the middleware in webid-oidc.js uses body-parser, thus ending the stream of data
     // for JSON bodies. So, the stream needs to be reset
-    if (contentType.includes('application/json')) {
+    if (contentType && contentType.includes('application/json')) {
       stream = intoStream(JSON.stringify(stream.body))
     }
 

lib/resource-mapper.js

@@ -34,7 +34,7 @@ class ResourceMapper {
     this._defaultContentType = defaultContentType
     this._types = { ...types, ...overrideTypes }
     this._indexFilename = indexFilename
-    this._indexContentType = this._getContentTypeByExtension(indexFilename)
+    this._indexContentType = this._getContentTypeFromExtension(indexFilename)
 
     // If the host needs to be replaced on every call, pre-split the root URL
     if (includeHost) {
@@ -82,7 +82,7 @@ class ResourceMapper {
     const url = `${this.resolveUrl(hostname)}${
       pathname.split(pathUtil.sep).map((component) => encodeURIComponent(component)).join('/')
     }`
-    return { url, contentType: this._getContentTypeByExtension(path) }
+    return { url, contentType: this._getContentTypeFromExtension(path) }
   }
 
   // Maps the request for a given resource and representation format to a server file
@@ -97,7 +97,7 @@ class ResourceMapper {
     let isFolder = filePath.endsWith('/')
     let isIndex = searchIndex && filePath.endsWith('/')
 
-    // Create the path for a new ressource
+    // Create the path for a new resource
     let path
     if (createIfNotExists) {
       path = filePath
@@ -109,8 +109,8 @@ class ResourceMapper {
         path += this._indexFilename
       }
       // If the extension is not correct for the content type, append the correct extension
-      if (!isFolder && this._getContentTypeByExtension(path) !== contentType) {
-        path += `$${contentType in extensions ? `.${extensions[contentType][0]}` : '.unknown'}`
+      if (!isFolder) {
+        path = this._addContentTypeExtension(path, contentType)
       }
     // Determine the path of an existing file
     } else {
@@ -139,7 +139,7 @@ class ResourceMapper {
         }
       }
       path = `${folder}${match}`
-      contentType = this._getContentTypeByExtension(match)
+      contentType = this._getContentTypeFromExtension(match)
     }
     return { path, contentType: contentType || this._defaultContentType }
   }
@@ -160,11 +160,25 @@ class ResourceMapper {
   }
 
   // Gets the expected content type based on the extension of the path
-  _getContentTypeByExtension (path) {
+  _getContentTypeFromExtension (path) {
     const extension = /\.([^/.]+)$/.exec(path)
     return extension && this._types[extension[1].toLowerCase()] || this._defaultContentType
   }
 
+  // Appends an extension for the specific content type, if needed
+  _addContentTypeExtension (path, contentType) {
+    // If we would guess the wrong content type from the extension, try appending a better one
+    const contentTypeFromExtension = this._getContentTypeFromExtension(path)
+    if (contentTypeFromExtension !== contentType) {
+      // Some extensions fit multiple content types, so only switch if there's an improvement
+      const newExtension = contentType in extensions ? extensions[contentType][0] : 'unknown'
+      if (this._types[newExtension] !== contentTypeFromExtension) {
+        path += `$.${newExtension}`
+      }
+    }
+    return path
+  }
+
   // Removes possible trailing slashes from a path
   _removeTrailingSlash (path) {
     return path.replace(/\/+$/, '')

test/integration/http-test.js

@@ -559,6 +559,27 @@ describe('HTTP APIs', function () {
         .expect(hasHeader('acl', suffixAcl))
         .expect(201, done)
     })
+    it('should create new resource even if body is empty', function (done) {
+      server.post('/post-tests/')
+        .set('slug', 'post-resource-empty')
+        .set('content-type', 'text/turtle')
+        .expect(hasHeader('describedBy', suffixMeta))
+        .expect(hasHeader('acl', suffixAcl))
+        .expect('location', /.*\.ttl/)
+        .expect(201, done)
+    })
+    it('should error with 415 if the body is empty and no content type is provided', function (done) {
+      server.post('/post-tests/')
+        .set('slug', 'post-resource-empty-fail')
+        .expect(415, done)
+    })
+    it('should error with 415 if the body is provided but there is no content-type header', function (done) {
+      server.post('/post-tests/')
+        .set('slug', 'post-resource-rdf-no-content-type')
+        .send(postRequest1Body)
+        .set('content-type', '')
+        .expect(415, done)
+    })
     it('should create new resource even if no trailing / is in the target',
       function (done) {
         server.post('')

test/unit/resource-mapper-test.js

@@ -119,6 +119,17 @@ describe('ResourceMapper', () => {
         contentType: 'text/n3'
       })
 
+    itMapsUrl(mapper, 'a URL with a file extension having more than one possible content type',
+      {
+        url: 'http://localhost/space/foo.mp3',
+        contentType: 'audio/mp3',
+        createIfNotExists: true
+      },
+      {
+        path: `${rootPath}space/foo.mp3`,
+        contentType: 'audio/mp3'
+      })
+
     // GET/HEAD/POST/DELETE/PATCH base cases
 
     itMapsUrl(mapper, 'a URL of a non-existing file',