From 0daefb26d33b9949393b01487dece58f39c3ffbe Mon Sep 17 00:00:00 2001
From: zkldi <20380519+zkldi@users.noreply.github.com>
Date: Sun, 19 Dec 2021 00:08:46 +0000
Subject: [PATCH 1/3] Enforce that all USCIR 2X endpoints return an object in
 their body.

---
 server/src/server/router/ir/usc/_playtype/router.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/server/router/ir/usc/_playtype/router.ts b/server/src/server/router/ir/usc/_playtype/router.ts
index 1df8b17ca..e487509f2 100644
--- a/server/src/server/router/ir/usc/_playtype/router.ts
+++ b/server/src/server/router/ir/usc/_playtype/router.ts
@@ -149,6 +149,7 @@ router.get("/charts/:chartHash", RetrieveChart, (req, res) => {
 	return res.status(200).json({
 		statusCode: STATUS_CODES.SUCCESS,
 		description: "This chart is tracked by the IR.",
+		body: {},
 	});
 });
 
@@ -414,6 +415,7 @@ router.post("/scores", RequirePermissions("submit_score"), async (req, res) => {
 		return res.status(200).json({
 			statusCode: STATUS_CODES.ACCEPTED,
 			description: `This score has been accepted, but is waiting for more players before its parent chart is accepted. (${players.length}/${ServerConfig.USC_QUEUE_SIZE})`,
+			body: {},
 		});
 	}
 
@@ -508,7 +510,7 @@ router.post(
 			return res.status(200).json({
 				statusCode: STATUS_CODES.SUCCESS,
 				description: "Saved replay.",
-				body: null,
+				body: {},
 			});
 		} catch (err) {
 			// impossible to test pretty much.

From a800ec9cdeadef724c2d116f7ad5d0980c330f61 Mon Sep 17 00:00:00 2001
From: zkldi <20380519+zkldi@users.noreply.github.com>
Date: Sun, 19 Dec 2021 00:23:40 +0000
Subject: [PATCH 2/3] Bump Tests

---
 .../router/ir/usc/_playtype/router.test.ts    | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/server/src/server/router/ir/usc/_playtype/router.test.ts b/server/src/server/router/ir/usc/_playtype/router.test.ts
index 6d65ebcc5..b66fd19c7 100644
--- a/server/src/server/router/ir/usc/_playtype/router.test.ts
+++ b/server/src/server/router/ir/usc/_playtype/router.test.ts
@@ -72,16 +72,15 @@ t.test("GET /ir/usc/Keyboard", async (t) => {
 
 t.test("GET /ir/usc/Controller", async (t) => {
 	t.beforeEach(ResetDBState);
-	t.beforeEach(async () => {
-		await db["api-tokens"].insert({
-			userID: 1,
-			identifier: "USC Token",
-			permissions: {
-				submit_score: true,
-			},
-			token: "foo",
-			fromAPIClient: null,
-		});
+
+	await db["api-tokens"].insert({
+		userID: 1,
+		identifier: "USC Token",
+		permissions: {
+			submit_score: true,
+		},
+		token: "foo",
+		fromAPIClient: null,
 	});
 
 	TestAuth("/ir/usc/Controller");
@@ -416,7 +415,7 @@ t.test("POST /replays", (t) => {
 		t.strictSame(res.body, {
 			statusCode: 20,
 			description: "Saved replay.",
-			body: null,
+			body: {},
 		});
 
 		const stored = await CDNRetrieve("/uscir/replays/MOCK_IDENTIFIER");

From b073d3aa5b332cf02aff317ee6e8b5df11412f67 Mon Sep 17 00:00:00 2001
From: zkldi <20380519+zkldi@users.noreply.github.com>
Date: Sun, 19 Dec 2021 00:28:20 +0000
Subject: [PATCH 3/3] Fix obscure test collision lazily

---
 server/src/server/router/ir/usc/_playtype/router.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/server/router/ir/usc/_playtype/router.test.ts b/server/src/server/router/ir/usc/_playtype/router.test.ts
index b66fd19c7..660eb981f 100644
--- a/server/src/server/router/ir/usc/_playtype/router.test.ts
+++ b/server/src/server/router/ir/usc/_playtype/router.test.ts
@@ -79,13 +79,13 @@ t.test("GET /ir/usc/Controller", async (t) => {
 		permissions: {
 			submit_score: true,
 		},
-		token: "foo",
+		token: "fee",
 		fromAPIClient: null,
 	});
 
 	TestAuth("/ir/usc/Controller");
 
-	const res = await mockApi.get("/ir/usc/Controller").set("Authorization", "Bearer foo");
+	const res = await mockApi.get("/ir/usc/Controller").set("Authorization", "Bearer fee");
 
 	t.equal(res.body.statusCode, 20, "Should return 20");
 	t.match(