Move calls from utils#getFullUri to ResourceMapper

Author: rubensworks

lib/capability-discovery.js

@@ -3,7 +3,6 @@
  * @module capability-discovery
  */
 const express = require('express')
-const util = require('./utils')
 
 const serviceConfigDefaults = {
   'api': {
@@ -47,7 +46,7 @@ function capabilityDiscovery () {
 function serviceCapabilityDocument (serviceConfig) {
   return (req, res) => {
     // Add the server root url
-    serviceConfig.root = util.getFullUri(req) // TODO make sure we align with the rest
+    serviceConfig.root = req.app.locals.ldp.resourceMapper.getBaseUrl(req.hostname, req.path)
     // Add the 'apps' urls section
     serviceConfig.apps = req.app.locals.appUrls
     res.json(serviceConfig)

lib/handlers/get.js

@@ -11,7 +11,6 @@ const debug = require('debug')('solid:get')
 const debugGlob = require('debug')('solid:glob')
 const allow = require('./allow')
 
-const utils = require('../utils.js')
 const translate = require('../utils.js').translate
 const error = require('../http-error')
 
@@ -21,7 +20,7 @@ async function handler (req, res, next) {
   const ldp = req.app.locals.ldp
   const includeBody = req.method === 'GET'
   const negotiator = new Negotiator(req)
-  const baseUri = utils.getFullUri(req)
+  const baseUri = ldp.resourceMapper.getBaseUrl(req.hostname, req.path)
   const path = res.locals.path || req.path
   const requestedType = negotiator.mediaType()
   let possibleRDFType = negotiator.mediaType(RDFs)

lib/handlers/options.js

@@ -1,5 +1,4 @@
 const addLink = require('../header').addLink
-const utils = require('../utils')
 const url = require('url')
 
 module.exports = handler
@@ -23,7 +22,7 @@ function linkAuthProvider (req, res) {
 }
 
 function linkServiceEndpoint (req, res) {
-  let serviceEndpoint = url.resolve(utils.getFullUri(req), '.well-known/solid')
+  let serviceEndpoint = url.resolve(req.app.locals.ldp.resourceMapper.getBaseUrl(req.hostname, req.path), '.well-known/solid')
   addLink(res, serviceEndpoint, 'service')
 }
 

lib/header.js

@@ -103,7 +103,7 @@ function addPermissions (req, res, next) {
   if (!acl) return next()
 
   // Turn permissions for the public and the user into a header
-  const resource = utils.getFullUri(req)
+  const resource = req.app.locals.ldp.resourceMapper.getBaseUrl(req.hostname, req.path)
   Promise.all([
     getPermissionsFor(acl, null, resource),
     getPermissionsFor(acl, session.userId, resource)

lib/resource-mapper.js

@@ -78,9 +78,14 @@ class ResourceMapper {
   }
 
   // Gets the base URL for the given hostname
-  getBaseUrl (hostname) {
-    return !this._includeHost ? this._rootUrl
+  // Optionally, a pathname may be passed that will be appended to the baseUrl.
+  getBaseUrl (hostname, pathname) {
+    let baseUrl = !this._includeHost ? this._rootUrl
                               : `${this._protocol}//${hostname}${this._port}${this._rootUrl}`
+    if (pathname) {
+      baseUrl += pathname
+    }
+    return baseUrl
   }
 
   // Determine the full file path corresponding to a URL

lib/utils.js

@@ -1,6 +1,5 @@
 module.exports.getBaseUri = getBaseUri
 module.exports.pathBasename = pathBasename
-module.exports.getFullUri = getFullUri
 module.exports.hasSuffix = hasSuffix
 module.exports.serialize = serialize
 module.exports.translate = translate
@@ -80,24 +79,6 @@ function getBaseUri (req) {
   return `${protocol || req.protocol}://${req.get('host')}`
 }
 
-/**
- * Composes and returns the fully-qualified URI for the request, to be used
- * as a base URI for RDF parsing or serialization. For example, if a request
- * is to `Host: example.com`, `GET /files/` using the `https:` protocol,
- * then:
- *
- *   ```
- *   getFullUri(req)  // -> 'https://example.com/files/'
- *   ```
- *
- * @param req {IncomingMessage}
- *
- * @return {string}
- */
-function getFullUri (req) {
-  return getBaseUri(req) + url.resolve(req.baseUrl, req.path)
-}
-
 function pathBasename (fullpath) {
   let bname = ''
   if (fullpath) {