Support ChallengesService/GetProgression in non-Legacy games

thepeacockproject · Apr 4, 2024 · 28b6673 · 28b6673
1 parent 042af36
commit 28b6673
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 6 deletions.
diff --git a/components/2016/legacyProfileRouter.ts b/components/2016/legacyProfileRouter.ts
@@ -29,7 +29,7 @@ import { controller } from "../controller"
 import { json as jsonMiddleware } from "body-parser"
 import { uuidRegex } from "../utils"
 import { compileRuntimeChallenge } from "../candle/challengeHelpers"
-import { LegacyGetProgressionBody } from "../types/gameSchemas"
+import { GetChallengeProgressionBody } from "../types/gameSchemas"
 
 const legacyProfileRouter = Router()
 
@@ -95,7 +95,7 @@ legacyProfileRouter.post(
     "/ChallengesService/GetProgression",
     jsonMiddleware(),
     // @ts-expect-error Has jwt props.
-    (req: RequestWithJwt<never, LegacyGetProgressionBody>, res) => {
+    (req: RequestWithJwt<never, GetChallengeProgressionBody>, res) => {
         if (!Array.isArray(req.body.challengeids)) {
             res.status(400).send("invalid body")
             return

diff --git a/components/profileHandler.ts b/components/profileHandler.ts
@@ -58,7 +58,11 @@ import {
     compileRuntimeChallenge,
     inclusionDataCheck,
 } from "./candle/challengeHelpers"
-import { LoadSaveBody, ResolveGamerTagsBody } from "./types/gameSchemas"
+import {
+    GetChallengeProgressionBody,
+    LoadSaveBody,
+    ResolveGamerTagsBody,
+} from "./types/gameSchemas"
 import assert from "assert"
 
 const profileRouter = Router()
@@ -577,6 +581,54 @@ profileRouter.post(
     },
 )
 
+profileRouter.post(
+    "/ChallengesService/GetProgression",
+    jsonMiddleware(),
+    // @ts-expect-error Has jwt props.
+    (req: RequestWithJwt<never, GetChallengeProgressionBody>, res) => {
+        if (!Array.isArray(req.body.challengeids)) {
+            res.status(400).send("invalid body")
+            return
+        }
+
+        if (req.jwt.unique_name !== req.body.profileid) {
+            res.status(403).send("unauthorised")
+            return
+        }
+
+        const challenges: ChallengeProgressionData[] = []
+
+        for (const challengeId of req.body.challengeids) {
+            const challenge = controller.challengeService.getChallengeById(
+                challengeId,
+                req.gameVersion,
+            )
+
+            if (!challenge) {
+                log(LogLevel.ERROR, `Unknown challenge in CSGP: ${challengeId}`)
+                continue
+            }
+
+            const progression =
+                controller.challengeService.getPersistentChallengeProgression(
+                    req.jwt.unique_name,
+                    challengeId,
+                    req.gameVersion,
+                )
+
+            challenges.push({
+                ChallengeId: challengeId,
+                ProfileId: req.jwt.unique_name,
+                State: progression.State,
+                CompletedAt: progression.CompletedAt,
+                Completed: progression.Completed,
+            })
+        }
+
+        res.json(challenges)
+    },
+)
+
 profileRouter.post(
     "/HubPagesService/GetChallengeTreeFor",
     jsonMiddleware(),

diff --git a/components/types/gameSchemas.ts b/components/types/gameSchemas.ts
@@ -80,7 +80,7 @@ export type MultiplayerMatchStatsQuery = Partial<{
     contractSessionId: string
 }>
 
-export type LegacyGetProgressionBody = Partial<{
+export type GetChallengeProgressionBody = Partial<{
     profileid: string
     challengeids: string[]
 }>

diff --git a/components/types/types.ts b/components/types/types.ts
@@ -1278,11 +1278,11 @@ export interface ChallengeProgressionData {
     ChallengeId: string
     ProfileId: string
     Completed: boolean
-    Ticked: boolean
+    Ticked?: boolean
     ETag?: string
     State: Record<string, unknown>
     CompletedAt: Date | string | null
-    MustBeSaved: boolean
+    MustBeSaved?: boolean
 }
 
 export interface CompiledChallengeRuntimeData {