From 0df7e4938c81f30175ec9a35fe3ad0d09351c452 Mon Sep 17 00:00:00 2001 From: GroverTB Date: Wed, 20 Jul 2022 13:00:09 -0500 Subject: [PATCH 1/3] [ ADD ] return path callback origin --- lib/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/index.js b/lib/index.js index ad899ca..28ec67b 100644 --- a/lib/index.js +++ b/lib/index.js @@ -34,7 +34,7 @@ } function configureOrigin(options, req) { - var requestOrigin = req.headers.origin, + var requestOrigin = req.headers.origin || '*', headers = [], isAllowed; @@ -216,7 +216,7 @@ } if (originCallback) { - originCallback(req.headers.origin, function (err2, origin) { + originCallback(req.path, req.headers.origin, function (err2, origin) { if (err2 || !origin) { next(err2); } else { From bcae968c47beb77fdac1bfd36bcdc8aca7ea9f4b Mon Sep 17 00:00:00 2001 From: GroverTB Date: Thu, 21 Jul 2022 10:16:13 -0500 Subject: [PATCH 2/3] [ UPDATE ] change order params in when origin is function --- lib/index.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/index.js b/lib/index.js index 28ec67b..bcf9c13 100644 --- a/lib/index.js +++ b/lib/index.js @@ -216,14 +216,18 @@ } if (originCallback) { - originCallback(req.path, req.headers.origin, function (err2, origin) { - if (err2 || !origin) { - next(err2); - } else { - corsOptions.origin = origin; - cors(corsOptions, req, res, next); - } - }); + originCallback( + req.headers.origin, + function (err2, origin) { + if (err2 || !origin) { + next(err2); + } else { + corsOptions.origin = origin; + cors(corsOptions, req, res, next); + } + }, + req.path + ); } else { next(); } From 1f4ea2ab6bcdaebff3f811ae8fec88ac2f90844b Mon Sep 17 00:00:00 2001 From: GroverTB Date: Thu, 21 Jul 2022 10:25:50 -0500 Subject: [PATCH 3/3] [ UPDATE ] remove value of requestOrigin --- lib/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/index.js b/lib/index.js index bcf9c13..18ee171 100644 --- a/lib/index.js +++ b/lib/index.js @@ -34,7 +34,7 @@ } function configureOrigin(options, req) { - var requestOrigin = req.headers.origin || '*', + var requestOrigin = req.headers.origin, headers = [], isAllowed;