From 11c989ca0b17fff856bf7bf3ffa4828550d6a80e Mon Sep 17 00:00:00 2001
From: zkldi <20380519+zkldi@users.noreply.github.com>
Date: Sun, 2 Jan 2022 19:59:48 +0000
Subject: [PATCH] Set the session to undefined, instead.

---
 server/src/server/router/api/v1/auth/router.test.ts | 5 +++--
 server/src/server/router/api/v1/auth/router.ts      | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/server/src/server/router/api/v1/auth/router.test.ts b/server/src/server/router/api/v1/auth/router.test.ts
index 2d671e364..d6928acdd 100644
--- a/server/src/server/router/api/v1/auth/router.test.ts
+++ b/server/src/server/router/api/v1/auth/router.test.ts
@@ -33,7 +33,7 @@ t.test("POST /api/v1/auth/login", (t) => {
 		t.end();
 	});
 
-	t.test("Should return 409 if user already logged in", async (t) => {
+	t.test("Should return 200 if user already logged in", async (t) => {
 		const res = await mockApi.post("/api/v1/auth/login").send({
 			username: "test_zkldi",
 			"!password": "password",
@@ -51,7 +51,8 @@ t.test("POST /api/v1/auth/login", (t) => {
 			})
 			.set("Cookie", cookie);
 
-		t.equal(res2.status, 409);
+		// even if they have a login already going, just let them log in.
+		t.equal(res2.status, 200);
 
 		t.end();
 	});
diff --git a/server/src/server/router/api/v1/auth/router.ts b/server/src/server/router/api/v1/auth/router.ts
index 12a47ebe6..9eeeea0fb 100644
--- a/server/src/server/router/api/v1/auth/router.ts
+++ b/server/src/server/router/api/v1/auth/router.ts
@@ -61,9 +61,7 @@ router.post(
 	),
 	async (req, res) => {
 		if (req.session.tachi?.user.id) {
-			// @ts-expect-error Type error with the @types/express-session library,
-			// i think.
-			req.session.destroy();
+			req.session.tachi = undefined;
 		}
 
 		logger.verbose(`Received login request with username ${req.body.username} (${req.ip})`);