From d16a5cb73e54724171202d90d1f6ff1f192befd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20=C3=85berg?= <anders@andersaberg.com>
Date: Fri, 16 May 2025 19:30:47 +0200
Subject: [PATCH] Revert "PM-21553: Added support for credential.toJSON()
 (#14734)" (#14819)

This reverts commit df8d184889ef9accf5d07c3d740eb976d30dffea.
---
 .../autofill/fido2/utils/webauthn-utils.ts    |  2 -
 .../platform/services/fido2/fido2-utils.ts    | 39 -------------------
 2 files changed, 41 deletions(-)

diff --git a/apps/browser/src/autofill/fido2/utils/webauthn-utils.ts b/apps/browser/src/autofill/fido2/utils/webauthn-utils.ts
index 0cccd91876d..c8bcf5faa4b 100644
--- a/apps/browser/src/autofill/fido2/utils/webauthn-utils.ts
+++ b/apps/browser/src/autofill/fido2/utils/webauthn-utils.ts
@@ -88,7 +88,6 @@ export class WebauthnUtils {
       getClientExtensionResults: () => ({
         credProps: result.extensions.credProps,
       }),
-      toJSON: () => Fido2Utils.createResultToJson(result),
     } as PublicKeyCredential;
 
     // Modify prototype chains to fix `instanceof` calls.
@@ -135,7 +134,6 @@ export class WebauthnUtils {
       } as AuthenticatorAssertionResponse,
       getClientExtensionResults: () => ({}),
       authenticatorAttachment: "platform",
-      toJSON: () => Fido2Utils.getResultToJson(result),
     } as PublicKeyCredential;
 
     // Modify prototype chains to fix `instanceof` calls.
diff --git a/libs/common/src/platform/services/fido2/fido2-utils.ts b/libs/common/src/platform/services/fido2/fido2-utils.ts
index 6413eeade04..b9f3c8f8c48 100644
--- a/libs/common/src/platform/services/fido2/fido2-utils.ts
+++ b/libs/common/src/platform/services/fido2/fido2-utils.ts
@@ -1,45 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
-import type {
-  AssertCredentialResult,
-  CreateCredentialResult,
-} from "../../abstractions/fido2/fido2-client.service.abstraction";
-
 // @ts-strict-ignore
 export class Fido2Utils {
-  static createResultToJson(result: CreateCredentialResult): any {
-    return {
-      id: result.credentialId,
-      rawId: result.credentialId,
-      response: {
-        clientDataJSON: result.clientDataJSON,
-        authenticatorData: result.authData,
-        transports: result.transports,
-        publicKey: result.publicKey,
-        publicKeyAlgorithm: result.publicKeyAlgorithm,
-        attestationObject: result.attestationObject,
-      },
-      authenticatorAttachment: "platform",
-      clientExtensionResults: result.extensions,
-      type: "public-key",
-    };
-  }
-
-  static getResultToJson(result: AssertCredentialResult): any {
-    return {
-      id: result.credentialId,
-      rawId: result.credentialId,
-      response: {
-        clientDataJSON: result.clientDataJSON,
-        authenticatorData: result.authenticatorData,
-        signature: result.signature,
-        userHandle: result.userHandle,
-      },
-      authenticatorAttachment: "platform",
-      clientExtensionResults: {},
-      type: "public-key",
-    };
-  }
-
   static bufferToString(bufferSource: BufferSource): string {
     return Fido2Utils.fromBufferToB64(Fido2Utils.bufferSourceToUint8Array(bufferSource))
       .replace(/\+/g, "-")