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

Merge branch 'main' into jmccannon/ac/pm-16811-scim-invite-optimization

Browse Source 
# Conflicts:
#	src/Core/AdminConsole/Services/Implementations/OrganizationService.cs
#	test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepositoryTests.cs
This commit is contained in:
jrmccannon
2025-03-05 15:24:13 -06:00
parent c7cc9527f4 88ffde930f
commit f8c08de2db
272 changed files with 16059 additions and 1921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/Identity.IntegrationTest/Endpoints/IdentityServerTwoFactorTests.cs
View File

@ -17,7 +17,6 @@ using Bit.Test.Common.AutoFixture.Attributes;
using Bit.Test.Common.Helpers;
using Duende.IdentityServer.Models;
using Duende.IdentityServer.Stores;
using IdentityModel;
using LinqToDB;
using NSubstitute;
using Xunit;
@ -67,7 +66,12 @@ public class IdentityServerTwoFactorTests : IClassFixture<IdentityApplicationFac
string emailToken = null;
factory.SubstituteService<IMailService>(mailService =>
{
mailService.SendTwoFactorEmailAsync(Arg.Any<string>(), Arg.Do<string>(t => emailToken = t))
mailService.SendTwoFactorEmailAsync(
Arg.Any<string>(),
Arg.Any<string>(),
Arg.Do<string>(t => emailToken = t),
Arg.Any<string>(),
Arg.Any<string>())
.Returns(Task.CompletedTask);
});
@ -273,7 +277,12 @@ public class IdentityServerTwoFactorTests : IClassFixture<IdentityApplicationFac
string emailToken = null;
localFactory.SubstituteService<IMailService>(mailService =>
{
mailService.SendTwoFactorEmailAsync(Arg.Any<string>(), Arg.Do<string>(t => emailToken = t))
mailService.SendTwoFactorEmailAsync(
Arg.Any<string>(),
Arg.Any<string>(),
Arg.Do<string>(t => emailToken = t),
Arg.Any<string>(),
Arg.Any<string>())
.Returns(Task.CompletedTask);
});