Merge remote commits

Author: kjetilk

lib/handlers/allow.js

@@ -39,11 +39,11 @@ function allow (mode) {
         origin: req.get('origin'),
         host: req.protocol + '://' + req.get('host'),
         fetch: fetchFromLdp(mapper, ldp),
-        fetchGraph: (uri, contentType) => {
+        fetchGraph: (uri, options) => {
           // first try loading from local fs
-          return ldp.getGraph(uri, contentType)
+          return ldp.getGraph(uri, options.contentType)
             // failing that, fetch remote graph
-            .catch(() => ldp.fetchGraph(uri, contentType))
+            .catch(() => ldp.fetchGraph(uri, options))
         },
         suffix: ldp.suffixAcl,
         strictOrigin: ldp.strictOrigin

lib/ldp.js

@@ -309,11 +309,12 @@ class LDP {
    *   ```
    *
    * @param uri {string} Fully qualified uri of the request.
-   * @param [contentType] {string}
+   *
+   * @param [options] {object} Options hashmap, passed through to fetchGraph
    *
    * @return {Promise<Graph>}
    */
-  async fetchGraph (uri, contentType = DEFAULT_CONTENT_TYPE) {
+  async fetchGraph (uri, options) {
     const response = await fetch(uri)
     if (!response.ok) {
       const error = new Error(
@@ -323,6 +324,9 @@ class LDP {
       throw error
     }
     const body = await response.text()
+
+    const contentType = options.contentType || DEFAULT_CONTENT_TYPE
+
     return promisify(parse)(body, uri, contentType)
   }