[pull] master from monkeytypegame:master

backend/__tests__/api/controllers/leaderboard.spec.ts

@@ -358,6 +358,36 @@ describe("Loaderboard Controller", () => {
         true,
       );
     });
+    it("should get null if no rank", async () => {
+      //GIVEN
+      await enableConnectionsFeature(true);
+      getLeaderboardRankMock.mockResolvedValue(null);
+
+      //WHEN
+      const { body } = await mockApp
+        .get("/leaderboards/rank")
+        .query({
+          language: "english",
+          mode: "time",
+          mode2: "60",
+          friendsOnly: true,
+        })
+        .set("Authorization", `Bearer ${uid}`)
+        .expect(200);
+
+      //THEN
+      expect(getLeaderboardRankMock).toHaveBeenCalledWith(
+        "time",
+        "60",
+        "english",
+        uid,
+        true,
+      );
+      expect(body).toEqual({
+        message: "Rank retrieved",
+        data: null,
+      });
+    });
     it("should get with ape key", async () => {
       await acceptApeKeys(true);
       const apeKey = await mockAuthenticateWithApeKey(uid, await configuration);

backend/src/api/controllers/leaderboard.ts

@@ -98,10 +98,11 @@ export async function getRankFromLeaderboard(
     );
   }
 
-  return new MonkeyResponse(
-    "Rank retrieved",
-    omit(data as LeaderboardsDAL.DBLeaderboardEntry, ["_id"]),
-  );
+  if (data === null) {
+    return new MonkeyResponse("Rank retrieved", null);
+  }
+
+  return new MonkeyResponse("Rank retrieved", omit(data, ["_id"]));
 }
 
 function getDailyLeaderboardWithError(