Move all options to constructor.

Author: RubenVerborgh

lib/acl-checker.js

@@ -11,13 +11,15 @@ const DEFAULT_ACL_SUFFIX = '.acl'
 class ACLChecker {
   constructor (resource, options = {}) {
     this.resource = resource
+    this.host = options.host
+    this.origin = options.origin
     this.debug = options.debug || console.log.bind(console)
     this.fetch = options.fetch
     this.strictOrigin = options.strictOrigin
     this.suffix = options.suffix || DEFAULT_ACL_SUFFIX
   }
 
-  can (user, mode, options = {}) {
+  can (user, mode) {
     const debug = this.debug
     this.debug(`Can ${user || 'an agent'} ${mode} ${this.resource}?`)
     // If this is an ACL, Control mode must be present for any operations
@@ -28,7 +30,7 @@ class ACLChecker {
     // Check the permissions within the nearest ACL
     return this.getNearestACL(this.resource)
     .then(nearestAcl => {
-      const acls = this.getPermissionSet(nearestAcl, options)
+      const acls = this.getPermissionSet(nearestAcl)
       return this.checkAccess(acls, user, mode, this.resource)
     })
     .then(() => { debug('ACL policy found') })
@@ -111,7 +113,7 @@ class ACLChecker {
   }
 
   // Gets the permission set for the given resource
-  getPermissionSet ({ acl, graph, isContainer }, options = {}) {
+  getPermissionSet ({ acl, graph, isContainer }) {
     const debug = this.debug
     if (!graph || graph.length === 0) {
       debug('ACL ' + acl + ' is empty')
@@ -120,8 +122,8 @@ class ACLChecker {
     const aclOptions = {
       aclSuffix: this.suffix,
       graph: graph,
-      host: options.host,
-      origin: options.origin,
+      host: this.host,
+      origin: this.origin,
       rdf: rdf,
       strictOrigin: this.strictOrigin,
       isAcl: uri => this.isAcl(uri),

lib/handlers/allow.js

@@ -24,21 +24,19 @@ function allow (mode) {
       if (!reqPath.endsWith('/') && !err && stat.isDirectory()) {
         reqPath += '/'
       }
-      var options = {
-        origin: req.get('origin'),
-        host: req.protocol + '://' + req.get('host')
-      }
 
       var baseUri = utils.uriBase(req)
       var acl = new ACL(baseUri + reqPath, {
+        origin: req.get('origin'),
+        host: req.protocol + '://' + req.get('host'),
         debug: debug,
         fetch: fetchDocument(req.hostname, ldp, baseUri),
         suffix: ldp.suffixAcl,
         strictOrigin: ldp.strictOrigin
       })
       req.acl = acl
 
-      acl.can(req.session.userId, mode, options).then(next, next)
+      acl.can(req.session.userId, mode).then(next, next)
     })
   }
 }