feat(middy2): middy v2 version (#34)

- updated deps - stopped breaking the middleware chain - updated the tests - bump version to 2.0.0
schibsted · Jul 27, 2021 · 7f92520 · 7f92520
1 parent 252747a
commit 7f92520
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 74 deletions.
diff --git a/index.js b/index.js
@@ -60,8 +60,6 @@ const corsMiddleware = (opts) => ({
             },
             handler.response
         );
-
-        return handler;
     },
 });
 

diff --git a/index.test.js b/index.test.js
@@ -176,19 +176,15 @@ test('Adds CORS headers on error from disallowed origin', async () => {
             },
             {}
         )
-    ).rejects.toEqual(
-        expect.objectContaining({
-            response: {
-                headers: {
-                    'access-control-allow-credentials': true,
-                    'access-control-allow-headers': 'Content-Type, Accept, X-Forwarded-For',
-                    'access-control-allow-methods': 'GET, POST',
-                    'access-control-expose-headers': 'x-my-header',
-                    'access-control-max-age': 2628000,
-                },
-            },
-        })
-    );
+    ).resolves.toMatchObject({
+        headers: {
+            'access-control-allow-credentials': true,
+            'access-control-allow-headers': 'Content-Type, Accept, X-Forwarded-For',
+            'access-control-allow-methods': 'GET, POST',
+            'access-control-expose-headers': 'x-my-header',
+            'access-control-max-age': 2628000,
+        },
+    });
 });
 
 test('Adds CORS headers on error from allowed origin', async () => {
@@ -216,20 +212,16 @@ test('Adds CORS headers on error from allowed origin', async () => {
             },
             {}
         )
-    ).rejects.toEqual(
-        expect.objectContaining({
-            response: {
-                headers: {
-                    'access-control-allow-credentials': true,
-                    'access-control-allow-headers': 'Content-Type, Accept, X-Forwarded-For',
-                    'access-control-allow-methods': 'GET, POST',
-                    'access-control-allow-origin': 'https://www.tek.no',
-                    'access-control-expose-headers': 'x-my-header',
-                    'access-control-max-age': 2628000,
-                },
-            },
-        })
-    );
+    ).resolves.toMatchObject({
+        headers: {
+            'access-control-allow-credentials': true,
+            'access-control-allow-headers': 'Content-Type, Accept, X-Forwarded-For',
+            'access-control-allow-methods': 'GET, POST',
+            'access-control-allow-origin': 'https://www.tek.no',
+            'access-control-expose-headers': 'x-my-header',
+            'access-control-max-age': 2628000,
+        },
+    });
 });
 
 test('Adds CORS headers on error when all origins allowed', async () => {
@@ -257,20 +249,16 @@ test('Adds CORS headers on error when all origins allowed', async () => {
             },
             {}
         )
-    ).rejects.toEqual(
-        expect.objectContaining({
-            response: {
-                headers: {
-                    'access-control-allow-credentials': true,
-                    'access-control-allow-headers': 'Content-Type, Accept, X-Forwarded-For',
-                    'access-control-allow-methods': 'GET, POST',
-                    'access-control-allow-origin': 'https://www.tek.no',
-                    'access-control-expose-headers': 'x-my-header',
-                    'access-control-max-age': 2628000,
-                },
-            },
-        })
-    );
+    ).resolves.toMatchObject({
+        headers: {
+            'access-control-allow-credentials': true,
+            'access-control-allow-headers': 'Content-Type, Accept, X-Forwarded-For',
+            'access-control-allow-methods': 'GET, POST',
+            'access-control-allow-origin': 'https://www.tek.no',
+            'access-control-expose-headers': 'x-my-header',
+            'access-control-max-age': 2628000,
+        },
+    });
 });
 
 test('Keep headers already present in the response on error from disallowed origin', async () => {
@@ -286,8 +274,6 @@ test('Keep headers already present in the response on error from disallowed orig
                 someHeader: 'someValue',
             },
         };
-
-        return true;
     });
 
     handler.use(
@@ -310,19 +296,15 @@ test('Keep headers already present in the response on error from disallowed orig
             },
             {}
         )
-    ).rejects.toEqual(
-        expect.objectContaining({
-            response: {
-                headers: {
-                    'access-control-allow-credentials': true,
-                    'access-control-allow-headers': 'Content-Type, Accept, X-Forwarded-For',
-                    'access-control-allow-methods': 'GET, POST',
-                    'access-control-allow-origin': 'https://www.tek.no',
-                    'access-control-expose-headers': 'x-my-header',
-                    'access-control-max-age': 2628000,
-                    someHeader: 'someValue',
-                },
-            },
-        })
-    );
+    ).resolves.toMatchObject({
+        headers: {
+            'access-control-allow-credentials': true,
+            'access-control-allow-headers': 'Content-Type, Accept, X-Forwarded-For',
+            'access-control-allow-methods': 'GET, POST',
+            'access-control-allow-origin': 'https://www.tek.no',
+            'access-control-expose-headers': 'x-my-header',
+            'access-control-max-age': 2628000,
+            someHeader: 'someValue',
+        },
+    });
 });
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@schibsted/middy-cors",
-  "version": "0.3.0",
+  "version": "2.0.0",
   "description": "Middy middleware for adding CORS headers to success response and errors",
   "main": "index.js",
   "engines": {
@@ -47,7 +47,7 @@
   },
   "homepage": "https://github.com/schibsted/middy-cors#readme",
   "devDependencies": {
-    "@middy/core": "^1.4.0",
+    "@middy/core": "^2.4.3",
     "babel-eslint": "^10.1.0",
     "eslint": "^7.11.0",
     "eslint-config-airbnb-base": "^14.2.0",
@@ -66,6 +66,6 @@
     "ramda": "^0.27.1"
   },
   "peerDependencies": {
-    "@middy/core": ">=1.0.0"
+    "@middy/core": ">=2.0.0"
   }
 }