Merge pull request #18120 from mozilla/fxa-10851

fix(metrics): pass the `service` value to the linked account login endpoint
mozilla · Dec 9, 2024 · fb2c2fb · fb2c2fb
2 parents 23f8f3f + 89ae274
commit fb2c2fb
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/packages/fxa-settings/src/pages/PostVerify/ThirdPartyAuthCallback/index.tsx b/packages/fxa-settings/src/pages/PostVerify/ThirdPartyAuthCallback/index.tsx
@@ -124,11 +124,18 @@ const ThirdPartyAuthCallback = ({
     }
 
     try {
+      const fxaParams = integration.getFxAParams();
+      let originalService;
+      if (fxaParams) {
+        const params = new URLSearchParams(fxaParams);
+        originalService =
+          params.get('service') || params.get('client_id') || undefined;
+      }
       const linkedAccount: LinkedAccountData =
         await account.verifyAccountThirdParty(
           thirdPartyOAuthCode,
           provider,
-          undefined,
+          originalService,
           queryParamsToMetricsContext(
             flowQueryParams as unknown as Record<string, string>
           )
@@ -141,8 +148,6 @@ const ThirdPartyAuthCallback = ({
 
       setCurrentAccount(linkedAccount.uid);
 
-      const fxaParams = integration.getFxAParams();
-
       // HACK: Hard navigate is required here to ensure that the new integration
       // is created based off updated search params.
       hardNavigate(