From d23711e7399783460da2f8ef99ca38016080e599 Mon Sep 17 00:00:00 2001
From: Jade Ellis <jade@ellis.link>
Date: Mon, 25 Nov 2024 16:57:02 +0000
Subject: [PATCH 1/2] Strip trailing slash from homeserver base URL

---
 src/app/MatrixLogin.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/MatrixLogin.tsx b/src/app/MatrixLogin.tsx
index f066777..bf59e42 100644
--- a/src/app/MatrixLogin.tsx
+++ b/src/app/MatrixLogin.tsx
@@ -44,6 +44,9 @@ const LoginScreen = ({
 
 	const resolveHomeserver = useCallback(() => {
 		if (homeserverURL.startsWith("https://") || homeserverURL.startsWith("http://")) {
+			if (homeserverURL.endsWith("/")) {
+				setHomeserverURL(homeserverURL.slice(0, -1))
+			}
 			matrixClient.getLoginFlows().then(
 				resp => {
 					setLoginFlows(new Set(resp.flows.map(flow => flow.type)))

From 70fe6b910b3211f3b80d290379aaead1a078d19a Mon Sep 17 00:00:00 2001
From: Jade Ellis <jade@ellis.link>
Date: Mon, 25 Nov 2024 17:00:13 +0000
Subject: [PATCH 2/2] Force-allow cross-origin requests

---
 src/electron.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/electron.ts b/src/electron.ts
index ce6d85d..438b463 100644
--- a/src/electron.ts
+++ b/src/electron.ts
@@ -65,6 +65,16 @@ const createWindow = () => {
 		})
 	})
 
+	// Force-allow cross-origin requests, particularly for development mode,
+	// where the file is served from localhost
+	mainWindow.webContents.session.webRequest.onHeadersReceived((details, callback) => {
+		const responseHeaders = details.responseHeaders || {};
+		responseHeaders["access-control-allow-origin"] = ["*"]
+		callback({
+			responseHeaders,
+		})
+	})
+
 	loadIndexPage()
 	if (process.env.NODE_ENV === "development") {
 		mainWindow.webContents.openDevTools()