Merge pull request #194 from bourgeoa/aclUrlParser

update aclUrlParser() to begin on current url

package.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-file-client",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "A library for creating and managing files and folders in Solid data stores",
   "author": "Jeff Zucker",
   "maintainer": "Alain Bourgeois",

src/SolidFileClient.js

@@ -118,8 +118,8 @@ class SolidFileClient extends SolidApi {
   async aclUrlParser (url) {
     const target = getItemName(url)
     const max = url.substring(getRootUrl(url).length - 2).split('/').length
-    for (let i = 1; i < max; i++) {
-      url = getParentUrl(url)
+    for (let i = 0; i < max; i++) {
+      if (i) url = getParentUrl(url)
       const links = await this.getItemLinks(url, { links: 'include' })
       if (links.acl) {
         let aclContent = await this.readFile(links.acl)

tests/aclParser.test.js

@@ -187,7 +187,7 @@ describe('aclUrlParser', () => {
     acl: true,
     placeholder: { meta: true }
   }) // Note: Acl Content will be overriden by some tests
-  const targetWithAcl = new File('target.txt', 'target', 'text/plain', {
+  const targetWithoutAcl = new File('target.txt', 'target', 'text/plain', {
   })
   const targetFolderWithAcl = new Folder('folder-with-acl', [], {
       acl: true, // Note: Content will be overriden by some tests
@@ -197,7 +197,7 @@ describe('aclUrlParser', () => {
   const folder = new BaseFolder(container, 'aclUrlParser', [
       new Folder('nested', [
           targetFolderWithAcl,
-          targetWithAcl
+          targetWithoutAcl
         ])
     ], {
       acl: true 
@@ -206,14 +206,20 @@ describe('aclUrlParser', () => {
   beforeEach(() => folder.reset())
   folder.acl.content = acl0('./', '/profile/card#', defaultTarget)
 
-  test('get acl content for folder', async () => {
+  test('get acl content for folder with acl', async () => {
     const users = await api.aclUrlParser(targetFolderWithAcl.url)
+    const keysUsers = ['agent&' + getRootUrl(folder.url) + '/profile/card#me', 'agentClass&Agent']
+    const usersKeys = Object.keys(users)
+    expect(usersKeys).toEqual(keysUsers)
+  })
+  test('get acl content for folder without acl', async () => {
+    const users = await api.aclUrlParser(folder.url+'nested/')
     const keysUsers = ['agent&' + getRootUrl(folder.url) + '/profile/card#me', 'agent&https://test.solid.community/profile/card#me', 'agentClass&AuthenticatedAgent', 'agentClass&Agent']
     const usersKeys = Object.keys(users)
     expect(usersKeys).toEqual(keysUsers)
   })
-  test('get acl content for file', async () => {
-    const users = await api.aclUrlParser(targetWithAcl.url)
+  test('get acl content for file without acl', async () => {
+    const users = await api.aclUrlParser(targetWithoutAcl.url)
     const keysUsers = ['agent&' + getRootUrl(folder.url) + '/profile/card#me', 'agent&https://test.solid.community/profile/card#me', 'agentClass&AuthenticatedAgent', 'agentClass&Agent']
     const usersKeys = Object.keys(users)
     expect(usersKeys).toEqual(keysUsers)