Support v2 device experiments

packages/connect-react/src/components/append/AppendAfterErrorScreen.tsx

@@ -63,7 +63,7 @@ const AppendAfterErrorScreen = ({ attestationOptions }: { attestationOptions: st
         void handleErrorSoft(situationCode, true, true, error);
         break;
       case AppendSituationCode.ClientExcludeCredentialsMatch:
-        void handleCredentialExistsError(error);
+        void handleCredentialExistsError(attestationOptions, error);
         break;
       case AppendSituationCode.ExplicitSkipByUser:
         void handleSkip(situationCode, true);

packages/connect-react/src/components/append/AppendInitScreen.tsx

@@ -244,7 +244,7 @@ const AppendInitScreen = () => {
         setAppendLoading(false);
         break;
       case AppendSituationCode.ClientExcludeCredentialsMatch:
-        void handleCredentialExistsError(error);
+        void handleCredentialExistsError(attestationOptions, error);
         setAppendLoading(false);
         break;
       case AppendSituationCode.DeniedByPartialRollout:

packages/connect-react/src/components/passkeyList/PasskeyListScreen.tsx

@@ -137,7 +137,11 @@ const PasskeyListScreen = () => {
       }
 
       if (res.val.type === ConnectErrorType.ExcludeCredentialsMatch) {
-        return handleSituation(PasskeyListSituationCode.ClientExcludeCredentialsMatch, res.val);
+        return handleSituation(
+          PasskeyListSituationCode.ClientExcludeCredentialsMatch,
+          res.val,
+          startAppendRes.val.attestationOptions,
+        );
       }
 
       return handleSituation(PasskeyListSituationCode.CboApiNotAvailablePostAuthenticator, res.val);
@@ -171,15 +175,22 @@ const PasskeyListScreen = () => {
     statefulLoader.current.finish();
   };
 
-  const handleSituation = (situationCode: PasskeyListSituationCode, error?: ConnectError) => {
+  const handleSituation = (
+    situationCode: PasskeyListSituationCode,
+    error?: ConnectError,
+    attestationOptions?: string,
+  ) => {
     const messageCode = `situation: ${situationCode}`;
     log.debug(messageCode);
 
     const message = getPasskeyListErrorMessage(situationCode);
     switch (situationCode) {
       case PasskeyListSituationCode.ClientExcludeCredentialsMatch:
         setAppendLoading(false);
-        void getConnectService().recordEventAppendCredentialExistsError(`${messageCode} ${error?.track()}`);
+        void getConnectService().recordEventAppendCredentialExistsError(
+          attestationOptions ?? '',
+          `${messageCode} ${error?.track()}`,
+        );
         show(<AlreadyExistingModal hide={hide} />);
         break;
       case PasskeyListSituationCode.CboApiPasskeysNotSupportedLight:

packages/connect-react/src/contexts/AppendProcessContext.ts

@@ -22,7 +22,7 @@ export interface AppendProcessContextProps {
     error?: ConnectError,
   ) => Promise<void>;
   handleErrorHard: (situation: AppendSituationCode, expected: boolean, error?: ConnectError) => Promise<void>;
-  handleCredentialExistsError: (error?: ConnectError) => Promise<void>;
+  handleCredentialExistsError: (attestationOptions: string, error?: ConnectError) => Promise<void>;
   handleSkip: (situation: AppendSituationCode, explicit?: boolean) => Promise<void>;
   onReadMoreClick: () => Promise<void>;
   flags: Flags | undefined;

packages/connect-react/src/contexts/AppendProcessProvider.tsx

@@ -74,10 +74,10 @@ export const AppendProcessProvider: FC<PropsWithChildren<Props>> = ({ children,
   }, [getConnectService, config]);
 
   const handleCredentialExistsError = useCallback(
-    async (error?: ConnectError) => {
+    async (attestationOptions: string, error?: ConnectError) => {
       log.debug('error (credential-exists)');
 
-      await getConnectService().recordEventAppendCredentialExistsError(error?.track() ?? '');
+      await getConnectService().recordEventAppendCredentialExistsError(error?.track() ?? '', attestationOptions);
       void config.onComplete('complete-noop', getConnectService().encodeClientState());
     },
     [getConnectService, config],

packages/web-core/src/services/ConnectService.ts

@@ -644,8 +644,13 @@ export class ConnectService {
     return this.#recordEvent(PasskeyEventType.UserAppendAfterLoginErrorBlacklisted);
   }
 
-  recordEventAppendCredentialExistsError(messageCode: string) {
-    return this.#recordEvent(PasskeyEventType.AppendCredentialExists, messageCode);
+  recordEventAppendCredentialExistsError(messageCode: string, attestationOptions: string) {
+    let challenge;
+    if (attestationOptions) {
+      challenge = WebAuthnService.challengeFromAttestationOptions(attestationOptions);
+    }
+
+    return this.#recordEvent(PasskeyEventType.AppendCredentialExists, messageCode, challenge);
   }
 
   recordEventAppendError() {