From 18b18527b44df5b87f22c47687a3ba6fb2056e96 Mon Sep 17 00:00:00 2001 From: ZhengLinLei Date: Mon, 22 Apr 2024 12:09:35 +0200 Subject: [PATCH 1/2] Fixed cors-origin problem --- src/drone-api/index.js | 3 +++ src/drone-api/package-lock.json | 35 +++++++++++++++++++++++++++++++++ src/drone-api/package.json | 1 + 3 files changed, 39 insertions(+) diff --git a/src/drone-api/index.js b/src/drone-api/index.js index a454287..abd8635 100644 --- a/src/drone-api/index.js +++ b/src/drone-api/index.js @@ -8,6 +8,8 @@ import _ddbb_config from './config/ddbb.js'; Custom import modules */ import express from 'express'; +// Cors +import cors from 'cors'; import routes from './routes/routes.js'; /* @@ -55,6 +57,7 @@ const app = express(); * CHECKAUTH */ app.use(express.json()); +app.use(cors()); app.use(routes); diff --git a/src/drone-api/package-lock.json b/src/drone-api/package-lock.json index a53826d..c9acb87 100644 --- a/src/drone-api/package-lock.json +++ b/src/drone-api/package-lock.json @@ -9,6 +9,7 @@ "version": "0.1.0", "license": "MIT", "dependencies": { + "cors": "^2.8.5", "express": "^4.18.3", "moment": "^2.30.1", "mongodb": "^6.4.0", @@ -301,6 +302,18 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -1090,6 +1103,14 @@ "node": ">=0.10.0" } }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/object-hash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", @@ -1848,6 +1869,15 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -2381,6 +2411,11 @@ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" + }, "object-hash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", diff --git a/src/drone-api/package.json b/src/drone-api/package.json index 47a1690..e1e15a8 100644 --- a/src/drone-api/package.json +++ b/src/drone-api/package.json @@ -28,6 +28,7 @@ "homepage": "https://github.com/oroneta/drone-module#readme", "dependencies": { "express": "^4.18.3", + "cors": "^2.8.5", "moment": "^2.30.1", "mongodb": "^6.4.0", "mongoose": "^8.2.0", From babbc971b6a6e8079e9915deb521e425016df52f Mon Sep 17 00:00:00 2001 From: ZhengLinLei Date: Mon, 22 Apr 2024 12:48:07 +0200 Subject: [PATCH 2/2] Added pre-flight options CORS --- src/drone-api/index.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/drone-api/index.js b/src/drone-api/index.js index abd8635..6129a8e 100644 --- a/src/drone-api/index.js +++ b/src/drone-api/index.js @@ -57,7 +57,10 @@ const app = express(); * CHECKAUTH */ app.use(express.json()); + app.use(cors()); +app.options('*', cors()) + app.use(routes);