Replaced private method getContentTypeExtension with public mapFileToUrl

Author: megoth

lib/handlers/get.js

@@ -83,7 +83,7 @@ function handler (req, res, next) {
         rootPath: ldp.root,
         includeHost: ldp.multiuser
       })
-      contentType = mapper._getContentTypeByExtension(path)
+      contentType = mapper.mapFileToUrl({ path }).contentType
       res.setHeader('Content-Type', contentType)
       res.status(200).send('OK')
       return next()

lib/resource-mapper.js

@@ -56,11 +56,11 @@ class ResourceMapper {
   }
 
   // Maps a given server file to a URL
-  async mapFileToUrl ({ path, hostname }) {
-    // Determine the URL by chopping off everything after the dollar sign
+  mapFileToUrl ({ path, hostname }) {
     const pathname = this._removeDollarExtension(path.substring(this._rootPath.length))
     const url = `${this.getBaseUrl(hostname)}${encodeURI(pathname)}`
-    return { url, contentType: this._getContentTypeByExtension(path) }
+    const contentType = this._getContentTypeByExtension(path)
+    return { url, contentType }
   }
 
   // Gets the base file path for the given hostname

test/unit/legacy-resource-mapper-test.js

@@ -239,8 +239,8 @@ function mapsUrl (it, mapper, label, options, expected) {
 }
 
 function mapsFile (it, mapper, label, options, expected) {
-  it(`maps ${label}`, async () => {
-    const actual = await mapper.mapFileToUrl(options)
+  it(`maps ${label}`, () => {
+    const actual = mapper.mapFileToUrl(options)
     expect(actual).to.deep.equal(expected)
   })
 }

test/unit/resource-mapper-test.js

@@ -438,8 +438,8 @@ function mapsUrl (it, mapper, label, options, files, expected) {
 }
 
 function mapsFile (it, mapper, label, options, expected) {
-  it(`maps ${label}`, async () => {
-    const actual = await mapper.mapFileToUrl(options)
+  it(`maps ${label}`, () => {
+    const actual = mapper.mapFileToUrl(options)
     expect(actual).to.deep.equal(expected)
   })
 }