Merge pull request #1304 from megoth/dev

Merge megoth dev with nss dev

Author: jaxoncreed

lib/capability-discovery.js

@@ -33,7 +33,7 @@ function serviceCapabilityDocument () {
     const ldp = req.app.locals.ldp
     res.json({
       // Add the server root url
-      root: req.app.locals.ldp.resourceMapper.resolveUrl(req.hostname, req.path),
+      root: ldp.resourceMapper.resolveUrl(req.hostname, req.path),
       // Add the 'apps' urls section
       apps: req.app.locals.appUrls,
       api: {
@@ -44,8 +44,8 @@ function serviceCapabilityDocument () {
           // Create new user (see IdentityProvider.post() in identity-provider.js)
           new: new URL('/api/accounts/new', ldp.serverUri),
           recover: new URL('/api/accounts/recover', ldp.serverUri),
-          signin: req.app.locals.ldp.resourceMapper.resolveUrl(req.hostname, '/login'),
-          signout: req.app.locals.ldp.resourceMapper.resolveUrl(req.hostname, '/logout'),
+          signin: ldp.resourceMapper.resolveUrl(req.hostname, '/login'),
+          signout: ldp.resourceMapper.resolveUrl(req.hostname, '/logout'),
           validateToken: new URL('/api/accounts/validateToken', ldp.serverUri)
         }
       }

lib/handlers/index.js

@@ -13,7 +13,7 @@ async function handler (req, res, next) {
   const requestedType = negotiator.mediaType()
 
   try {
-    const { path: filename } = await req.app.locals.ldp.resourceMapper.mapUrlToFile({ url: req })
+    const { path: filename } = await ldp.resourceMapper.mapUrlToFile({ url: req })
 
     const stats = await ldp.stat(filename)
     if (!stats.isDirectory()) {