exframe-middleware 1.4.1 → 1.5.1

package/index.mjs

@@ -0,0 +1,9 @@
+'use strict';
+
+import middleware from './index.js';
+
+const { handleErrors, standardRouteResponseBuilder, authorizeUser, buildCsp, buildExpressRequestContext } = middleware;
+
+export { handleErrors, standardRouteResponseBuilder, authorizeUser, buildCsp, buildExpressRequestContext };
+
+export default middleware;

package/lib/buildCspFromHeaders.js

@@ -4,7 +4,7 @@ const errors = require('exframe-errors');
 
 module.exports = (req, { cspIsRequired = true }) => {
   const csp = req.headers['harmony-csp'] || '';
-  if (cspIsRequired && csp && !/^[A-Z]+:[A-Z]{2}:[A-Z\d]+$/.test(csp)) {
+  if (cspIsRequired && csp && !/^[A-Z\d]+:[A-Z]{2}:[A-Z\d]+$/.test(csp)) {
     throw new errors.Forbidden('CSP is required');
   }
 

package/package.json

@@ -1,8 +1,15 @@
 {
   "name": "exframe-middleware",
-  "version": "1.4.1",
+  "version": "1.5.1",
   "description": "",
   "main": "index.js",
+  "module": "index.mjs",
+  "exports": {
+    ".": {
+      "import": "./index.mjs",
+      "require": "./index.js"
+    }
+  },
   "config": {
     "reporter": "mocha-exzeo-reporter"
   },
@@ -36,5 +43,5 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "gitHead": "ef87c842aa08c54cbcb03ee075db8463ebc8fd43"
+  "gitHead": "5a5a106c3d0f7b491daed81955df1ed8fd2c906e"
 }

package/test/buildCsp.test.js

@@ -6,7 +6,7 @@ const errors = require('exframe-errors');
 const { buildCsp } = require('../index');
 
 context('buildCsp', () => {
-  it('works', () => {
+  it('applies csp object with companyCode TTIC, state FL, and product HO3', () => {
     // mq -- super easy ya
     const obj = {};
     buildCsp().mq(obj);
@@ -34,6 +34,63 @@ context('buildCsp', () => {
     });
   });
 
+  it('applies csp object with companyCode ABC123, state GA, and product DP4', () => {
+    const obj = {};
+    buildCsp().mq(obj);
+    expect(obj.csp).to.deep.equal({});
+
+    const req = {
+      headers: {
+        'harmony-csp': 'ABC123:GA:DP4'
+      },
+      someOtherStuff: 'yippie'
+    };
+
+    let called = 0;
+    const next = () => ++called;
+    buildCsp().express(req, {}, next);
+
+    expect(called).to.equal(1);
+    expect(req).to.deep.equal({
+      ...req,
+      csp: {
+        companyCode: 'ABC123',
+        state: 'GA',
+        product: 'DP4'
+      }
+    });
+  });
+
+  it('throws forbidden Forbidden: CSP is required when state is greater than 2 characters', () => {
+    const req = {
+      headers: {
+        'harmony-csp': 'TTIC:FLA:HO3'
+      }
+    };
+
+    try { buildCsp().express(req); } catch (e) {
+      expect(e).to.be.an.instanceOf(errors.Forbidden);
+      return;
+    }
+
+    expect.fail('should have thrown an error');
+  });
+
+  it('throws forbidden Forbidden: CSP is required when state contains a number', () => {
+    const req = {
+      headers: {
+        'harmony-csp': 'TTIC:F2:HO3'
+      }
+    };
+
+    try { buildCsp().express(req); } catch (e) {
+      expect(e).to.be.an.instanceOf(errors.Forbidden);
+      return;
+    }
+
+    expect.fail('should have thrown an error');
+  });
+
   it('throws forbidden when no csp exists or is malformed', () => {
     const req = {
       headers: {
@@ -41,8 +98,7 @@ context('buildCsp', () => {
       }
     };
 
-    try { buildCsp().express(req); }
-    catch (e) {
+    try { buildCsp().express(req); } catch (e) {
       expect(e).to.be.an.instanceOf(errors.Forbidden);
       return;
     }