From fe57b5b06fd68d22256c0d8edcff8d3f802a2f7a Mon Sep 17 00:00:00 2001
From: Aadi Desai <21363892+supleed2@users.noreply.github.com>
Date: Fri, 8 Sep 2023 01:00:29 +0100
Subject: [PATCH] Dynamic origin in submission redirect URLs

---
 html/functions/submit.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/html/functions/submit.ts b/html/functions/submit.ts
index e39f1de..6cea4bd 100644
--- a/html/functions/submit.ts
+++ b/html/functions/submit.ts
@@ -1,17 +1,19 @@
 export async function onRequestPost({ request, env }) {
-	let { username, password, discordID } = Object.fromEntries(await request.formData().then((f) => f.entries()));
+	const origin = new URL(request.url).origin;
+	const { username, password, discordID } = Object.fromEntries(await request.formData().then((f) => f.entries()));
 
-	let login = await fetch("https://eactivities.union.ic.ac.uk/user/login", {
+	const login = await fetch("https://eactivities.union.ic.ac.uk/user/login", {
 		method: "POST",
 		body: JSON.stringify({ username: username, password: password, }),
 		headers: { "content-type": "application/json", },
 	}).catch(console.error);
 
 	if (login == undefined || login.status != 200) {
-		console.log(`Login verification failed 😢 for discord user [${discordID}] with shortcode [${username}]`);
-		return Response.redirect("http://127.0.0.1:8788/verify/failure", 301);
+		console.log(`😢 Login verification failed for discord user [${discordID}] with shortcode [${username}]`);
+		return Response.redirect(`${origin}/verify/failure`, 301);
 	} else {
-		console.log(`Login verification succeeded 🚀 for discord user [${discordID}] with shortcode [${username}]`);
-		return Response.redirect("http://127.0.0.1:8788/verify/success", 301);
+		console.log(`🚀 Login verification succeeded for discord user [${discordID}] with shortcode [${username}]`);
+		// TODO: Send username and discordID to Nanobot
+		return Response.redirect(`${origin}/verify/success`, 301);
 	}
 }