Convert checkAccess to promise.

Author: RubenVerborgh

lib/acl-checker.js

@@ -46,9 +46,8 @@ class ACLChecker {
             resource, // The resource we want to access
             accessType, // accessTo or defaultForNew
             acl, // The current Acl file!
-            (err) => { return next(!err || err) },
             options
-          )
+          ).then(next, next)
         })
       },
       function handleNoAccess (err) {
@@ -87,17 +86,15 @@ class ACLChecker {
    * @param resource {String} URI of the resource being accessed
    * @param accessType {String} One of `accessTo`, or `default`
    * @param acl {String} URI of this current .acl resource
-   * @param callback {Function}
    * @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, callback,
-               options = {}) {
+  checkAccess (graph, user, mode, resource, accessType, acl, options = {}) {
     const debug = this.debug
     if (!graph || graph.length === 0) {
       debug('ACL ' + acl + ' is empty')
-      return callback(new Error('No policy found - empty ACL'))
+      return Promise.reject(new Error('No policy found - empty ACL'))
     }
     let isContainer = accessType.startsWith('default')
     let aclOptions = {
@@ -111,21 +108,21 @@ class ACLChecker {
       aclUrlFor: (uri) => { return this.aclUrlFor(uri) }
     }
     let acls = new PermissionSet(resource, acl, isContainer, aclOptions)
-    acls.checkAccess(resource, user, mode)
+    return acls.checkAccess(resource, user, mode)
       .then(hasAccess => {
         if (hasAccess) {
           debug(`${mode} access permitted to ${user}`)
-          return callback()
+          return true
         } else {
           debug(`${mode} access NOT permitted to ${user}` +
             aclOptions.strictOrigin ? ` and origin ${options.origin}` : '')
-          return callback(new Error('ACL file found but no matching policy found'))
+          throw new Error('ACL file found but no matching policy found')
         }
       })
       .catch(err => {
         debug(`${mode} access denied to ${user}`)
         debug(err)
-        return callback(err)
+        throw err
       })
   }
 

test/unit/acl-checker-test.js

@@ -1,13 +1,9 @@
 'use strict'
 const proxyquire = require('proxyquire')
-const chai = require('chai')
-const { assert } = chai
-const dirtyChai = require('dirty-chai')
-chai.use(dirtyChai)
-const sinonChai = require('sinon-chai')
-chai.use(sinonChai)
-chai.should()
 const debug = require('../../lib/debug').ACL
+const chai = require('chai')
+const { expect } = chai
+chai.use(require('chai-as-promised'))
 
 class PermissionSetAlwaysGrant {
   checkAccess () {
@@ -26,46 +22,37 @@ class PermissionSetAlwaysError {
 }
 
 describe('ACLChecker unit test', () => {
-  it('should callback with null on grant success', done => {
+  it('should callback with null on grant success', () => {
     let ACLChecker = proxyquire('../../lib/acl-checker', {
       'solid-permissions': { PermissionSet: PermissionSetAlwaysGrant }
     })
     let graph = {}
     let accessType = ''
     let user, mode, resource, aclUrl
     let acl = new ACLChecker({ debug })
-    acl.checkAccess(graph, user, mode, resource, accessType, aclUrl, (err) => {
-      assert.isUndefined(err,
-        'Granted permission should result in an empty callback!')
-      done()
-    })
+    return expect(acl.checkAccess(graph, user, mode, resource, accessType, aclUrl))
+    .to.eventually.be.true
   })
-  it('should callback with error on grant failure', done => {
+  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 })
-    acl.checkAccess(graph, user, mode, resource, accessType, aclUrl, (err) => {
-      assert.ok(err instanceof Error,
-        'Denied permission should result in an error callback!')
-      done()
-    })
+    return expect(acl.checkAccess(graph, user, mode, resource, accessType, aclUrl))
+    .to.be.rejectedWith('ACL file found but no matching policy found')
   })
-  it('should callback with error on grant error', done => {
+  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 })
-    acl.checkAccess(graph, user, mode, resource, accessType, aclUrl, (err) => {
-      assert.ok(err instanceof Error,
-        'Error during checkAccess should result in an error callback!')
-      done()
-    })
+    return expect(acl.checkAccess(graph, user, mode, resource, accessType, aclUrl))
+    .to.be.rejectedWith('Error thrown during checkAccess()')
   })
 })