Remove ldp.root in favor of ResourceMapper

Author: rubensworks

lib/ldp.js

@@ -37,14 +37,6 @@ class LDP {
   constructor (argv = {}) {
     extend(this, argv)
 
-    // Setting root
-    if (!this.root) {
-      this.root = process.cwd()
-    }
-    if (!this.root.endsWith('/')) {
-      this.root += '/'
-    }
-
     // Suffixes
     if (!this.suffixAcl) {
       this.suffixAcl = '.acl'
@@ -82,7 +74,7 @@ class LDP {
     debug.settings('Config path: ' + this.configPath)
     debug.settings('Suffix Acl: ' + this.suffixAcl)
     debug.settings('Suffix Meta: ' + this.suffixMeta)
-    debug.settings('Filesystem Root: ' + this.root)
+    debug.settings('Filesystem Root: ' + (this.resourceMapper ? this.resourceMapper._rootPath : 'none'))
     debug.settings('Allow WebID authentication: ' + !!this.webid)
     debug.settings('Live-updates: ' + !!this.live)
     debug.settings('Multi-user: ' + !!this.multiuser)

lib/models/account-manager.js

@@ -131,17 +131,7 @@ class AccountManager {
    * @return {string}
    */
   accountDirFor (accountName) {
-    let accountDir
-
-    if (this.multiuser) {
-      let uri = this.accountUriFor(accountName)
-      let hostname = url.parse(uri).hostname
-      accountDir = path.join(this.store.root, hostname)
-    } else {
-      // single user mode
-      accountDir = this.store.root
-    }
-    return accountDir
+    return this.store.resourceMapper.getBasePath(url.parse(this.accountUriFor(accountName)).hostname)
   }
 
   /**

lib/utils.js

@@ -12,6 +12,7 @@ module.exports.routeResolvedFile = routeResolvedFile
 module.exports.getQuota = getQuota
 module.exports.overQuota = overQuota
 
+const fs = require('fs')
 const path = require('path')
 const util = require('util')
 const $rdf = require('rdflib')

test/integration/account-manager-test.js

@@ -9,6 +9,7 @@ chai.should()
 const LDP = require('../../lib/ldp')
 const SolidHost = require('../../lib/models/solid-host')
 const AccountManager = require('../../lib/models/account-manager')
+const LegacyResourceMapper = require('../../lib/legacy-resource-mapper')
 
 const testAccountsDir = path.join(__dirname, '../resources/accounts')
 const accountTemplatePath = path.join(__dirname, '../../default-templates/new-account')
@@ -29,7 +30,10 @@ describe('AccountManager', () => {
 
     describe('in multi user mode', () => {
       let multiuser = true
-      let store = new LDP({ root: testAccountsDir, multiuser })
+      let resourceMapper = new LegacyResourceMapper({
+        includeHost: multiuser
+      })
+      let store = new LDP({ multiuser, resourceMapper })
       let options = { multiuser, store, host }
       let accountManager = AccountManager.from(options)
 
@@ -54,9 +58,13 @@ describe('AccountManager', () => {
       let multiuser = false
 
       it('resolves to true if root .acl exists in root storage', () => {
+        let resourceMapper = new LegacyResourceMapper({
+          includeHost: multiuser,
+          rootPath: path.join(testAccountsDir, 'tim.localhost')
+        })
         let store = new LDP({
-          root: path.join(testAccountsDir, 'tim.localhost'),
-          multiuser
+          multiuser,
+          resourceMapper
         })
         let options = { multiuser, store, host }
         let accountManager = AccountManager.from(options)
@@ -68,9 +76,13 @@ describe('AccountManager', () => {
       })
 
       it('resolves to false if root .acl does not exist in root storage', () => {
+        let resourceMapper = new LegacyResourceMapper({
+          includeHost: multiuser,
+          rootPath: testAccountsDir
+        })
         let store = new LDP({
-          root: testAccountsDir,
-          multiuser
+          multiuser,
+          resourceMapper
         })
         let options = { multiuser, store, host }
         let accountManager = AccountManager.from(options)
@@ -86,7 +98,11 @@ describe('AccountManager', () => {
   describe('createAccountFor()', () => {
     it('should create an account directory', () => {
       let multiuser = true
-      let store = new LDP({ root: testAccountsDir, multiuser })
+      let resourceMapper = new LegacyResourceMapper({
+        includeHost: multiuser,
+        rootPath: testAccountsDir
+      })
+      let store = new LDP({ multiuser, resourceMapper })
       let options = { host, multiuser, store, accountTemplatePath }
       let accountManager = AccountManager.from(options)
 

test/integration/ldp-test.js

@@ -24,7 +24,6 @@ describe('LDP', function () {
   })
 
   var ldp = new LDP({
-    root: path.join(__dirname, '..'),
     resourceMapper,
     serverUri: 'https://localhost',
     multiuser: true,
@@ -164,7 +163,7 @@ describe('LDP', function () {
       var stream = stringToStream('hello world')
       await ldp.put('/resources/testPut.txt', stream)
       // Make sure it exists
-      fs.stat(ldp.root + '/resources/testPut.txt', function (err) {
+      fs.stat(ldp.resourceMapper._rootPath + '/resources/testPut.txt', function (err) {
         if (err) {
           throw err
         }
@@ -173,7 +172,7 @@ describe('LDP', function () {
       // Now delete the dummy file
       await ldp.delete('/resources/testPut.txt')
       // Make sure it does not exist anymore
-      fs.stat(ldp.root + '/resources/testPut.txt', function (err, s) {
+      fs.stat(ldp.resourceMapper._rootPath + '/resources/testPut.txt', function (err, s) {
         if (!err) {
           throw new Error('file still exists')
         }
@@ -185,7 +184,7 @@ describe('LDP', function () {
       var stream = stringToStream('hello world')
       await ldp.put('/resources/dummy/testPutBlocking.txt', stream)
       // Make sure it exists
-      fs.stat(ldp.root + '/resources/dummy/testPutBlocking.txt', function (err) {
+      fs.stat(ldp.resourceMapper._rootPath + '/resources/dummy/testPutBlocking.txt', function (err) {
         if (err) {
           throw err
         }
@@ -200,7 +199,7 @@ describe('LDP', function () {
       var stream = stringToStream('hello world')
       await ldp.put('/resources/dummy/dummy2/testPutBlocking.txt', stream)
       // Make sure it exists
-      fs.stat(ldp.root + '/resources/dummy/dummy2/testPutBlocking.txt', function (err) {
+      fs.stat(ldp.resourceMapper._rootPath + '/resources/dummy/dummy2/testPutBlocking.txt', function (err) {
         if (err) {
           throw err
         }

test/integration/params-test.js

@@ -31,7 +31,7 @@ describe('LDNODE params', function () {
       var server = supertest(ldp)
 
       it('should fallback on current working directory', function () {
-        assert.equal(ldp.locals.ldp.root, process.cwd() + '/')
+        assert.equal(ldp.locals.ldp.resourceMapper._rootPath, process.cwd())
       })
 
       it('should find resource in correct path', function (done) {
@@ -56,7 +56,7 @@ describe('LDNODE params', function () {
       var server = supertest(ldp)
 
       it('should fallback on current working directory', function () {
-        assert.equal(ldp.locals.ldp.root, './test/resources/')
+        assert.equal(ldp.locals.ldp.resourceMapper._rootPath, './test/resources')
       })
 
       it('should find resource in correct path', function (done) {

test/unit/account-manager-test.js

@@ -17,6 +17,7 @@ const AccountManager = require('../../lib/models/account-manager')
 const UserAccount = require('../../lib/models/user-account')
 const TokenService = require('../../lib/services/token-service')
 const WebIdTlsCertificate = require('../../lib/models/webid-tls-certificate')
+const LegacyResourceMapper = require('../../lib/legacy-resource-mapper')
 
 const testAccountsDir = path.join(__dirname, '../resources/accounts')
 
@@ -102,17 +103,25 @@ describe('AccountManager', () => {
   describe('accountDirFor()', () => {
     it('should match the solid root dir config, in single user mode', () => {
       let multiuser = false
-      let store = new LDP({ root: testAccountsDir, multiuser })
+      let resourceMapper = new LegacyResourceMapper({
+        includeHost: multiuser,
+        rootPath: testAccountsDir
+      })
+      let store = new LDP({ multiuser, resourceMapper })
       let options = { multiuser, store, host }
       let accountManager = AccountManager.from(options)
 
       let accountDir = accountManager.accountDirFor('alice')
-      expect(accountDir).to.equal(store.root)
+      expect(accountDir).to.equal(store.resourceMapper._rootPath)
     })
 
     it('should compose the account dir in multi user mode', () => {
       let multiuser = true
-      let store = new LDP({ root: testAccountsDir, multiuser })
+      let resourceMapper = new LegacyResourceMapper({
+        includeHost: multiuser,
+        rootPath: testAccountsDir
+      })
+      let store = new LDP({ multiuser, resourceMapper })
       let host = SolidHost.from({ serverUri: 'https://localhost' })
       let options = { multiuser, store, host }
       let accountManager = AccountManager.from(options)
@@ -302,7 +311,10 @@ describe('AccountManager', () => {
 
   describe('rootAclFor()', () => {
     it('should return the server root .acl in single user mode', () => {
-      let store = new LDP({ suffixAcl: '.acl', multiuser: false })
+      let resourceMapper = new LegacyResourceMapper({
+        includeHost: false
+      })
+      let store = new LDP({ suffixAcl: '.acl', multiuser: false, resourceMapper })
       let options = { host, multiuser: false, store }
       let accountManager = AccountManager.from(options)
 
@@ -314,7 +326,10 @@ describe('AccountManager', () => {
     })
 
     it('should return the profile root .acl in multi user mode', () => {
-      let store = new LDP({ suffixAcl: '.acl', multiuser: true })
+      let resourceMapper = new LegacyResourceMapper({
+        includeHost: true
+      })
+      let store = new LDP({ suffixAcl: '.acl', multiuser: true, resourceMapper })
       let options = { host, multiuser: true, store }
       let accountManager = AccountManager.from(options)
 

test/unit/user-accounts-api-test.js

@@ -13,6 +13,7 @@ const LDP = require('../../lib/ldp')
 const SolidHost = require('../../lib/models/solid-host')
 const AccountManager = require('../../lib/models/account-manager')
 const testAccountsDir = path.join(__dirname, '..', 'resources', 'accounts')
+var LegacyResourceMapper = require('../../lib/legacy-resource-mapper')
 
 const api = require('../../lib/api/accounts/user-accounts')
 
@@ -26,7 +27,11 @@ describe('api/accounts/user-accounts', () => {
   describe('newCertificate()', () => {
     describe('in multi user mode', () => {
       let multiuser = true
-      let store = new LDP({ root: testAccountsDir, multiuser })
+      let resourceMapper = new LegacyResourceMapper({
+        includeHost: multiuser,
+        rootPath: testAccountsDir
+      })
+      let store = new LDP({ multiuser, resourceMapper })
 
       it('should throw a 400 error if spkac param is missing', done => {
         let options = { host, store, multiuser, authMethod: 'oidc' }