Use ResourceMapper in get#globHandler

Author: rubensworks

lib/handlers/get.js

@@ -5,7 +5,6 @@ const glob = require('glob')
 const _path = require('path')
 const $rdf = require('rdflib')
 const Negotiator = require('negotiator')
-const url = require('url')
 const mime = require('mime-types')
 
 const debug = require('debug')('solid:get')
@@ -143,12 +142,10 @@ async function handler (req, res, next) {
   }
 }
 
-function globHandler (req, res, next) {
+async function globHandler (req, res, next) {
   const ldp = req.app.locals.ldp
-  const root = !ldp.multiuser ? ldp.root : ldp.root + req.hostname + '/'
-  const filename = utils.uriToFilename(req.path, root)
-  const uri = utils.getFullUri(req)
-  const requestUri = url.resolve(uri, req.path)
+  const { path: filename } = await ldp.resourceMapper.mapUrlToFile({ url: req })
+  const requestUri = (await ldp.resourceMapper.mapFileToUrl({ path: filename, hostname: req.hostname })).url
 
   const globOptions = {
     noext: true,
@@ -165,25 +162,23 @@ function globHandler (req, res, next) {
     // Matches found
     const globGraph = $rdf.graph()
 
-    let reqOrigin = utils.getBaseUri(req)
-
     debugGlob('found matches ' + matches)
-    Promise.all(matches.map(match => new Promise((resolve, reject) => {
-      const baseUri = reqOrigin + '/' + match.substr(root.length)
+    Promise.all(matches.map(match => new Promise(async (resolve, reject) => {
+      const baseUri = await ldp.resourceMapper.mapFileToUrl({ path: match, hostname: req.hostname })
       fs.readFile(match, {encoding: 'utf8'}, function (err, fileData) {
         if (err) {
           debugGlob('error ' + err)
           return resolve()
         }
         // Files should have the .ttl extension or be extensionless (also Turtle)
-        if (!/\.ttl$|\/[^.]+$/.test(match)) {
+        if (baseUri.contentType !== 'text/turtle') {
           return resolve()
         }
         // The agent should have Read access to the file
         hasReadPermissions(match, req, res, function (allowed) {
           if (allowed) {
             try {
-              $rdf.parse(fileData, globGraph, baseUri, 'text/turtle')
+              $rdf.parse(fileData, globGraph, baseUri.url, 'text/turtle')
             } catch (parseErr) {
               debugGlob(`error parsing ${match}: ${parseErr}`)
             }