nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 07:36:14 -05:00
Code Activity

Add support for Key Connector OTP and account migration (#1663)

Browse Source 
Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
This commit is contained in:
Oscar Hinton
2021-11-09 16:37:32 +01:00
committed by GitHub
parent f6bc35b2d0
commit fd37cb5a12
62 changed files with 3799 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/Api.Test/Controllers/AccountsControllerTests.cs
View File

@ -55,7 +55,6 @@ namespace Bit.Api.Test.Controllers
_organizationUserRepository,
_providerUserRepository,
_paymentService,
_ssoUserRepository,
_userRepository,
_userService,
_sendRepository,
@ -320,7 +319,7 @@ namespace Bit.Api.Test.Controllers
var user = GenerateExampleUser();
ConfigureUserServiceToReturnValidPrincipalFor(user);
ConfigureUserServiceToAcceptPasswordFor(user);
await _sut.ApiKey(new ApiKeyRequestModel());
await _sut.ApiKey(new SecretVerificationRequestModel());
}
[Fact]
@ -329,7 +328,7 @@ namespace Bit.Api.Test.Controllers
ConfigureUserServiceToReturnNullPrincipal();
await Assert.ThrowsAsync<UnauthorizedAccessException>(
() => _sut.ApiKey(new ApiKeyRequestModel())
() => _sut.ApiKey(new SecretVerificationRequestModel())
);
}
@ -340,7 +339,7 @@ namespace Bit.Api.Test.Controllers
ConfigureUserServiceToReturnValidPrincipalFor(user);
ConfigureUserServiceToRejectPasswordFor(user);
await Assert.ThrowsAsync<BadRequestException>(
() => _sut.ApiKey(new ApiKeyRequestModel())
() => _sut.ApiKey(new SecretVerificationRequestModel())
);
}
@ -350,7 +349,7 @@ namespace Bit.Api.Test.Controllers
var user = GenerateExampleUser();
ConfigureUserServiceToReturnValidPrincipalFor(user);
ConfigureUserServiceToAcceptPasswordFor(user);
await _sut.RotateApiKey(new ApiKeyRequestModel());
await _sut.RotateApiKey(new SecretVerificationRequestModel());
}
[Fact]
@ -359,7 +358,7 @@ namespace Bit.Api.Test.Controllers
ConfigureUserServiceToReturnNullPrincipal();
await Assert.ThrowsAsync<UnauthorizedAccessException>(
() => _sut.ApiKey(new ApiKeyRequestModel())
() => _sut.ApiKey(new SecretVerificationRequestModel())
);
}
@ -370,7 +369,7 @@ namespace Bit.Api.Test.Controllers
ConfigureUserServiceToReturnValidPrincipalFor(user);
ConfigureUserServiceToRejectPasswordFor(user);
await Assert.ThrowsAsync<BadRequestException>(
() => _sut.ApiKey(new ApiKeyRequestModel())
() => _sut.ApiKey(new SecretVerificationRequestModel())
);
}
@ -409,6 +408,8 @@ namespace Bit.Api.Test.Controllers
{
_userService.CheckPasswordAsync(user, Arg.Any<string>())
.Returns(Task.FromResult(true));
_userService.VerifySecretAsync(user, Arg.Any<string>())
.Returns(Task.FromResult(true));
}
private void ConfigureUserServiceToReturnValidIdFor(User user)