Merge pull request #18973 from mozilla/fxa-11697

fix(metrics): Set flowId when user verifies totp session

Author: vbudhram

packages/fxa-auth-client/lib/client.ts

@@ -1766,6 +1766,7 @@ export default class AuthClient {
     code: string,
     options: {
       service?: string;
+      metricsContext?: MetricsContext;
     } = {},
     headers?: Headers
   ) {

packages/fxa-auth-server/lib/routes/totp.js

@@ -491,6 +491,7 @@ module.exports = (
               .required()
               .description(DESCRIPTION.codeTotp),
             service: validators.service,
+            metricsContext: METRICS_CONTEXT_SCHEMA
           }),
         },
         response: {

packages/fxa-graphql-api/src/gql/account.resolver.ts

@@ -199,10 +199,14 @@ export class AccountResolver {
     @Args('input', { type: () => VerifyTotpInput })
     input: VerifyTotpInput
   ): Promise<VerifyTotpPayload> {
+    const options = {
+      service: input.service,
+      metricsContext: input.metricsContext,
+    };
     const result = await this.authAPI.verifyTotpCode(
       token,
       input.code,
-      input.service ? { service: input.service } : undefined,
+      options,
       headers
     );
     return {

packages/fxa-graphql-api/src/gql/dto/input/verify-totp.ts

@@ -2,6 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 import { Field, InputType } from '@nestjs/graphql';
+import { MetricsContext } from './metrics-context';
 
 @InputType()
 export class VerifyTotpInput {
@@ -16,4 +17,7 @@ export class VerifyTotpInput {
 
   @Field({ nullable: true })
   public service?: string;
+
+  @Field(() => MetricsContext, { nullable: true })
+  public metricsContext?: MetricsContext;
 }

packages/fxa-settings/src/components/App/index.tsx

@@ -522,7 +522,7 @@ const AuthAndAccountSetupRoutes = ({
         />
         <SigninTotpCodeContainer
           path="/signin_totp_code/*"
-          {...{ integration, serviceName }}
+          {...{ integration, serviceName, flowQueryParams }}
         />
         <SigninPushCodeContainer
           path="/signin_push_code/*"

packages/fxa-settings/src/pages/Signin/SigninTotpCode/container.tsx

@@ -43,15 +43,19 @@ import {
 import { tryFinalizeUpgrade } from '../../../lib/gql-key-stretch-upgrade';
 import { AuthUiErrors } from '../../../lib/auth-errors/auth-errors';
 import { useNavigateWithQuery } from '../../../lib/hooks/useNavigateWithQuery';
+import { queryParamsToMetricsContext } from '../../../lib/metrics';
+import { searchParams } from '../../../lib/utilities';
+import { QueryParams } from '../../../index';
 
 export type SigninTotpCodeContainerProps = {
   integration: Integration;
   serviceName: MozServices;
+  flowQueryParams?: QueryParams;
 };
 
 export const SigninTotpCodeContainer = ({
   integration,
-  serviceName,
+  serviceName, flowQueryParams
 }: SigninTotpCodeContainerProps & RouteComponentProps) => {
   const authClient = useAuthClient();
   const { finishOAuthFlowHandler, oAuthDataError } = useFinishOAuthFlowHandler(
@@ -105,6 +109,9 @@ export const SigninTotpCodeContainer = ({
           input: {
             code,
             service,
+            metricsContext: queryParamsToMetricsContext(
+              flowQueryParams as ReturnType<typeof searchParams>
+            )
           },
         },
         update: (cache, { data }) => {