impr: use tsrest for user endpoints (@fehmer) (#5815)

!nuf
monkeytypegame · Sep 5, 2024 · 259894a · 259894a
1 parent 6a24dbb
commit 259894a
Show file tree

Hide file tree

Showing 81 changed files with 5,297 additions and 3,332 deletions.
diff --git a/backend/__tests__/api/controllers/dev.spec.ts b/backend/__tests__/api/controllers/dev.spec.ts
@@ -1,13 +1,24 @@
 import request from "supertest";
 import app from "../../../src/app";
-
+import * as AuthUtils from "../../../src/utils/auth";
 import { ObjectId } from "mongodb";
 import * as Misc from "../../../src/utils/misc";
+import { DecodedIdToken } from "firebase-admin/auth";
 
 const uid = new ObjectId().toHexString();
+const mockDecodedToken = {
+  uid,
+  email: "newuser@mail.com",
+  iat: 0,
+} as DecodedIdToken;
 const mockApp = request(app);
 
 describe("DevController", () => {
+  const verifyIdTokenMock = vi.spyOn(AuthUtils, "verifyIdToken");
+  beforeEach(() => {
+    verifyIdTokenMock.mockReset().mockResolvedValue(mockDecodedToken);
+  });
+
   describe("generate testData", () => {
     const isDevEnvironmentMock = vi.spyOn(Misc, "isDevEnvironment");
 
@@ -22,6 +33,7 @@ describe("DevController", () => {
       //WHEN
       const { body } = await mockApp
         .post("/dev/generateData")
+        .set("Authorization", "Bearer 123456789")
         .send({ username: "test" })
         .expect(503);
       //THEN

diff --git a/backend/__tests__/api/controllers/leaderboard.spec.ts b/backend/__tests__/api/controllers/leaderboard.spec.ts
@@ -155,7 +155,7 @@ describe("Loaderboard Controller", () => {
         validationErrors: [
           '"language" Required',
           '"mode" Required',
-          '"mode2" Needs to be either a number, "zen" or "custom."',
+          '"mode2" Needs to be either a number, "zen" or "custom".',
         ],
       });
     });
@@ -320,7 +320,7 @@ describe("Loaderboard Controller", () => {
         validationErrors: [
           '"language" Required',
           '"mode" Required',
-          '"mode2" Needs to be either a number, "zen" or "custom."',
+          '"mode2" Needs to be either a number, "zen" or "custom".',
         ],
       });
     });
@@ -591,7 +591,7 @@ describe("Loaderboard Controller", () => {
         validationErrors: [
           '"language" Required',
           '"mode" Required',
-          '"mode2" Needs to be either a number, "zen" or "custom."',
+          '"mode2" Needs to be either a number, "zen" or "custom".',
         ],
       });
     });
@@ -768,7 +768,7 @@ describe("Loaderboard Controller", () => {
         validationErrors: [
           '"language" Required',
           '"mode" Required',
-          '"mode2" Needs to be either a number, "zen" or "custom."',
+          '"mode2" Needs to be either a number, "zen" or "custom".',
         ],
       });
     });

diff --git a/backend/__tests__/api/controllers/public.spec.ts b/backend/__tests__/api/controllers/public.spec.ts
@@ -72,7 +72,7 @@ describe("PublicController", () => {
         validationErrors: [
           '"language" Required',
           '"mode" Required',
-          '"mode2" Needs to be either a number, "zen" or "custom."',
+          '"mode2" Needs to be either a number, "zen" or "custom".',
         ],
       });
     });