lkmill · April 28, 2017 14:37 · Apr 28, 2017 · Apr 28, 2017 · Apr 28, 2017 · Apr 28, 2017
diff --git a/acl-parse-permissions.js b/acl-parse-permissions.js
@@ -16,13 +16,15 @@ module.exports = function parsePermissions(permissions) {
 
     let integer = actions ? +actions : 0;
 
-    if (!_.isNumber(integer) {
+    if (!_.isNumber(integer)) {
       actions = actions.split(',')
 
       integer = actions.reduce((result, action) => {
         const index = CRUD.indexOf(action);
 
-        if (index < 0) throw new Error(`Unkown action "${action}"`);
+        if (index < 0) {
+          throw new Error(`Unkown action "${action}"`);
+        }
 
         return result & 2^index;
       }, 0);

diff --git a/acl-parse-permissions.js b/acl-parse-permissions.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const _ = require('lodash');
+
 const CRUD = ['create', 'read', 'update', 'delete'].reverse();
 
 // should be in format `entity:number` or `entity:action` or `entity:action1,action2,action3`
@@ -14,7 +16,7 @@ module.exports = function parsePermissions(permissions) {
 
     let integer = actions ? +actions : 0;
 
-    if (_.isNumber(integer) {
+    if (!_.isNumber(integer) {
       actions = actions.split(',')
 
       integer = actions.reduce((result, action) => {

diff --git a/acl-parse-permissions.js b/acl-parse-permissions.js
@@ -12,9 +12,9 @@ module.exports = function parsePermissions(permissions) {
   return permissions.reduce((result, str) => {
     let [ entity, actions ] = str.split(':');
 
-    let integer = +actions;
+    let integer = actions ? +actions : 0;
 
-    if (_.isNumber(intger) {
+    if (_.isNumber(integer) {
       actions = actions.split(',')
 
       integer = actions.reduce((result, action) => {

diff --git a/acl-parse-permissions.js b/acl-parse-permissions.js
@@ -11,14 +11,20 @@ module.exports = function parsePermissions(permissions) {
 
   return permissions.reduce((result, str) => {
     let [ entity, actions ] = str.split(':');
+
+    let integer = +actions;
+
+    if (_.isNumber(intger) {
+      actions = actions.split(',')
 
-    const integer = +actions || actions.reduce((result, action) => {
-      const index = CRUD.indexOf(action);
+      integer = actions.reduce((result, action) => {
+        const index = CRUD.indexOf(action);
 
-      if (index < 0) throw new Error(`Unkown action "${action}"`);
+        if (index < 0) throw new Error(`Unkown action "${action}"`);
 
-      return result & 2^index;
-    }, 0);
+        return result & 2^index;
+      }, 0);
+    }
 
     if (integer > 0) {
       result[entity] = integer;

diff --git a/acl-parse-permissions.js b/acl-parse-permissions.js
@@ -5,9 +5,9 @@ const CRUD = ['create', 'read', 'update', 'delete'].reverse();
 // should be in format `entity:number` or `entity:action` or `entity:action1,action2,action3`
 // a user that can only create has 1000 bits > 8, only delete 0001 > 1, everything 1111 > 15
 module.exports = function parsePermissions(permissions) {
-  if (!permissions) return undefined;
-
-  if (!Array.isArray(permissions)) permissions = [ permissions ];
+  if (!Array.isArray(permissions)) {
+    permissions = [ permissions ];
+  }
 
   return permissions.reduce((result, str) => {
     let [ entity, actions ] = str.split(':');

diff --git a/acl-compare.js b/acl-compare.js
@@ -1,13 +1,19 @@
 'use strict';
 
-module.exports = (permissions, requiredPermissions) => {
-  if (requiredPermissions) {
-    if (!permissions) return false;
+const _ = require('lodash');
 
+module.exports = (permissions, requiredPermissions) => {
+  if (!_.isPlainObject(requiredPermissions)) {
+    throw new TypeError('`requiredPermissions` is not an object');
+  } else if (!_.isPlainObject(permissions)) {
+    throw new TypeError('`permissions` is not an object');
+  } else {
     for (const key in requiredPermissions) {
-      if (!permissions[key] || permissions[key] & requiredPermissions[key] !== requiredPermissions[key]) return false;
+      if (permissions[key] == null || (permissions[key] & requiredPermissions[key] !== requiredPermissions[key])) {
+        return false;
+      }
     }
-  }
 
-  return true;
+    return true;
+  }
 };
diff --git a/acl-compare.js b/acl-compare.js
@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = (permissions, requiredPermissions) => {
+  if (requiredPermissions) {
+    if (!permissions) return false;
+
+    for (const key in requiredPermissions) {
+      if (!permissions[key] || permissions[key] & requiredPermissions[key] !== requiredPermissions[key]) return false;
+    }
+  }
+
+  return true;
+};
diff --git a/acl-parse-permissions.js b/acl-parse-permissions.js
@@ -3,6 +3,7 @@
 const CRUD = ['create', 'read', 'update', 'delete'].reverse();
 
 // should be in format `entity:number` or `entity:action` or `entity:action1,action2,action3`
+// a user that can only create has 1000 bits > 8, only delete 0001 > 1, everything 1111 > 15
 module.exports = function parsePermissions(permissions) {
   if (!permissions) return undefined;
 

diff --git a/acl-parse-permissions.js b/acl-parse-permissions.js
@@ -2,6 +2,7 @@
 
 const CRUD = ['create', 'read', 'update', 'delete'].reverse();
 
+// should be in format `entity:number` or `entity:action` or `entity:action1,action2,action3`
 module.exports = function parsePermissions(permissions) {
   if (!permissions) return undefined;
 
@@ -10,7 +11,7 @@ module.exports = function parsePermissions(permissions) {
   return permissions.reduce((result, str) => {
     let [ entity, actions ] = str.split(':');
 
-    const integer = actions.reduce((result, action) => {
+    const integer = +actions || actions.reduce((result, action) => {
       const index = CRUD.indexOf(action);
 
       if (index < 0) throw new Error(`Unkown action "${action}"`);

diff --git a/acl-parse-permissions.js b/acl-parse-permissions.js
@@ -0,0 +1,27 @@
+'use strict';
+
+const CRUD = ['create', 'read', 'update', 'delete'].reverse();
+
+module.exports = function parsePermissions(permissions) {
+  if (!permissions) return undefined;
+
+  if (!Array.isArray(permissions)) permissions = [ permissions ];
+
+  return permissions.reduce((result, str) => {
+    let [ entity, actions ] = str.split(':');
+
+    const integer = actions.reduce((result, action) => {
+      const index = CRUD.indexOf(action);
+
+      if (index < 0) throw new Error(`Unkown action "${action}"`);
+
+      return result & 2^index;
+    }, 0);
+
+    if (integer > 0) {
+      result[entity] = integer;
+    }
+
+    return result;
+  }, {});
+};
diff --git a/acl-request.js b/acl-request.js
@@ -0,0 +1,50 @@
+'use strict';
+
+const _ = require('lodash');
+const compare = require('./compare');
+
+const parsePermissions = require('./util/parse-permissions');
+
+module.exports = (getPermissions, getRequiredPermissions) => {
+  if (!_.isFunction(getPermissions) || !_.isFunction(getRequiredPermissions)) {
+    throw new TypeError('Both parameters need to be functions');
+  }
+
+  return {
+    fromReq(req, res, next) {
+      Promise.all([
+        getPermissions(req),
+        getRequiredPermissions(req),
+      ]).then((result) => compare(...result);
+      }).then((authorized) => {
+        if (authorized) return next();
+
+        throw new ForbiddenError();
+      }).catch(next);
+    },
+
+    // calls next if user has at least one of the required permissions
+    // `requiredPermissions`should be of format `entity:action` or `entity:action1,action2,action3`
+    all(...requiredPermissions) {
+      if (!requiredPermissions.length) return (req, res, next) => next();
+
+      requiredPermissions = parsePermissions(requiredPermissions);
+
+      return (req, res, next) => {
+        getPermissions(req).then((permissions))
+          .catch(next);
+      }
+    },
+
+    // calls next if user has at least one of the required permissions
+    // `requiredPermissions`should be of format `entity:action` or `entity:action1,action2,action3`
+    any(...requiredPermissions) {
+      requiredPermissions = parsePermissions(requiredPermissions);
+
+      return (req, res, next) => {
+        getPermissions(req).then((permissions))
+          .catch(next);
+      }
+    },
+  };
+};
diff --git a/request.js b/request.js
@@ -1,33 +0,0 @@
-'use strict';
-
-const req = require('http').IncomingMessage.prototype;
-
-const config = require('./config')
-
-// option 1
-Object.defineProperty(req, 'user', {
-  get() {
-    if (this.__user) return Promise.resolve(this.__user);
-
-    if (!req.session && req.session.userId) return Promise.resolve(null);
-
-    return config.deserializeUser(req.session.userId).then((user) => {
-      this.__user = user;
-
-      return user;
-    })
-  },
-});
-
-// option 2
-req.getUser() {
-  if (this.user) return Promise.resolve(this.user);
-
-  if (!req.session && req.session.userId) return Promise.resolve(null);
-
-  return serializeUser(this.session.userId).then((user) => {
-    this.user = user;
-
-    return user;
-  });
-}

diff --git a/session-request.js b/session-request.js
@@ -0,0 +1,60 @@
+'use strict';
+
+const _ = require('lodash');
+const req = require('http').IncomingMessage.prototype;
+
+module.exports = ({ serialize, deserialize }) => {
+  if (!_.isFunction(serialize) || !_.isFunction(deserialize)) {
+    throw new TypeError('Both arguments need to be functions');
+  }
+
+  req.login = function (user) {
+    if (!req.session) Promise.reject(new Error('Session middleware not in use'));
+
+    return serialize(user).then((result) => {
+      req.session.user = result;
+    }).catch((err) => {
+      delete req.sesson.user;
+
+      throw err;
+    });
+  }
+
+  req.logout = function () {
+    delete req.session.user;
+    delete req.user;
+  }
+
+  req.isAuthenticated = function () {
+    return this.session && this.session.user;
+  }
+
+  req.isUnauthenticated = function () {
+    return !this.isAuthenticated();
+  }
+
+  // option1
+  req.getUser = function () {
+    if (this.__user) return Promise.resolve(this.__user);
+
+    if (!req.session || !req.session.user) return Promise.resolve(null);
+
+    return deserialize(this.session.user).then((user) => {
+      this.__user = user;
+
+      return user;
+    });
+  }
+
+  Object.defineProperty(req, 'user', {
+    get() {
+      if (this.__user) return Promise.resolve(this.__user);
+
+      if (!req.session || !req.session.user) return Promise.resolve(null);
+
+      return deserialize(this.session.user).then((user) => {
+        this.__user = user;
+
+        return user;
+    });
+}
diff --git a/request.js b/request.js
@@ -0,0 +1,33 @@
+'use strict';
+
+const req = require('http').IncomingMessage.prototype;
+
+const config = require('./config')
+
+// option 1
+Object.defineProperty(req, 'user', {
+  get() {
+    if (this.__user) return Promise.resolve(this.__user);
+
+    if (!req.session && req.session.userId) return Promise.resolve(null);
+
+    return config.deserializeUser(req.session.userId).then((user) => {
+      this.__user = user;
+
+      return user;
+    })
+  },
+});
+
+// option 2
+req.getUser() {
+  if (this.user) return Promise.resolve(this.user);
+
+  if (!req.session && req.session.userId) return Promise.resolve(null);
+
+  return serializeUser(this.session.userId).then((user) => {
+    this.user = user;
+
+    return user;
+  });
+}
No results found