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

Renamed method to improve clarity and consistency.

Browse Source 
Replaced `ValidateManagedUserDomainAsync` with `ValidateClaimedUserDomainAsync`.
This commit is contained in:
jrmccannon 2025-04-01 15:20:46 -05:00
parent cbca2eb1da
commit 766f9b6f0f
No known key found for this signature in database
GPG Key ID: CF03F3DB01CE96A6
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Auth/Controllers/AccountsController.cs
View File

@ -124,7 +124,7 @@ public class AccountsController : Controller
throw new BadRequestException("MasterPasswordHash", "Invalid password."); throw new BadRequestException("MasterPasswordHash", "Invalid password.");
} }
var managedUserValidationResult = await _userService.ValidateManagedUserDomainAsync(user, model.NewEmail); var managedUserValidationResult = await _userService.ValidateClaimedUserDomainAsync(user, model.NewEmail);
if (!managedUserValidationResult.Succeeded) if (!managedUserValidationResult.Succeeded)
{ {

4
src/Core/Services/IUserService.cs
View File

@ -142,9 +142,9 @@ public interface IUserService
/// <remarks> /// <remarks>
/// </remarks> /// </remarks>
/// <returns> /// <returns>
/// IdentityResult /// IdentityResult
/// </returns> /// </returns>
Task<IdentityResult> ValidateManagedUserDomainAsync(User user, string newEmail); Task<IdentityResult> ValidateClaimedUserDomainAsync(User user, string newEmail);
/// <summary> /// <summary>
/// Gets the organizations that manage the user. /// Gets the organizations that manage the user.

4
src/Core/Services/Implementations/UserService.cs
View File

@ -545,7 +545,7 @@ public class UserService : UserManager<User>, IUserService, IDisposable
return IdentityResult.Failed(_identityErrorDescriber.PasswordMismatch()); return IdentityResult.Failed(_identityErrorDescriber.PasswordMismatch());
} }
var managedUserValidationResult = await ValidateManagedUserDomainAsync(user, newEmail); var managedUserValidationResult = await ValidateClaimedUserDomainAsync(user, newEmail);
if (!managedUserValidationResult.Succeeded) if (!managedUserValidationResult.Succeeded)
{ {
@ -617,7 +617,7 @@ public class UserService : UserManager<User>, IUserService, IDisposable
return IdentityResult.Success; return IdentityResult.Success;
} }
public async Task<IdentityResult> ValidateManagedUserDomainAsync(User user, string newEmail) public async Task<IdentityResult> ValidateClaimedUserDomainAsync(User user, string newEmail)
{ {
var managingOrganizations = await GetOrganizationsManagingUserAsync(user.Id); var managingOrganizations = await GetOrganizationsManagingUserAsync(user.Id);

4
test/Api.Test/Auth/Controllers/AccountsControllerTests.cs
View File

@ -120,7 +120,7 @@ public class AccountsControllerTests : IDisposable
ConfigureUserServiceToReturnValidPrincipalFor(user); ConfigureUserServiceToReturnValidPrincipalFor(user);
ConfigureUserServiceToAcceptPasswordFor(user); ConfigureUserServiceToAcceptPasswordFor(user);
const string newEmail = "example@user.com"; const string newEmail = "example@user.com";
_userService.ValidateManagedUserDomainAsync(user, newEmail).Returns(IdentityResult.Success); _userService.ValidateClaimedUserDomainAsync(user, newEmail).Returns(IdentityResult.Success);
// Act // Act
await _sut.PostEmailToken(new EmailTokenRequestModel { NewEmail = newEmail }); await _sut.PostEmailToken(new EmailTokenRequestModel { NewEmail = newEmail });
@ -139,7 +139,7 @@ public class AccountsControllerTests : IDisposable
const string newEmail = "example@user.com"; const string newEmail = "example@user.com";
_userService.ValidateManagedUserDomainAsync(user, newEmail) _userService.ValidateClaimedUserDomainAsync(user, newEmail)
.Returns(IdentityResult.Failed(new IdentityError .Returns(IdentityResult.Failed(new IdentityError
{ {
Code = "TestFailure", Code = "TestFailure",