From 3dd0a1565567da874843b59836305cc0ab8f77f7 Mon Sep 17 00:00:00 2001 From: somramnani Date: Fri, 15 Nov 2024 16:00:56 -0500 Subject: [PATCH 1/3] fix(deployment-issue): initial setup --- index.js | 13 ++++--------- vercel.json | 10 ++++++++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/index.js b/index.js index 184210b..4faa873 100644 --- a/index.js +++ b/index.js @@ -4,7 +4,10 @@ const cors = require("cors"); const app = express(); const corsOptions = { - origin: "http://localhost:3000/", + origin: + process.env.NODE_ENV === "production" + ? "https://your-app.vercel.app" + : "http://localhost:3000", credentials: true, optionSucessStatus: 200, }; @@ -32,14 +35,6 @@ app.get("/api/get/*", async (req, res) => { }); app.get("/api/post/*/:data", async (req, res) => { - // res.setHeader("Access-Control-Allow-Origin", "*"); - // res.setHeader("Access-Control-Allow-Credentials", "true"); - // res.setHeader("Access-Control-Max-Age", "1800"); - // res.setHeader("Access-Control-Allow-Headers", "content-type"); - // res.setHeader( - // "Access-Control-Allow-Methods", - // "PUT, POST, GET, DELETE, PATCH, OPTIONS" - // ); const urlLink = req.params[0]; const authHeaders = req.headers.authorization || null; const data = req.params.data; diff --git a/vercel.json b/vercel.json index e208642..2b29845 100644 --- a/vercel.json +++ b/vercel.json @@ -1,5 +1,11 @@ { "version": 2, - "builds": [{ "src": "index.js", "use": "@vercel/node" }], - "routes": [{ "src": "/(.*)", "dest": "index.js" }] + "builds": [ + { "src": "server.js", "use": "@vercel/node" }, + { "src": "client/build/**/*", "use": "@vercel/static" } + ], + "routes": [ + { "src": "/api/(.*)", "dest": "/server.js" }, + { "src": "/(.*)", "dest": "/client/build/index.html" } + ] } From 211c9661758b8766f2904610cab4a86db7763fc3 Mon Sep 17 00:00:00 2001 From: somramnani Date: Fri, 15 Nov 2024 16:07:30 -0500 Subject: [PATCH 2/3] fix(deployment-issue): update process.env link --- index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 4faa873..d3a6fc6 100644 --- a/index.js +++ b/index.js @@ -6,8 +6,8 @@ const app = express(); const corsOptions = { origin: process.env.NODE_ENV === "production" - ? "https://your-app.vercel.app" - : "http://localhost:3000", + ? "https://api-proxy-server-git-fix-vercel-deployment-somramnanis-projects.vercel.app/" + : "http://localhost:3001", credentials: true, optionSucessStatus: 200, }; From e1090c22fbed4d79b392cf6cd1d2a7f57005eb19 Mon Sep 17 00:00:00 2001 From: somramnani Date: Fri, 15 Nov 2024 16:14:32 -0500 Subject: [PATCH 3/3] fix(deployment-issue): update process.env link --- index.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index d3a6fc6..b738ed6 100644 --- a/index.js +++ b/index.js @@ -3,10 +3,21 @@ const axios = require("axios"); const cors = require("cors"); const app = express(); +const allowedOrigins = [ + "https://api-proxy-server-git-fix-vercel-deployment-somramnanis-projects.vercel.app/", + "https://api-proxy-server-algy6v65w-somramnanis-projects.vercel.app/", +]; + const corsOptions = { origin: process.env.NODE_ENV === "production" - ? "https://api-proxy-server-git-fix-vercel-deployment-somramnanis-projects.vercel.app/" + ? (origin, callback) => { + if (allowedOrigins.includes(origin)) { + callback(null, true); + } else { + callback(new Error("Not allowed by CORS")); + } + } : "http://localhost:3001", credentials: true, optionSucessStatus: 200,