exframe-middleware 1.3.0 → 1.3.2

package/.eslintrc.json

@@ -5,7 +5,7 @@
   },
   "extends": "airbnb-base",
   "parserOptions": {
-    "ecmaVersion": 2018
+    "ecmaVersion": 2020
   },
   "rules": {
     "comma-dangle": [2, "never"],

package/index.js

@@ -33,7 +33,8 @@ module.exports = {
   authorizeUser: {
     mq: authorizeUser,
     express: (req, res, next) => {
-      authorizeUser(req);
+      const user = req?.user || req?.context?.user;
+      authorizeUser({ user });
       next();
     }
   },

package/lib/authorizeUser.js

@@ -2,7 +2,11 @@
 
 const errors = require('exframe-errors');
 
-module.exports = context => {
-  if (!context.user)
+/**
+ * @param {Object} context
+ * @param {Object} context.user
+ */
+module.exports = ({ user }) => {
+  if (!user)
     throw new errors.Unauthorized('Could not authorize user');
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exframe-middleware",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "",
   "main": "index.js",
   "config": {
@@ -33,5 +33,5 @@
   "dependencies": {
     "exframe-errors": "^1.2.0"
   },
-  "gitHead": "1959247957f1a308c44d4c5210712125ab6e5573"
+  "gitHead": "6c4adb8a4ad4a5a60f1b98fb94dc4a13026eb796"
 }

package/test/authorizeUser.test.js

@@ -6,26 +6,61 @@ const errors = require('exframe-errors');
 const { authorizeUser } = require('../index');
 
 context('authorizeUser', () => {
-  it('throws unauthorized error when no user', () => {
-    try { authorizeUser.mq({}); }
-    catch (e) {
-      expect(e).to.be.an.instanceOf(errors.Unauthorized);
-      return;
-    }
-
-    expect.fail('authorizeUser should have thrown an Unauthorized error');
-  });
+  describe('mq', () => {
+    it('throws unauthorized error when no user', () => {
+      try { authorizeUser.mq({}); }
+      catch (e) {
+        expect(e).to.be.an.instanceOf(errors.Unauthorized);
+        return;
+      }
+
+      expect.fail('authorizeUser should have thrown an Unauthorized error');
+    });
 
-  it('does not throw an error when there is a user', () => {
-    try { authorizeUser.mq({ user: 'something' }); }
-    catch (e) { expect.fail('authorizeUser should not have thrown an error'); }
+    it('does not throw an error when there is a user', () => {
+      try { authorizeUser.mq({ user: 'something' }); }
+      catch (e) { expect.fail('authorizeUser should not have thrown an error'); }
+    });
   });
 
-  it('works when there is a user and calls next when using express version', () => {
-    let called = 0;
-    const next = () => ++called;
-    authorizeUser.express({ user: {} }, {}, next);
+  describe('express - user exists directly on the request object', () => {
+    it('calls the next function when there is a user', () => {
+      let called = 0;
+      const next = () => ++called;
+      authorizeUser.express({ user: {} }, {}, next);
+
+      expect(called).to.equal(1);
+    });
+    it('throws unauthorized error when there is no user', () => {
+      let called = 0;
+      const next = () => ++called;
+      try { authorizeUser.express({ }, {}, next); }
+      catch (e) {
+        expect(e).to.be.an.instanceOf(errors.Unauthorized);
+        return;
+      }
+      expect.fail('authorizeUser should have thrown an Unauthorized error');
+      expect(called).to.equal(0);
+    });
+  });
 
-    expect(called).to.equal(1);
+  describe('express - user exists within the context on the request object', () => {
+    it('calls the next function when there is a user', () => {
+      let called = 0;
+      const next = () => ++called;
+      authorizeUser.express({ context: { user: {} } }, {}, next);
+      expect(called).to.equal(1);
+    });
+    it('throws unauthorized error when there is no user', () => {
+      let called = 0;
+      const next = () => ++called;
+      try { authorizeUser.express({ context: {} }, {}, next); }
+      catch (e) {
+        expect(e).to.be.an.instanceOf(errors.Unauthorized);
+        return;
+      }
+      expect.fail('authorizeUser should have thrown an Unauthorized error');
+      expect(called).to.equal(0);
+    });
   });
 });