nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 13:08:17 -05:00
Code

Remove hints from responses (#4635)

Browse Source
This commit is contained in:
Matt Gibson 2024-08-23 10:51:21 -07:00 committed by GitHub
parent 8ab19c7b00
commit aa66b5ad11
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Api/Auth/Models/Request/Accounts/UpdateProfileRequestModel.cs
View File

@ -8,13 +8,12 @@ public class UpdateProfileRequestModel
[StringLength(50)] [StringLength(50)]
public string Name { get; set; } public string Name { get; set; }
[StringLength(50)] [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 string MasterPasswordHint { get; set; }
public User ToUser(User existingUser) public User ToUser(User existingUser)
{ {
existingUser.Name = Name; existingUser.Name = Name;
existingUser.MasterPasswordHint = string.IsNullOrWhiteSpace(MasterPasswordHint) ? null : MasterPasswordHint;
return existingUser; return existingUser;
} }
} }

2
src/Api/Models/Response/ProfileResponseModel.cs
View File

@ -27,7 +27,6 @@ public class ProfileResponseModel : ResponseModel
EmailVerified = user.EmailVerified; EmailVerified = user.EmailVerified;
Premium = user.Premium; Premium = user.Premium;
PremiumFromOrganization = premiumFromOrganization; PremiumFromOrganization = premiumFromOrganization;
MasterPasswordHint = string.IsNullOrWhiteSpace(user.MasterPasswordHint) ? null : user.MasterPasswordHint;
Culture = user.Culture; Culture = user.Culture;
TwoFactorEnabled = twoFactorEnabled; TwoFactorEnabled = twoFactorEnabled;
Key = user.Key; Key = user.Key;
@ -53,7 +52,6 @@ public class ProfileResponseModel : ResponseModel
public bool EmailVerified { get; set; } public bool EmailVerified { get; set; }
public bool Premium { get; set; } public bool Premium { get; set; }
public bool PremiumFromOrganization { get; set; } public bool PremiumFromOrganization { get; set; }
public string MasterPasswordHint { get; set; }
public string Culture { get; set; } public string Culture { get; set; }
public bool TwoFactorEnabled { get; set; } public bool TwoFactorEnabled { get; set; }
public string Key { get; set; } public string Key { get; set; }

1
test/Api.IntegrationTest/Controllers/AccountsControllerTest.cs
View File

@ -30,7 +30,6 @@ public class AccountsControllerTest : IClassFixture<ApiApplicationFactory>
Assert.False(content.EmailVerified); Assert.False(content.EmailVerified);
Assert.False(content.Premium); Assert.False(content.Premium);
Assert.False(content.PremiumFromOrganization); Assert.False(content.PremiumFromOrganization);
Assert.Null(content.MasterPasswordHint);
Assert.Equal("en-US", content.Culture); Assert.Equal("en-US", content.Culture);
Assert.Null(content.Key); Assert.Null(content.Key);
Assert.Null(content.PrivateKey); Assert.Null(content.PrivateKey);