From aa66b5ad1101e22e0d721fc1f1a095f2bce4fe61 Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Fri, 23 Aug 2024 10:51:21 -0700
Subject: [PATCH] Remove hints from responses (#4635)

---
 .../Auth/Models/Request/Accounts/UpdateProfileRequestModel.cs  | 3 +--
 src/Api/Models/Response/ProfileResponseModel.cs                | 2 --
 test/Api.IntegrationTest/Controllers/AccountsControllerTest.cs | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Api/Auth/Models/Request/Accounts/UpdateProfileRequestModel.cs b/src/Api/Auth/Models/Request/Accounts/UpdateProfileRequestModel.cs
index a4d266eaa8..76072cb3a4 100644
--- a/src/Api/Auth/Models/Request/Accounts/UpdateProfileRequestModel.cs
+++ b/src/Api/Auth/Models/Request/Accounts/UpdateProfileRequestModel.cs
@@ -8,13 +8,12 @@ public class UpdateProfileRequestModel
     [StringLength(50)]
     public string Name { get; set; }
     [StringLength(50)]
-    [Obsolete("Changes will be made via the 'password' endpoint going forward.")]
+    [Obsolete("This field is ignored. Changes are made via the 'password' endpoint.")]
     public string MasterPasswordHint { get; set; }
 
     public User ToUser(User existingUser)
     {
         existingUser.Name = Name;
-        existingUser.MasterPasswordHint = string.IsNullOrWhiteSpace(MasterPasswordHint) ? null : MasterPasswordHint;
         return existingUser;
     }
 }
diff --git a/src/Api/Models/Response/ProfileResponseModel.cs b/src/Api/Models/Response/ProfileResponseModel.cs
index dc5c9e0a68..fbb60e7186 100644
--- a/src/Api/Models/Response/ProfileResponseModel.cs
+++ b/src/Api/Models/Response/ProfileResponseModel.cs
@@ -27,7 +27,6 @@ public class ProfileResponseModel : ResponseModel
         EmailVerified = user.EmailVerified;
         Premium = user.Premium;
         PremiumFromOrganization = premiumFromOrganization;
-        MasterPasswordHint = string.IsNullOrWhiteSpace(user.MasterPasswordHint) ? null : user.MasterPasswordHint;
         Culture = user.Culture;
         TwoFactorEnabled = twoFactorEnabled;
         Key = user.Key;
@@ -53,7 +52,6 @@ public class ProfileResponseModel : ResponseModel
     public bool EmailVerified { get; set; }
     public bool Premium { get; set; }
     public bool PremiumFromOrganization { get; set; }
-    public string MasterPasswordHint { get; set; }
     public string Culture { get; set; }
     public bool TwoFactorEnabled { get; set; }
     public string Key { get; set; }
diff --git a/test/Api.IntegrationTest/Controllers/AccountsControllerTest.cs b/test/Api.IntegrationTest/Controllers/AccountsControllerTest.cs
index 1bce9398ef..b6a0ccbedb 100644
--- a/test/Api.IntegrationTest/Controllers/AccountsControllerTest.cs
+++ b/test/Api.IntegrationTest/Controllers/AccountsControllerTest.cs
@@ -30,7 +30,6 @@ public class AccountsControllerTest : IClassFixture<ApiApplicationFactory>
         Assert.False(content.EmailVerified);
         Assert.False(content.Premium);
         Assert.False(content.PremiumFromOrganization);
-        Assert.Null(content.MasterPasswordHint);
         Assert.Equal("en-US", content.Culture);
         Assert.Null(content.Key);
         Assert.Null(content.PrivateKey);