Get rid of getRepresentationUrlForResource.

Author: RubenVerborgh

lib/handlers/allow.js

@@ -56,9 +56,15 @@ function allow (mode, checkPermissionsForDirectory) {
     if (mode === 'Read' && (resourcePath === '' || resourcePath === '/')) {
       // This is a hack to make NSS check the ACL for representation that is served for root (if any)
       // See https://github.com/solid/node-solid-server/issues/1063 for more info
-      const representationUrl = await ldp.resourceMapper.getRepresentationUrlForResource(resourceUrl)
-      if (representationUrl.endsWith('index.html')) {
-        // We ONLY want to do this when the representation we return is a HTML file
+      const representationUrl = `${rootUrl}/index.html`
+      let representationPath
+      try {
+        representationPath = await ldp.resourceMapper.mapUrlToFile({ url: representationUrl })
+      } catch (err) {
+      }
+
+      // We ONLY want to do this when the HTML representation exists
+      if (representationPath) {
         req.acl = ACL.createFromLDPAndRequest(representationUrl, ldp, req)
         const representationIsAllowed = await req.acl.can(userId, mode)
         if (representationIsAllowed) {

lib/resource-mapper.js

@@ -100,25 +100,6 @@ class ResourceMapper {
     }
   }
 
-  async getRepresentationUrlForResource (resourceUrl) {
-    let fullFilePath = this._getFilePath(resourceUrl)
-    let isIndex = fullFilePath.endsWith('/')
-
-    // Append index filename if the URL ends with a '/'
-    if (isIndex) {
-      fullFilePath += this._indexFilename
-    }
-
-    // Read all files in the corresponding folder
-    const filename = fullFilePath.substr(fullFilePath.lastIndexOf('/') + 1)
-    const folder = fullFilePath.substr(0, fullFilePath.length - filename.length)
-    const files = await this._readdir(folder)
-
-    // Find a file with the same name (minus the dollar extension)
-    let match = (files.find(f => this._removeDollarExtension(f) === filename || (isIndex && f.startsWith(this._indexFilename + '.'))))
-    return `${resourceUrl}${match || ''}`
-  }
-
   // Maps a given server file to a URL
   async mapFileToUrl ({ path, hostname }) {
     // Determine the URL by chopping off everything after the dollar sign