Support Express request objects in ResourceMapper.

Author: RubenVerborgh

lib/resource-mapper.js

@@ -81,14 +81,29 @@ class ResourceMapper {
 
   // Determine the full file path corresponding to a URL
   _getFullPath (url) {
-    const { pathname, hostname } = typeof url === 'string' ? URL.parse(url) : url
+    const { pathname, hostname } = this._parseUrl(url)
     const fullPath = decodeURIComponent(`${this.getBasePath(hostname)}${pathname}`)
     if (fullPath.indexOf('/..') >= 0) {
       throw new Error('Disallowed /.. segment in URL')
     }
     return fullPath
   }
 
+  // Parses a URL into a hostname and pathname
+  _parseUrl (url) {
+    // URL specified as string
+    if (typeof url === 'string') {
+      return URL.parse(url)
+    }
+    // URL specified as Express request object
+    if (!url.pathname && url.path) {
+      const { hostname, path } = url
+      return { hostname, pathname: path.replace(/[?#].*/, '') }
+    }
+    // URL specified as object
+    return url
+  }
+
   // Gets the expected content type based on the extension of the path
   _getContentTypeByExtension (path) {
     const extension = /\.([^/.]+)$/.exec(path)

test/unit/resource-mapper-test.js

@@ -306,6 +306,34 @@ describe('ResourceMapper', () => {
         contentType: 'text/html'
       })
 
+    itMapsUrl(mapper, 'a URL with a host specified as a URL object',
+      {
+        url: {
+          hostname: 'example.org',
+          path: '/space/foo.html'
+        },
+        contentType: 'text/html',
+        createIfNotExists: true
+      },
+      {
+        path: `${rootPath}example.org/space/foo.html`,
+        contentType: 'text/html'
+      })
+
+    itMapsUrl(mapper, 'a URL with a host specified as an Express request object',
+      {
+        url: {
+          hostname: 'example.org',
+          pathname: '/space/foo.html'
+        },
+        contentType: 'text/html',
+        createIfNotExists: true
+      },
+      {
+        path: `${rootPath}example.org/space/foo.html`,
+        contentType: 'text/html'
+      })
+
     itMapsUrl(mapper, 'a URL with a host with a port',
       {
         url: 'http://example.org:3000/space/foo.html',