bug(settings): Use correct current key stretch version for signin unblock

Because:
- We were always using v1 ks
- This won't work for an account that has been upgraded to v2 ks

This Commit:
- Gets client salt and current ks version for account
- Fixes bug in gql. The version field should have been called currentVersion.

packages/fxa-graphql-api/src/gql/dto/payload/credential-status.ts

@@ -16,7 +16,7 @@ export class CredentialStatusPayload {
     description: 'The current version of the credentials.',
     nullable: true,
   })
-  public version?: string;
+  public currentVersion?: string;
 
   @Field({
     description:

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

@@ -17,8 +17,8 @@ import {
 } from '../../../models';
 
 // using default signin handlers
-import { BEGIN_SIGNIN_MUTATION } from '../gql';
-import { BeginSigninResponse } from '../interfaces';
+import { BEGIN_SIGNIN_MUTATION, CREDENTIAL_STATUS_MUTATION } from '../gql';
+import { BeginSigninResponse, CredentialStatusResponse } from '../interfaces';
 
 import SigninUnblock from '.';
 import {
@@ -36,7 +36,7 @@ import {
   getHandledError,
   getLocalizedErrorMessage,
 } from '../../../lib/error-utils';
-import { getCredentials } from 'fxa-auth-client/lib/crypto';
+import { getCredentials, getCredentialsV2 } from 'fxa-auth-client/lib/crypto';
 import { AuthUiErrors } from '../../../lib/auth-errors/auth-errors';
 import { SignInOptions } from 'fxa-auth-client/browser';
 
@@ -70,6 +70,9 @@ const SigninUnblockContainer = ({
   );
 
   const [beginSignin] = useMutation<BeginSigninResponse>(BEGIN_SIGNIN_MUTATION);
+  const [credentialStatus] = useMutation<CredentialStatusResponse>(
+    CREDENTIAL_STATUS_MUTATION
+  );
 
   const signinWithUnblockCode: BeginSigninWithUnblockCodeHandler = async (
     unblockCode: string,
@@ -87,7 +90,21 @@ const SigninUnblockContainer = ({
       ),
     };
 
-    const credentials = await getCredentials(authEmail, password!);
+    // Get credentials with the correct key version
+    const credentials = await (async () => {
+      const { data } = await credentialStatus({
+        variables: {
+          input: email,
+        },
+      });
+      const currentVersion = data?.credentialStatus.currentVersion;
+      if (currentVersion === 'v2') {
+        const clientSalt = data?.credentialStatus.clientSalt || '';
+        return await getCredentialsV2({ password, clientSalt });
+      }
+      return await getCredentials(authEmail, password);
+    })();
+
     try {
       return await beginSignin({
         variables: {

packages/fxa-settings/src/pages/Signin/gql.ts

@@ -65,7 +65,7 @@ export const CREDENTIAL_STATUS_MUTATION = gql`
   mutation CredentialStatus($input: String!) {
     credentialStatus(input: $input) {
       upgradeNeeded
-      version
+      currentVersion
       clientSalt
     }
   }

packages/fxa-settings/src/pages/Signin/interfaces.ts

@@ -106,7 +106,7 @@ export interface SigninFormData {
 export interface CredentialStatusResponse {
   credentialStatus: {
     upgradeNeeded: boolean;
-    version?: string;
+    currentVersion?: string;
     clientSalt?: string;
   };
 }