From 87351f39d915e08567aa289d5f4f6f9082108c32 Mon Sep 17 00:00:00 2001
From: Tom <20648924+moT01@users.noreply.github.com>
Date: Mon, 4 Mar 2024 23:50:53 -0600
Subject: [PATCH] fix(api): ms trophy validation (#53978)

---
 api-server/src/server/boot/challenge.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/api-server/src/server/boot/challenge.js b/api-server/src/server/boot/challenge.js
index e4f2c062d01..3a0996e2e5a 100644
--- a/api-server/src/server/boot/challenge.js
+++ b/api-server/src/server/boot/challenge.js
@@ -766,26 +766,26 @@ function createMsTrophyChallengeCompleted(app) {
 
       const { userId } = msProfileJson;
 
-      const msGameStatusApi = `https://learn.microsoft.com/api/gamestatus/${userId}`;
-      const msGameStatusApiRes = await fetch(msGameStatusApi);
-      const msGameStatusJson = await msGameStatusApiRes.json();
+      const msUserAchievementsApi = `https://learn.microsoft.com/api/achievements/user/${userId}`;
+      const msUserAchievementsApiRes = await fetch(msUserAchievementsApi);
+      const msUserAchievementsJson = await msUserAchievementsApiRes.json();
 
-      if (!msGameStatusApiRes.ok) {
+      if (!msUserAchievementsApiRes.ok) {
         return res.status(403).json({
           type: 'error',
           message: 'flash.ms.trophy.err-3'
         });
       }
 
-      if (msGameStatusJson.achievements?.length === 0) {
+      if (msUserAchievementsJson.achievements?.length === 0) {
         return res.status(403).json({
           type: 'error',
           message: 'flash.ms.trophy.err-6'
         });
       }
 
-      const hasEarnedTrophy = msGameStatusJson.achievements?.some(
-        a => a.awardUid === msTrophyId
+      const hasEarnedTrophy = msUserAchievementsJson.achievements?.some(
+        a => a.typeId === msTrophyId
       );
 
       if (!hasEarnedTrophy) {
@@ -800,7 +800,7 @@ function createMsTrophyChallengeCompleted(app) {
 
       const completedChallenge = pick(body, ['id']);
 
-      completedChallenge.solution = msGameStatusApi;
+      completedChallenge.solution = msUserAchievementsApi;
       completedChallenge.completedDate = Date.now();
 
       try {