From 236bebbc38771f27987c406b472be89d5b21713f Mon Sep 17 00:00:00 2001
From: Mike Amirault <mamirault@bitwarden.com>
Date: Mon, 2 Feb 2026 13:10:28 -0500
Subject: [PATCH] [PM-30675] Fix certain data fields being incorrect in
 account-restricted exports (#18531)

---
 libs/common/src/models/export/login.export.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libs/common/src/models/export/login.export.ts b/libs/common/src/models/export/login.export.ts
index 366a1761fd2..37e9ab34ec3 100644
--- a/libs/common/src/models/export/login.export.ts
+++ b/libs/common/src/models/export/login.export.ts
@@ -38,7 +38,11 @@ export class LoginExport {
     domain.username = conditionalEncString(req.username);
     domain.password = conditionalEncString(req.password);
     domain.totp = conditionalEncString(req.totp);
-    // Fido2credentials are currently not supported for exports.
+    if (req.fido2Credentials != null) {
+      domain.fido2Credentials = req.fido2Credentials.map((f2) =>
+        Fido2CredentialExport.toDomain(f2),
+      );
+    }
 
     return domain;
   }