Removed ldp.getRequestUri, reusing ldp.resourceMapper.resolveUrl instead

Author: megoth

lib/handlers/get.js

@@ -134,15 +134,15 @@ async function globHandler (req, res, next) {
   const ldp = req.app.locals.ldp
   // TODO: This is a hack, that does not check if the target file exists, as this is quite complex with globbing.
   // TODO: Proper support for this is not implemented, as globbing support might be removed in the future.
-  const filename = ldp.resourceMapper._getFullPath(req)
-  const requestUri = await ldp.getRequestUri(filename, req.hostname)
+  const requestUri = await ldp.resourceMapper.resolveUrl(req.hostname, req.path)
 
   const globOptions = {
     noext: true,
     nobrace: true,
     nodir: true
   }
 
+  const filename = ldp.getFullPath(req)
   glob(filename, globOptions, function (err, matches) {
     if (err || matches.length === 0) {
       debugGlob('No files matching the pattern')

lib/handlers/post.js

@@ -57,9 +57,9 @@ async function handler (req, res, next) {
     busboy.on('file', async function (fieldname, file, filename, encoding, mimetype) {
       debug('One file received via multipart: ' + filename)
       const filePath = ldp.resourceMapper._rootPath + path.join(containerPath, filename)
-      const url = await ldp.getRequestUri(filePath, req.hostname)
+      const { url: putUrl } = await ldp.resourceMapper.mapFileToUrl({ path: filePath, hostname: req.hostname })
       try {
-        await ldp.put(url, file, mimetype)
+        await ldp.put(putUrl, file, mimetype)
       } catch (err) {
         busboy.emit('error', err)
       }

lib/handlers/put.js

@@ -37,7 +37,7 @@ async function putAcl (req, res, next) {
   const ldp = req.app.locals.ldp
   const contentType = req.get('content-type')
   const path = ldp.getFullPath(req)
-  const requestUri = await ldp.getRequestUri(path, req.hostname)
+  const requestUri = await ldp.resourceMapper.resolveUrl(req.hostname, path)
   if (ldp.isValidRdf(req.body, requestUri, contentType)) {
     const stream = stringToStream(req.body)
     return putStream(req, res, next, stream)

lib/ldp.js

@@ -467,10 +467,6 @@ class LDP {
     return this.resourceMapper._getFullPath(req)
   }
 
-  async getRequestUri (path, hostname) {
-    return (await this.resourceMapper.mapFileToUrl({ path, hostname })).url
-  }
-
   static mimeTypeIsRdf (mimeType) {
     return RDF_MIME_TYPES.has(mimeType)
   }