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

Clean up

Browse Source
This commit is contained in:
Thomas Rittson 2025-05-12 14:38:02 +10:00
parent 52445f51f0
commit c106050e99
No known key found for this signature in database
GPG Key ID: CDDDA03861C35E27
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/Core.Test/Services/UserServiceTests.cs
View File

@ -255,14 +255,14 @@ public class UserServiceTests
[Theory] [Theory]
// A user who has a password, and the password is valid should only check for that password // A user who has a password, and the password is valid should only check for that password
[BitAutoData(true, "test_password", true, ShouldCheck.Password)] [BitAutoData(true, "test_password", true, ShouldCheck.Password)]
// // A user who does not have a password, should only check if the OTP is valid // A user who does not have a password, should only check if the OTP is valid
// [BitAutoData(false, "otp_token", true, ShouldCheck.OTP)] [BitAutoData(false, "otp_token", true, ShouldCheck.OTP)]
// // A user who has a password but supplied a OTP, it will check password first and then try OTP // A user who has a password but supplied a OTP, it will check password first and then try OTP
// [BitAutoData(true, "otp_token", true, ShouldCheck.Password | ShouldCheck.OTP)] [BitAutoData(true, "otp_token", true, ShouldCheck.Password | ShouldCheck.OTP)]
// // A user who does not have a password and supplied an invalid OTP token, should only check OTP and return invalid // A user who does not have a password and supplied an invalid OTP token, should only check OTP and return invalid
// [BitAutoData(false, "bad_otp_token", false, ShouldCheck.OTP)] [BitAutoData(false, "bad_otp_token", false, ShouldCheck.OTP)]
// // A user who does have a password but they supply a bad one, we will check both but it will still be invalid // A user who does have a password but they supply a bad one, we will check both but it will still be invalid
// [BitAutoData(true, "bad_test_password", false, ShouldCheck.Password | ShouldCheck.OTP)] [BitAutoData(true, "bad_test_password", false, ShouldCheck.Password | ShouldCheck.OTP)]
public async Task VerifySecretAsync_Works( public async Task VerifySecretAsync_Works(
bool shouldHavePassword, string secret, bool expectedIsVerified, ShouldCheck shouldCheck, // inline theory data bool shouldHavePassword, string secret, bool expectedIsVerified, ShouldCheck shouldCheck, // inline theory data
User user) // AutoFixture injected data User user) // AutoFixture injected data
@ -289,14 +289,12 @@ public class UserServiceTests
// HACK: reassign public property on base class after it's overwritten by autofixture // HACK: reassign public property on base class after it's overwritten by autofixture
sutProvider.Sut.PasswordHasher = sutProvider.GetDependency<IPasswordHasher<User>>(); sutProvider.Sut.PasswordHasher = sutProvider.GetDependency<IPasswordHasher<User>>();
// DEBUG: check the public property on the base class matches the mock in SutProvider.
// If you remove the HACK above, this will fail (and so will the rest of the test).
Assert.Equal(sutProvider.Sut.PasswordHasher, sutProvider.GetDependency<IPasswordHasher<User>>()); Assert.Equal(sutProvider.Sut.PasswordHasher, sutProvider.GetDependency<IPasswordHasher<User>>());
var actualIsVerified = await sutProvider.Sut.VerifySecretAsync(user, secret); var actualIsVerified = await sutProvider.Sut.VerifySecretAsync(user, secret);
sutProvider.GetDependency<IPasswordHasher<User>>()
.Received(1)
.VerifyHashedPassword(Arg.Any<User>(), Arg.Any<string>(), Arg.Any<string>());
Assert.Equal(expectedIsVerified, actualIsVerified); Assert.Equal(expectedIsVerified, actualIsVerified);
await sutProvider.GetDependency<IUserTwoFactorTokenProvider<User>>() await sutProvider.GetDependency<IUserTwoFactorTokenProvider<User>>()