From d5aac9bac19ced44765c2bff79db703241a45a2a Mon Sep 17 00:00:00 2001
From: Patrick Pimentel <ppimentel@bitwarden.com>
Date: Mon, 2 Feb 2026 21:00:56 -0500
Subject: [PATCH] feat(emergency-access): [PM-31636] Emergency Access Takeover
 Salt - Added salt to response of emergency access takeover response.

---
 src/Api/Auth/Models/Response/EmergencyAccessResponseModel.cs | 2 ++
 src/Core/Entities/User.cs                                    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Api/Auth/Models/Response/EmergencyAccessResponseModel.cs b/src/Api/Auth/Models/Response/EmergencyAccessResponseModel.cs
index 640c9bb3e0..dff766da12 100644
--- a/src/Api/Auth/Models/Response/EmergencyAccessResponseModel.cs
+++ b/src/Api/Auth/Models/Response/EmergencyAccessResponseModel.cs
@@ -112,6 +112,7 @@ public class EmergencyAccessTakeoverResponseModel : ResponseModel
         KdfIterations = grantor.KdfIterations;
         KdfMemory = grantor.KdfMemory;
         KdfParallelism = grantor.KdfParallelism;
+        Salt = grantor.GetMasterPasswordSalt();
     }
 
     public int KdfIterations { get; private set; }
@@ -119,6 +120,7 @@ public class EmergencyAccessTakeoverResponseModel : ResponseModel
     public int? KdfParallelism { get; private set; }
     public KdfType Kdf { get; private set; }
     public string KeyEncrypted { get; private set; }
+    public string Salt { get; private set; }
 }
 
 public class EmergencyAccessViewResponseModel : ResponseModel
diff --git a/src/Core/Entities/User.cs b/src/Core/Entities/User.cs
index 669e32bcbe..4eb22f8f6f 100644
--- a/src/Core/Entities/User.cs
+++ b/src/Core/Entities/User.cs
@@ -51,7 +51,7 @@ public class User : ITableObject<Guid>, IStorableSubscriber, IRevisable, ITwoFac
     public string? Key { get; set; }
     /// <summary>
     /// The raw public key, without a signature from the user's signature key.
-    /// </summary> 
+    /// </summary>
     public string? PublicKey { get; set; }
     /// <summary>
     /// User key wrapped private key.