Rename getBasePath into getBaseFilePath.

Author: RubenVerborgh

lib/handlers/get.js

@@ -204,7 +204,7 @@ function hasReadPermissions (file, req, res, callback) {
     return callback(true)
   }
 
-  const root = ldp.resourceMapper.getBasePath(req.hostname)
+  const root = ldp.resourceMapper.getBaseFilePath(req.hostname)
   const relativePath = '/' + _path.relative(root, file)
   res.locals.path = relativePath
   allow('Read')(req, res, err => callback(!err))

lib/models/account-manager.js

@@ -130,7 +130,8 @@ class AccountManager {
    * @return {string}
    */
   accountDirFor (accountName) {
-    return this.store.resourceMapper.getBasePath(url.parse(this.accountUriFor(accountName)).hostname)
+    const { hostname } = url.parse(this.accountUriFor(accountName))
+    return this.store.resourceMapper.getBaseFilePath(hostname)
   }
 
   /**

lib/resource-mapper.js

@@ -129,7 +129,7 @@ class ResourceMapper {
   }
 
   // Gets the base file path for the given hostname
-  getBasePath (hostname) {
+  getBaseFilePath (hostname) {
     return !this._includeHost ? this._rootPath : `${this._rootPath}/${hostname}`
   }
 
@@ -148,7 +148,7 @@ class ResourceMapper {
   // Determine the full file path corresponding to a URL
   _getFilePath (url) {
     const { pathname, hostname } = this._parseUrl(url)
-    const fullFilePath = decodeURIComponent(`${this.getBasePath(hostname)}${pathname}`)
+    const fullFilePath = `${this.getBaseFilePath(hostname)}${decodeURIComponent(pathname)}`
     if (fullFilePath.indexOf('/..') >= 0) {
       throw new Error('Disallowed /.. segment in URL')
     }

lib/server-config.js

@@ -60,7 +60,7 @@ function ensureDirCopyExists (fromDir, toDir) {
  */
 async function ensureWelcomePage (argv) {
   const { resourceMapper, templates, server, host } = argv
-  const serverRootDir = resourceMapper.getBasePath(host.hostname)
+  const serverRootDir = resourceMapper.getBaseFilePath(host.hostname)
   const existingIndexPage = path.join(serverRootDir, 'index.html')
   const packageData = require('../package.json')