Pass in fetchGraph to ACLChecker/PermissionSet

Author: dmitrizagidulin

lib/acl-checker.js

@@ -4,6 +4,7 @@ const PermissionSet = require('solid-permissions').PermissionSet
 const rdf = require('rdflib')
 const debug = require('./debug').ACL
 const HTTPError = require('./http-error')
+const { promisify } = require('util')
 
 const DEFAULT_ACL_SUFFIX = '.acl'
 
@@ -32,9 +33,11 @@ class ACLChecker {
         .then(acl => this.getPermissionSet(acl))
     }
 
+    const options = { fetchGraph: promisify(this.fetch) }
+
     // Check the resource's permissions
     return this._permissionSet
-      .then(acls => this.checkAccess(acls, user, mode))
+      .then(acls => this.checkAccess(acls, user, mode, options))
       .catch(() => {
         if (!user) {
           throw new HTTPError(401, `Access to ${this.resource} requires authorization`)
@@ -87,7 +90,8 @@ class ACLChecker {
 
   // Tests whether the permissions allow a given operation
   checkAccess (permissionSet, user, mode) {
-    return permissionSet.checkAccess(this.resource, user, mode)
+    const options = { fetchGraph: promisify(this.fetch) }
+    return permissionSet.checkAccess(this.resource, user, mode, options)
       .then(hasAccess => {
         if (hasAccess) {
           return true

test/unit/acl-checker-test.js

@@ -4,36 +4,41 @@ const chai = require('chai')
 const { expect } = chai
 chai.use(require('chai-as-promised'))
 
+const options = { fetch: (url, callback) => {} }
+
 describe('ACLChecker unit test', () => {
+  let acl
+
+  beforeEach(() => {
+    acl = new ACLChecker('http://ex.com/.acl', options)
+  })
+
   describe('checkAccess', () => {
     it('should callback with null on grant success', () => {
-      let acl = new ACLChecker()
       let acls = { checkAccess: () => Promise.resolve(true) }
       return expect(acl.checkAccess(acls)).to.eventually.be.true
     })
     it('should callback with error on grant failure', () => {
-      let acl = new ACLChecker()
       let acls = { checkAccess: () => Promise.resolve(false) }
       return expect(acl.checkAccess(acls))
       .to.be.rejectedWith('ACL file found but no matching policy found')
     })
     it('should callback with error on grant error', () => {
-      let acl = new ACLChecker()
       let acls = { checkAccess: () => Promise.reject(new Error('my error')) }
       return expect(acl.checkAccess(acls)).to.be.rejectedWith('my error')
     })
   })
 
   describe('getPossibleACLs', () => {
     it('returns all possible ACLs of the root', () => {
-      const aclChecker = new ACLChecker('http://ex.org/')
+      const aclChecker = new ACLChecker('http://ex.org/', options)
       expect(aclChecker.getPossibleACLs()).to.deep.equal([
         'http://ex.org/.acl'
       ])
     })
 
     it('returns all possible ACLs of a regular file', () => {
-      const aclChecker = new ACLChecker('http://ex.org/abc/def/ghi')
+      const aclChecker = new ACLChecker('http://ex.org/abc/def/ghi', options)
       expect(aclChecker.getPossibleACLs()).to.deep.equal([
         'http://ex.org/abc/def/ghi.acl',
         'http://ex.org/abc/def/.acl',
@@ -43,7 +48,7 @@ describe('ACLChecker unit test', () => {
     })
 
     it('returns all possible ACLs of an ACL file', () => {
-      const aclChecker = new ACLChecker('http://ex.org/abc/def/ghi.acl')
+      const aclChecker = new ACLChecker('http://ex.org/abc/def/ghi.acl', options)
       expect(aclChecker.getPossibleACLs()).to.deep.equal([
         'http://ex.org/abc/def/ghi.acl',
         'http://ex.org/abc/def/.acl',
@@ -53,7 +58,7 @@ describe('ACLChecker unit test', () => {
     })
 
     it('returns all possible ACLs of a directory', () => {
-      const aclChecker = new ACLChecker('http://ex.org/abc/def/ghi/')
+      const aclChecker = new ACLChecker('http://ex.org/abc/def/ghi/', options)
       expect(aclChecker.getPossibleACLs()).to.deep.equal([
         'http://ex.org/abc/def/ghi/.acl',
         'http://ex.org/abc/def/.acl',