Use ResourceMapper instead of utils#getBaseUri

Author: rubensworks

lib/handlers/allow.js

@@ -1,9 +1,7 @@
 module.exports = allow
 
 const ACL = require('../acl-checker')
-const utils = require('../utils')
 const debug = require('../debug.js').ACL
-const LegacyResourceMapper = require('../legacy-resource-mapper')
 
 function allow (mode) {
   return async function allowHandler (req, res, next) {
@@ -13,12 +11,7 @@ function allow (mode) {
     }
 
     // Set up URL to filesystem mapping
-    const rootUrl = utils.getBaseUri(req)
-    const mapper = new LegacyResourceMapper({
-      rootUrl,
-      rootPath: ldp.root,
-      includeHost: ldp.multiuser
-    })
+    const rootUrl = ldp.resourceMapper.getBaseUrl(req.hostname)
 
     // Determine the actual path of the request
     // (This is used as an ugly hack to check the ACL status of other resources.)
@@ -44,7 +37,7 @@ function allow (mode) {
     req.acl = new ACL(rootUrl + reqPath, {
       origin: req.get('origin'),
       host: req.protocol + '://' + req.get('host'),
-      fetch: fetchFromLdp(mapper, ldp),
+      fetch: fetchFromLdp(ldp.resourceMapper, ldp),
       fetchGraph: (uri, options) => {
         // first try loading from local fs
         return ldp.getGraph(uri, options.contentType)

lib/handlers/copy.js

@@ -3,7 +3,6 @@ module.exports = handler
 const debug = require('../debug')
 const error = require('../http-error')
 const ldpCopy = require('../ldp-copy')
-const utils = require('../utils')
 const url = require('url')
 
 /**
@@ -20,10 +19,11 @@ async function handler (req, res, next) {
     return next(error(400, 'Source header required'))
   }
   const fromExternal = !!url.parse(copyFrom).hostname
-  const serverRoot = utils.getBaseUri(req)
+  const ldp = req.app.locals.ldp
+  const serverRoot = ldp.resourceMapper.getBaseUrl(req.hostname)
   const copyFromUrl = fromExternal ? copyFrom : serverRoot + copyFrom
   const copyTo = res.locals.path || req.path
-  const { path: copyToPath } = await req.app.locals.ldp.resourceMapper.mapUrlToFile({ url: req })
+  const { path: copyToPath } = await ldp.resourceMapper.mapUrlToFile({ url: req })
   ldpCopy(copyToPath, copyFromUrl, function (err) {
     if (err) {
       let statusCode = err.statusCode || 500

lib/handlers/get.js

@@ -16,7 +16,6 @@ const translate = require('../utils.js').translate
 const error = require('../http-error')
 
 const RDFs = require('../ldp').RDF_MIME_TYPES
-const LegacyResourceMapper = require('../legacy-resource-mapper')
 
 async function handler (req, res, next) {
   const ldp = req.app.locals.ldp
@@ -33,7 +32,7 @@ async function handler (req, res, next) {
 
   // Set live updates
   if (ldp.live) {
-    res.header('Updates-Via', utils.getBaseUri(req).replace(/^http/, 'ws'))
+    res.header('Updates-Via', ldp.resourceMapper.getBaseUrl(req.hostname).replace(/^http/, 'ws'))
   }
 
   debug(req.originalUrl + ' on ' + req.hostname)
@@ -77,13 +76,7 @@ async function handler (req, res, next) {
   // Till here it must exist
   if (!includeBody) {
     debug('HEAD only')
-    const rootUrl = utils.getBaseUri(req)
-    const mapper = new LegacyResourceMapper({
-      rootUrl,
-      rootPath: ldp.root,
-      includeHost: ldp.multiuser
-    })
-    const mappedFile = await mapper.mapFileToUrl({ path })
+    const mappedFile = await ldp.resourceMapper.mapFileToUrl({ path })
     contentType = mappedFile.contentType
     res.setHeader('Content-Type', contentType)
     res.status(200).send('OK')

test/integration/http-copy-test.js

@@ -8,7 +8,7 @@ var rm = require('./../utils').rm
 var solidServer = require('../../index')
 
 describe('HTTP COPY API', function () {
-  var address = 'https://localhost:3456'
+  var address = 'https://localhost:8443'
 
   var ldpHttpsServer
   var ldp = solidServer.createServer({
@@ -19,7 +19,7 @@ describe('HTTP COPY API', function () {
   })
 
   before(function (done) {
-    ldpHttpsServer = ldp.listen(3456, done)
+    ldpHttpsServer = ldp.listen(8443, done)
   })
 
   after(function () {