From 9b6eab27bc4e5ee25d1d3c6ce5972e83db90c650 Mon Sep 17 00:00:00 2001
From: Stijn Taelemans <stijn@digita.ai>
Date: Wed, 10 Feb 2021 10:51:07 +0100
Subject: [PATCH] refactor: upgraded @types/cors

---
 package-lock.json                    |  9 +++------
 package.json                         |  2 +-
 src/server/middleware/CorsHandler.ts | 13 ++++++++++---
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f31119fc0..e214f4f5e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1176,12 +1176,9 @@
       "dev": true
     },
     "@types/cors": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.8.tgz",
-      "integrity": "sha512-fO3gf3DxU2Trcbr75O7obVndW/X5k8rJNZkLXlQWStTHhP71PkRqjwPIEI0yMnJdg9R9OasjU+Bsr+Hr1xy/0w==",
-      "requires": {
-        "@types/express": "*"
-      }
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.9.tgz",
+      "integrity": "sha512-zurD1ibz21BRlAOIKP8yhrxlqKx6L9VCwkB5kMiP6nZAhoF5MvC7qS1qPA7nRcr1GJolfkQC7/EAL4hdYejLtg=="
     },
     "@types/express": {
       "version": "4.17.8",
diff --git a/package.json b/package.json
index c956f88ec..0dee4246e 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "@solid/identity-token-verifier": "^0.5.1",
     "@types/arrayify-stream": "^1.0.0",
     "@types/async-lock": "^1.1.2",
-    "@types/cors": "^2.8.6",
+    "@types/cors": "^2.8.9",
     "@types/express": "^4.17.6",
     "@types/mime-types": "^2.1.0",
     "@types/n3": "^1.4.4",
diff --git a/src/server/middleware/CorsHandler.ts b/src/server/middleware/CorsHandler.ts
index 6bf8c4e61..23af49c5a 100644
--- a/src/server/middleware/CorsHandler.ts
+++ b/src/server/middleware/CorsHandler.ts
@@ -1,6 +1,5 @@
 import cors from 'cors';
-import type { CorsOptions } from 'cors';
-import type { RequestHandler } from 'express';
+import type { CorsOptions, CorsRequest } from 'cors';
 import type { HttpHandlerInput } from '../HttpHandler';
 import { HttpHandler } from '../HttpHandler';
 
@@ -30,7 +29,15 @@ interface SimpleCorsOptions {
  * Full details: https://solid.github.io/specification/protocol#cors-server
  */
 export class CorsHandler extends HttpHandler {
-  private readonly corsHandler: RequestHandler;
+  private readonly corsHandler: (
+    req: CorsRequest,
+    res: {
+      statusCode?: number;
+      setHeader: (key: string, value: string) => any;
+      end: () => any;
+    },
+    next: (err?: any) => any,
+  ) => void;
 
   public constructor(options: SimpleCorsOptions = {}) {
     super();