From 2a1420cf79c301d9179fd4f088c7e576dcbf4223 Mon Sep 17 00:00:00 2001 From: plondon Date: Sat, 25 Sep 2021 08:18:04 -0400 Subject: [PATCH] Revert cors to working state --- backend/server.js | 6 +++--- frontend/src/app.js | 7 ++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/backend/server.js b/backend/server.js index bca4e21..74c2794 100644 --- a/backend/server.js +++ b/backend/server.js @@ -1,8 +1,8 @@ import http from "http"; import https from "https"; import path from "path"; - import cors from "cors" + import express from "express"; import ws from "express-ws"; import _ from "lodash"; @@ -21,8 +21,8 @@ const fathomSiteId = process.env.FATHOM_SITE_ID || ""; const langs = await langsPromise; const app = express(); -app.use(cors()); -app.options("*", cors()); +app.use(cors({ origin: true, credentials: true })); +app.options("*", cors({ origin: true, credentials: true })); app.set("query parser", (qs) => new URLSearchParams(qs)); app.set("view engine", "ejs"); diff --git a/frontend/src/app.js b/frontend/src/app.js index be31ca5..f99d426 100644 --- a/frontend/src/app.js +++ b/frontend/src/app.js @@ -135,8 +135,8 @@ async function main() { fitAddon.fit(); window.addEventListener("resize", () => fitAddon.fit()); window.addEventListener("message", (msg) => { - console.log(msg); - }); + console.log('message from codeamigo', msg) + }) await new Promise((resolve) => term.write("Connecting to server...", resolve) @@ -166,9 +166,6 @@ async function main() { document.location.host + `/api/v1/ws?lang=${encodeURIComponent(config.id)}` ); - socket.addEventListener("error", (ev) => { - console.log(ev); - }); socket.addEventListener("open", () => { connectionStatus.innerText = "connected"; console.log("Successfully connected to server");