Merge pull request #18450 from mozilla/FXA-11142-third-party-auth-metrics-context

fix(metrics): pass more metrics context params during 3rd-party verify

Author: chenba

packages/fxa-settings/src/pages/PostVerify/ThirdPartyAuthCallback/index.test.tsx

@@ -148,22 +148,33 @@ describe('ThirdPartyAuthCallback component', () => {
       finishOAuthFlowHandler: mockFinishOAuthFlowHandler,
     });
 
-    renderWith();
+    renderWith({
+      flowQueryParams: {
+        flowId: 'bbbb',
+        flowBeginTime: 1734112296874,
+      },
+      integration: {
+        ...mockThirdPartyAuthCallbackIntegration(),
+        getFxAParams: () =>
+          '?flowId=aaaa&flowBeginTime=1734112296000&utm_campaign=testo',
+      } as ModelsModule.ThirdPartyAuthCallbackIntegration,
+    });
 
     await waitFor(() => {
       expect(mockVerifyAccountThirdParty).toHaveBeenCalledWith(
         'code',
         'provider',
         undefined,
         {
+          utmCampaign: 'testo',
           flowId: 'aaaa',
           flowBeginTime: 1734112296000,
         }
       );
     });
 
     expect(hardNavigateSpy).toBeCalledWith(
-      '/post_verify/third_party_auth/callback?flowId=aaaa&flowBeginTime=1734112296000'
+      '/post_verify/third_party_auth/callback?flowId=aaaa&flowBeginTime=1734112296000&utm_campaign=testo'
     );
   });
 

packages/fxa-settings/src/pages/PostVerify/ThirdPartyAuthCallback/index.tsx

@@ -140,6 +140,7 @@ const ThirdPartyAuthCallback = ({
           originalService,
           queryParamsToMetricsContext({
             ...((flowQueryParams as Record<string, string>) || {}),
+            ...Object.fromEntries(params.entries()),
             // Important be sure to overwrite current flowQueryParams with provided fxa parameters.
             // If we don't do this, we will lose metrics.
             flowId,