Change accessType into isContainer.

Author: RubenVerborgh

lib/acl-checker.js

@@ -26,13 +26,13 @@ class ACLChecker {
 
     // Check the permissions within the nearest ACL
     return this.getNearestACL(resource)
-    .then(({ acl, graph, accessType }) =>
+    .then(({ acl, graph, isContainer }) =>
       this.checkAccess(
         graph, // The ACL graph
         user, // The webId of the user
         mode, // Read/Write/Append
         resource, // The resource we want to access
-        accessType, // accessTo or defaultForNew
+        isContainer,
         acl, // The current Acl file!
         options
       )
@@ -52,18 +52,18 @@ class ACLChecker {
 
   // Gets the ACL that applies to the resource
   getNearestACL (uri) {
-    let accessType = 'accessTo'
+    let isContainer = false
     let nearestACL = Promise.reject()
     for (const acl of this.getPossibleACLs(uri, this.suffix)) {
       nearestACL = nearestACL.catch(() => new Promise((resolve, reject) => {
         this.debug(`Check if ACL exists: ${acl}`)
         this.fetch(acl, (err, graph) => {
           if (err || !graph || !graph.length) {
             if (err) this.debug(`Error reading ${acl}: ${err}`)
-            accessType = 'defaultForNew'
+            isContainer = true
             reject(err)
           } else {
-            resolve({ acl, graph, accessType })
+            resolve({ acl, graph, isContainer })
           }
         })
       }))
@@ -104,14 +104,13 @@ class ACLChecker {
    * @param user {String} WebID URI of the user accessing the resource
    * @param mode {String} Access mode, e.g. 'Read', 'Write', etc.
    * @param resource {String} URI of the resource being accessed
-   * @param accessType {String} One of `accessTo`, or `default`
+   * @param isContainer {boolean}
    * @param acl {String} URI of this current .acl resource
    * @param options {Object} Options hashmap
    * @param [options.origin] Request's `Origin:` header
    * @param [options.host] Request's host URI (with protocol)
    */
-  checkAccess (graph, user, mode, resource, accessType, acl, options = {}) {
-    const isContainer = accessType.startsWith('default')
+  checkAccess (graph, user, mode, resource, isContainer, acl, options = {}) {
     const acls = this.getPermissionSet(graph, resource, isContainer, acl, options)
 
     return acls.checkAccess(resource, user, mode)

test/unit/acl-checker-test.js

@@ -27,32 +27,29 @@ describe('ACLChecker unit test', () => {
       'solid-permissions': { PermissionSet: PermissionSetAlwaysGrant }
     })
     let graph = {}
-    let accessType = ''
     let user, mode, resource, aclUrl
     let acl = new ACLChecker({ debug })
-    return expect(acl.checkAccess(graph, user, mode, resource, accessType, aclUrl))
+    return expect(acl.checkAccess(graph, user, mode, resource, true, aclUrl))
     .to.eventually.be.true
   })
   it('should callback with error on grant failure', () => {
     let ACLChecker = proxyquire('../../lib/acl-checker', {
       'solid-permissions': { PermissionSet: PermissionSetNeverGrant }
     })
     let graph = {}
-    let accessType = ''
     let user, mode, resource, aclUrl
     let acl = new ACLChecker({ debug })
-    return expect(acl.checkAccess(graph, user, mode, resource, accessType, aclUrl))
+    return expect(acl.checkAccess(graph, user, mode, resource, true, aclUrl))
     .to.be.rejectedWith('ACL file found but no matching policy found')
   })
   it('should callback with error on grant error', () => {
     let ACLChecker = proxyquire('../../lib/acl-checker', {
       'solid-permissions': { PermissionSet: PermissionSetAlwaysError }
     })
     let graph = {}
-    let accessType = ''
     let user, mode, resource, aclUrl
     let acl = new ACLChecker({ debug })
-    return expect(acl.checkAccess(graph, user, mode, resource, accessType, aclUrl))
+    return expect(acl.checkAccess(graph, user, mode, resource, true, aclUrl))
     .to.be.rejectedWith('Error thrown during checkAccess()')
   })
 })