summary refs log tree commit diff
diff options
context:
space:
mode:
authorMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-07-20 21:12:23 +1000
committerMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-07-20 21:21:45 +1000
commite2827a332f36babc92742f18b17d2d2fba0c1bea (patch)
tree386a9d2be658f25ac4dd8fab3cd57525db9e217b
parentMerge branch 'feat/latestWebClient' into slowcord (diff)
downloadserver-e2827a332f36babc92742f18b17d2d2fba0c1bea.tar.xz
2FA on login page
-rw-r--r--slowcord/login/public/js/handler.js12
-rw-r--r--slowcord/login/public/login.html27
2 files changed, 35 insertions, 4 deletions
diff --git a/slowcord/login/public/js/handler.js b/slowcord/login/public/js/handler.js
index aabc7a4c..68a656b4 100644
--- a/slowcord/login/public/js/handler.js
+++ b/slowcord/login/public/js/handler.js
@@ -16,6 +16,18 @@ const handleSubmit = async (path, body) => {
 		return;
 	}
 
+	if (json.ticket) {
+		// my terrible solution to 2fa
+		const twoFactorForm = document.forms["2fa"];
+		const loginForm = document.forms["login"];
+
+		twoFactorForm.style.display = "flex";
+		loginForm.style.display = "none";
+
+		twoFactorForm.ticket.value = json.ticket;
+		return;
+	}
+
 	// Very fun error message here lol
 	const error =
 		json.errors
diff --git a/slowcord/login/public/login.html b/slowcord/login/public/login.html
index b2c1b229..8cecd20b 100644
--- a/slowcord/login/public/login.html
+++ b/slowcord/login/public/login.html
@@ -27,8 +27,7 @@
 				<p id="failure">Login failed</p>
 			</div>
 
-
-			<form action="javascript:void(0);">
+			<form action="javascript:void(0);" name="login">
 				<label for="email">Email</label>
 				<input type="email" name="email" />
 
@@ -42,9 +41,18 @@
 					Login with Discord
 				</a>
 
-				<div class="h-captcha" data-sitekey="fa3163ea-79a7-4b7b-b752-b58c545906c8"></div>
+				<div class="h-captcha" data-sitekey="fa3163ea-79a7-4b7b-b752-b58c545906c8" data-theme="dark"></div>
 				<script src="https://js.hcaptcha.com/1/api.js" async defer></script>
 			</form>
+
+			<form action="javascript:void(0);" name="2fa" style="display: none">
+				<label for="code">2FA Code</label>
+				<input type="number" name="code" />
+
+				<input type="hidden" name="ticket" />
+
+				<input type="submit" value="Login"/>
+			</form>
 		</div>
 	</div>
 
@@ -66,7 +74,7 @@
 		token = window.localStorage.getItem("token");
 		if (token) window.location.href = "/app";
 
-		document.forms[0].addEventListener("submit", async (e) => {
+		document.forms["login"].addEventListener("submit", async (e) => {
 			const data = new FormData(e.target);
 			const email = data.get("email");
 			const password = data.get("password");
@@ -78,6 +86,17 @@
 				captcha_key: hcaptcha,
 			});
 		})
+
+		document.forms["2fa"].addEventListener("submit", async (e) => {
+			const data = new FormData(e.target);
+			const code = data.get("code");
+			const ticket = data.get("ticket");
+
+			await handleSubmit("/api/v9/auth/mfa/totp", {
+				code: code,
+				ticket: ticket,
+			});
+		})
 	</script>
 </body>