Move getPermissionSet into separate method.

Author: RubenVerborgh

lib/acl-checker.js

@@ -111,30 +111,17 @@ class ACLChecker {
    * @param [options.host] Request's host URI (with protocol)
    */
   checkAccess (graph, user, mode, resource, accessType, acl, options = {}) {
-    if (!graph || graph.length === 0) {
-      debug('ACL ' + acl + ' is empty')
-      return Promise.reject(new Error('No policy found - empty ACL'))
-    }
-    let isContainer = accessType.startsWith('default')
-    let aclOptions = {
-      aclSuffix: this.suffix,
-      graph: graph,
-      host: options.host,
-      origin: options.origin,
-      rdf: rdf,
-      strictOrigin: this.strictOrigin,
-      isAcl: uri => this.isAcl(uri),
-      aclUrlFor: uri => this.aclUrlFor(uri)
-    }
-    let acls = new PermissionSet(resource, acl, isContainer, aclOptions)
+    const isContainer = accessType.startsWith('default')
+    const acls = this.getPermissionSet(graph, resource, isContainer, acl, options)
+
     return acls.checkAccess(resource, user, mode)
     .then(hasAccess => {
       if (hasAccess) {
         this.debug(`${mode} access permitted to ${user}`)
         return true
       } else {
         this.debug(`${mode} access NOT permitted to ${user}` +
-          aclOptions.strictOrigin ? ` and origin ${options.origin}` : '')
+          this.strictOrigin ? ` and origin ${options.origin}` : '')
         throw new Error('ACL file found but no matching policy found')
       }
     })
@@ -145,6 +132,26 @@ class ACLChecker {
     })
   }
 
+  // Gets the permission set for the given resource
+  getPermissionSet (graph, resource, isContainer, acl, options = {}) {
+    const debug = this.debug
+    if (!graph || graph.length === 0) {
+      debug('ACL ' + acl + ' is empty')
+      throw new Error('No policy found - empty ACL')
+    }
+    const aclOptions = {
+      aclSuffix: this.suffix,
+      graph: graph,
+      host: options.host,
+      origin: options.origin,
+      rdf: rdf,
+      strictOrigin: this.strictOrigin,
+      isAcl: uri => this.isAcl(uri),
+      aclUrlFor: uri => this.aclUrlFor(uri)
+    }
+    return new PermissionSet(resource, acl, isContainer, aclOptions)
+  }
+
   aclUrlFor (uri) {
     if (this.isAcl(uri)) {
       return uri