From 29b47f72caf55b3b49b975604d69f57b408a8bb0 Mon Sep 17 00:00:00 2001 From: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com> Date: Wed, 19 Jun 2024 15:11:24 -0400 Subject: [PATCH] Auth/PM-3833 - Remove Deprecated Register and Prelogin endpoints from API (#4206) * PM-3833 - API - AccountsController.cs && AccountsController.cs - remove prelogin and register endpoints. * PM-3833 - Move Request and Response models that were used for Prelogin and PostRegister from API to Identity. * PM-3833 - FIX LINT * PM-3833 - Fix issues after merge conflict fixes. * PM-3833 - Another test fix --- .../Auth/Controllers/AccountsController.cs | 68 ------------- .../Controllers/AccountsController.cs | 4 +- .../Request/Accounts/PreloginRequestModel.cs | 2 +- .../Request/Accounts/RegisterRequestModel.cs | 5 +- .../ICaptchaProtectedResponseModel.cs | 3 +- .../Accounts/PreloginResponseModel.cs | 2 +- .../Accounts/RegisterResponseModel.cs | 2 +- .../Factories/ApiApplicationFactory.cs | 2 +- .../Controllers/AccountsControllerTests.cs | 95 ------------------- .../Controllers/AccountsControllerTests.cs | 1 + .../Endpoints/IdentityServerSsoTests.cs | 2 +- .../Endpoints/IdentityServerTests.cs | 2 +- .../Endpoints/IdentityServerTwoFactorTests.cs | 2 +- .../Controllers/AccountsControllerTests.cs | 1 + .../Factories/IdentityApplicationFactory.cs | 1 + 15 files changed, 17 insertions(+), 175 deletions(-) rename src/{Core/Auth/Models/Api => Identity/Models}/Request/Accounts/PreloginRequestModel.cs (77%) rename src/{Core/Auth/Models/Api => Identity/Models}/Request/Accounts/RegisterRequestModel.cs (93%) rename src/{Core/Auth/Models/Api => Identity/Models}/Response/Accounts/ICaptchaProtectedResponseModel.cs (63%) rename src/{Core/Auth/Models/Api => Identity/Models}/Response/Accounts/PreloginResponseModel.cs (90%) rename src/{Core/Auth/Models/Api => Identity/Models}/Response/Accounts/RegisterResponseModel.cs (85%) diff --git a/src/Api/Auth/Controllers/AccountsController.cs b/src/Api/Auth/Controllers/AccountsController.cs index f1b1cf6299..bb7a3d0a6c 100644 --- a/src/Api/Auth/Controllers/AccountsController.cs +++ b/src/Api/Auth/Controllers/AccountsController.cs @@ -16,12 +16,9 @@ using Bit.Core.AdminConsole.Repositories; using Bit.Core.AdminConsole.Services; using Bit.Core.Auth.Entities; using Bit.Core.Auth.Models.Api.Request.Accounts; -using Bit.Core.Auth.Models.Api.Response.Accounts; using Bit.Core.Auth.Models.Data; -using Bit.Core.Auth.Services; using Bit.Core.Auth.UserFeatures.UserKey; using Bit.Core.Auth.UserFeatures.UserMasterPassword.Interfaces; -using Bit.Core.Auth.Utilities; using Bit.Core.Billing.Models; using Bit.Core.Billing.Services; using Bit.Core.Context; @@ -30,18 +27,15 @@ using Bit.Core.Enums; using Bit.Core.Exceptions; using Bit.Core.Models.Api.Response; using Bit.Core.Models.Business; -using Bit.Core.Models.Data; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Settings; using Bit.Core.Tools.Entities; using Bit.Core.Tools.Enums; using Bit.Core.Tools.Models.Business; -using Bit.Core.Tools.Repositories; using Bit.Core.Tools.Services; using Bit.Core.Utilities; using Bit.Core.Vault.Entities; -using Bit.Core.Vault.Repositories; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -52,17 +46,11 @@ namespace Bit.Api.Auth.Controllers; public class AccountsController : Controller { private readonly GlobalSettings _globalSettings; - private readonly ICipherRepository _cipherRepository; - private readonly IFolderRepository _folderRepository; private readonly IOrganizationService _organizationService; private readonly IOrganizationUserRepository _organizationUserRepository; private readonly IProviderUserRepository _providerUserRepository; private readonly IPaymentService _paymentService; - private readonly IUserRepository _userRepository; private readonly IUserService _userService; - private readonly ISendRepository _sendRepository; - private readonly ISendService _sendService; - private readonly ICaptchaValidationService _captchaValidationService; private readonly IPolicyService _policyService; private readonly ISetInitialMasterPasswordCommand _setInitialMasterPasswordCommand; private readonly IRotateUserKeyCommand _rotateUserKeyCommand; @@ -88,17 +76,11 @@ public class AccountsController : Controller public AccountsController( GlobalSettings globalSettings, - ICipherRepository cipherRepository, - IFolderRepository folderRepository, IOrganizationService organizationService, IOrganizationUserRepository organizationUserRepository, IProviderUserRepository providerUserRepository, IPaymentService paymentService, - IUserRepository userRepository, IUserService userService, - ISendRepository sendRepository, - ISendService sendService, - ICaptchaValidationService captchaValidationService, IPolicyService policyService, ISetInitialMasterPasswordCommand setInitialMasterPasswordCommand, IRotateUserKeyCommand rotateUserKeyCommand, @@ -116,18 +98,12 @@ public class AccountsController : Controller IRotationValidator, IEnumerable> webAuthnKeyValidator ) { - _cipherRepository = cipherRepository; - _folderRepository = folderRepository; _globalSettings = globalSettings; _organizationService = organizationService; _organizationUserRepository = organizationUserRepository; _providerUserRepository = providerUserRepository; _paymentService = paymentService; - _userRepository = userRepository; _userService = userService; - _sendRepository = sendRepository; - _sendService = sendService; - _captchaValidationService = captchaValidationService; _policyService = policyService; _setInitialMasterPasswordCommand = setInitialMasterPasswordCommand; _rotateUserKeyCommand = rotateUserKeyCommand; @@ -143,50 +119,6 @@ public class AccountsController : Controller _webauthnKeyValidator = webAuthnKeyValidator; } - #region DEPRECATED (Moved to Identity Service) - - [Obsolete("TDL-136 Moved to Identity (2022-01-12 cloud, 2022-09-19 self-hosted), left for backwards compatability with older clients.")] - [HttpPost("prelogin")] - [AllowAnonymous] - public async Task PostPrelogin([FromBody] PreloginRequestModel model) - { - var kdfInformation = await _userRepository.GetKdfInformationByEmailAsync(model.Email); - if (kdfInformation == null) - { - kdfInformation = new UserKdfInformation - { - Kdf = KdfType.PBKDF2_SHA256, - KdfIterations = AuthConstants.PBKDF2_ITERATIONS.Default, - }; - } - return new PreloginResponseModel(kdfInformation); - } - - [Obsolete("TDL-136 Moved to Identity (2022-01-12 cloud, 2022-09-19 self-hosted), left for backwards compatability with older clients.")] - [HttpPost("register")] - [AllowAnonymous] - [CaptchaProtected] - public async Task PostRegister([FromBody] RegisterRequestModel model) - { - var user = model.ToUser(); - var result = await _userService.RegisterUserAsync(user, model.MasterPasswordHash, - model.Token, model.OrganizationUserId); - if (result.Succeeded) - { - var captchaBypassToken = _captchaValidationService.GenerateCaptchaBypassToken(user); - return new RegisterResponseModel(captchaBypassToken); - } - - foreach (var error in result.Errors.Where(e => e.Code != "DuplicateUserName")) - { - ModelState.AddModelError(string.Empty, error.Description); - } - - await Task.Delay(2000); - throw new BadRequestException(ModelState); - } - - #endregion [HttpPost("password-hint")] [AllowAnonymous] diff --git a/src/Identity/Controllers/AccountsController.cs b/src/Identity/Controllers/AccountsController.cs index 29de0c046e..4f142cd99d 100644 --- a/src/Identity/Controllers/AccountsController.cs +++ b/src/Identity/Controllers/AccountsController.cs @@ -18,6 +18,8 @@ using Bit.Core.Tools.Enums; using Bit.Core.Tools.Models.Business; using Bit.Core.Tools.Services; using Bit.Core.Utilities; +using Bit.Identity.Models.Request.Accounts; +using Bit.Identity.Models.Response.Accounts; using Bit.SharedWeb.Utilities; using Microsoft.AspNetCore.Mvc; @@ -61,7 +63,6 @@ public class AccountsController : Controller _referenceEventService = referenceEventService; } - // Moved from API, If you modify this endpoint, please update API as well. Self hosted installs still use the API endpoints. [HttpPost("register")] [CaptchaProtected] public async Task PostRegister([FromBody] RegisterRequestModel model) @@ -138,5 +139,4 @@ public class AccountsController : Controller Token = token }; } - } diff --git a/src/Core/Auth/Models/Api/Request/Accounts/PreloginRequestModel.cs b/src/Identity/Models/Request/Accounts/PreloginRequestModel.cs similarity index 77% rename from src/Core/Auth/Models/Api/Request/Accounts/PreloginRequestModel.cs rename to src/Identity/Models/Request/Accounts/PreloginRequestModel.cs index be2e68a128..daae846123 100644 --- a/src/Core/Auth/Models/Api/Request/Accounts/PreloginRequestModel.cs +++ b/src/Identity/Models/Request/Accounts/PreloginRequestModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Bit.Core.Auth.Models.Api.Request.Accounts; +namespace Bit.Identity.Models.Request.Accounts; public class PreloginRequestModel { diff --git a/src/Core/Auth/Models/Api/Request/Accounts/RegisterRequestModel.cs b/src/Identity/Models/Request/Accounts/RegisterRequestModel.cs similarity index 93% rename from src/Core/Auth/Models/Api/Request/Accounts/RegisterRequestModel.cs rename to src/Identity/Models/Request/Accounts/RegisterRequestModel.cs index 6fa00f4679..8f3cefcfcd 100644 --- a/src/Core/Auth/Models/Api/Request/Accounts/RegisterRequestModel.cs +++ b/src/Identity/Models/Request/Accounts/RegisterRequestModel.cs @@ -1,10 +1,13 @@ using System.ComponentModel.DataAnnotations; using System.Text.Json; +using Bit.Core; +using Bit.Core.Auth.Models.Api; +using Bit.Core.Auth.Models.Api.Request.Accounts; using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Utilities; -namespace Bit.Core.Auth.Models.Api.Request.Accounts; +namespace Bit.Identity.Models.Request.Accounts; public class RegisterRequestModel : IValidatableObject, ICaptchaProtectedModel { diff --git a/src/Core/Auth/Models/Api/Response/Accounts/ICaptchaProtectedResponseModel.cs b/src/Identity/Models/Response/Accounts/ICaptchaProtectedResponseModel.cs similarity index 63% rename from src/Core/Auth/Models/Api/Response/Accounts/ICaptchaProtectedResponseModel.cs rename to src/Identity/Models/Response/Accounts/ICaptchaProtectedResponseModel.cs index 44c8898a0c..40ecf849f0 100644 --- a/src/Core/Auth/Models/Api/Response/Accounts/ICaptchaProtectedResponseModel.cs +++ b/src/Identity/Models/Response/Accounts/ICaptchaProtectedResponseModel.cs @@ -1,5 +1,4 @@ -namespace Bit.Core.Auth.Models.Api.Response.Accounts; - +namespace Bit.Identity.Models.Response.Accounts; public interface ICaptchaProtectedResponseModel { public string CaptchaBypassToken { get; set; } diff --git a/src/Core/Auth/Models/Api/Response/Accounts/PreloginResponseModel.cs b/src/Identity/Models/Response/Accounts/PreloginResponseModel.cs similarity index 90% rename from src/Core/Auth/Models/Api/Response/Accounts/PreloginResponseModel.cs rename to src/Identity/Models/Response/Accounts/PreloginResponseModel.cs index 0052ac18a6..129aa3e7a9 100644 --- a/src/Core/Auth/Models/Api/Response/Accounts/PreloginResponseModel.cs +++ b/src/Identity/Models/Response/Accounts/PreloginResponseModel.cs @@ -1,7 +1,7 @@ using Bit.Core.Enums; using Bit.Core.Models.Data; -namespace Bit.Core.Auth.Models.Api.Response.Accounts; +namespace Bit.Identity.Models.Response.Accounts; public class PreloginResponseModel { diff --git a/src/Core/Auth/Models/Api/Response/Accounts/RegisterResponseModel.cs b/src/Identity/Models/Response/Accounts/RegisterResponseModel.cs similarity index 85% rename from src/Core/Auth/Models/Api/Response/Accounts/RegisterResponseModel.cs rename to src/Identity/Models/Response/Accounts/RegisterResponseModel.cs index ef560ee41b..be5e8ad3b0 100644 --- a/src/Core/Auth/Models/Api/Response/Accounts/RegisterResponseModel.cs +++ b/src/Identity/Models/Response/Accounts/RegisterResponseModel.cs @@ -1,6 +1,6 @@ using Bit.Core.Models.Api; -namespace Bit.Core.Auth.Models.Api.Response.Accounts; +namespace Bit.Identity.Models.Response.Accounts; public class RegisterResponseModel : ResponseModel, ICaptchaProtectedResponseModel { diff --git a/test/Api.IntegrationTest/Factories/ApiApplicationFactory.cs b/test/Api.IntegrationTest/Factories/ApiApplicationFactory.cs index 7d37858393..3938ef46b3 100644 --- a/test/Api.IntegrationTest/Factories/ApiApplicationFactory.cs +++ b/test/Api.IntegrationTest/Factories/ApiApplicationFactory.cs @@ -1,4 +1,4 @@ -using Bit.Core.Auth.Models.Api.Request.Accounts; +using Bit.Identity.Models.Request.Accounts; using Bit.IntegrationTestCommon.Factories; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.TestHost; diff --git a/test/Api.Test/Auth/Controllers/AccountsControllerTests.cs b/test/Api.Test/Auth/Controllers/AccountsControllerTests.cs index 1dd8fe064d..d1911a0dcf 100644 --- a/test/Api.Test/Auth/Controllers/AccountsControllerTests.cs +++ b/test/Api.Test/Auth/Controllers/AccountsControllerTests.cs @@ -7,29 +7,23 @@ using Bit.Api.Auth.Models.Request.WebAuthn; using Bit.Api.Auth.Validators; using Bit.Api.Tools.Models.Request; using Bit.Api.Vault.Models.Request; -using Bit.Core; using Bit.Core.AdminConsole.Repositories; using Bit.Core.AdminConsole.Services; using Bit.Core.Auth.Entities; using Bit.Core.Auth.Models.Api.Request.Accounts; using Bit.Core.Auth.Models.Data; -using Bit.Core.Auth.Services; using Bit.Core.Auth.UserFeatures.UserKey; using Bit.Core.Auth.UserFeatures.UserMasterPassword.Interfaces; using Bit.Core.Billing.Services; using Bit.Core.Context; using Bit.Core.Entities; -using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.Models.Data; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Settings; using Bit.Core.Tools.Entities; -using Bit.Core.Tools.Repositories; using Bit.Core.Tools.Services; using Bit.Core.Vault.Entities; -using Bit.Core.Vault.Repositories; using Bit.Test.Common.AutoFixture.Attributes; using Microsoft.AspNetCore.Identity; using NSubstitute; @@ -42,17 +36,11 @@ public class AccountsControllerTests : IDisposable private readonly AccountsController _sut; private readonly GlobalSettings _globalSettings; - private readonly ICipherRepository _cipherRepository; - private readonly IFolderRepository _folderRepository; private readonly IOrganizationService _organizationService; private readonly IOrganizationUserRepository _organizationUserRepository; private readonly IPaymentService _paymentService; - private readonly IUserRepository _userRepository; private readonly IUserService _userService; - private readonly ISendRepository _sendRepository; - private readonly ISendService _sendService; private readonly IProviderUserRepository _providerUserRepository; - private readonly ICaptchaValidationService _captchaValidationService; private readonly IPolicyService _policyService; private readonly ISetInitialMasterPasswordCommand _setInitialMasterPasswordCommand; private readonly IRotateUserKeyCommand _rotateUserKeyCommand; @@ -76,17 +64,11 @@ public class AccountsControllerTests : IDisposable public AccountsControllerTests() { _userService = Substitute.For(); - _userRepository = Substitute.For(); - _cipherRepository = Substitute.For(); - _folderRepository = Substitute.For(); _organizationService = Substitute.For(); _organizationUserRepository = Substitute.For(); _providerUserRepository = Substitute.For(); _paymentService = Substitute.For(); _globalSettings = new GlobalSettings(); - _sendRepository = Substitute.For(); - _sendService = Substitute.For(); - _captchaValidationService = Substitute.For(); _policyService = Substitute.For(); _setInitialMasterPasswordCommand = Substitute.For(); _rotateUserKeyCommand = Substitute.For(); @@ -108,17 +90,11 @@ public class AccountsControllerTests : IDisposable _sut = new AccountsController( _globalSettings, - _cipherRepository, - _folderRepository, _organizationService, _organizationUserRepository, _providerUserRepository, _paymentService, - _userRepository, _userService, - _sendRepository, - _sendService, - _captchaValidationService, _policyService, _setInitialMasterPasswordCommand, _rotateUserKeyCommand, @@ -140,77 +116,6 @@ public class AccountsControllerTests : IDisposable _sut?.Dispose(); } - [Fact] - public async Task PostPrelogin_WhenUserExists_ShouldReturnUserKdfInfo() - { - var userKdfInfo = new UserKdfInformation - { - Kdf = KdfType.PBKDF2_SHA256, - KdfIterations = AuthConstants.PBKDF2_ITERATIONS.Default - }; - _userRepository.GetKdfInformationByEmailAsync(Arg.Any()).Returns(Task.FromResult(userKdfInfo)); - - var response = await _sut.PostPrelogin(new PreloginRequestModel { Email = "user@example.com" }); - - Assert.Equal(userKdfInfo.Kdf, response.Kdf); - Assert.Equal(userKdfInfo.KdfIterations, response.KdfIterations); - } - - [Fact] - public async Task PostPrelogin_WhenUserDoesNotExist_ShouldDefaultToPBKDF() - { - _userRepository.GetKdfInformationByEmailAsync(Arg.Any()).Returns(Task.FromResult((UserKdfInformation)null)); - - var response = await _sut.PostPrelogin(new PreloginRequestModel { Email = "user@example.com" }); - - Assert.Equal(KdfType.PBKDF2_SHA256, response.Kdf); - Assert.Equal(AuthConstants.PBKDF2_ITERATIONS.Default, response.KdfIterations); - } - - [Fact] - public async Task PostRegister_ShouldRegisterUser() - { - var passwordHash = "abcdef"; - var token = "123456"; - var userGuid = new Guid(); - _userService.RegisterUserAsync(Arg.Any(), passwordHash, token, userGuid) - .Returns(Task.FromResult(IdentityResult.Success)); - var request = new RegisterRequestModel - { - Name = "Example User", - Email = "user@example.com", - MasterPasswordHash = passwordHash, - MasterPasswordHint = "example", - Token = token, - OrganizationUserId = userGuid - }; - - await _sut.PostRegister(request); - - await _userService.Received(1).RegisterUserAsync(Arg.Any(), passwordHash, token, userGuid); - } - - [Fact] - public async Task PostRegister_WhenUserServiceFails_ShouldThrowBadRequestException() - { - var passwordHash = "abcdef"; - var token = "123456"; - var userGuid = new Guid(); - _userService.RegisterUserAsync(Arg.Any(), passwordHash, token, userGuid) - .Returns(Task.FromResult(IdentityResult.Failed())); - var request = new RegisterRequestModel - { - Name = "Example User", - Email = "user@example.com", - MasterPasswordHash = passwordHash, - MasterPasswordHint = "example", - Token = token, - OrganizationUserId = userGuid - }; - - await Assert.ThrowsAsync(() => _sut.PostRegister(request)); - } - [Fact] public async Task PostPasswordHint_ShouldNotifyUserService() { diff --git a/test/Identity.IntegrationTest/Controllers/AccountsControllerTests.cs b/test/Identity.IntegrationTest/Controllers/AccountsControllerTests.cs index e35c4ed46b..3dc63605e8 100644 --- a/test/Identity.IntegrationTest/Controllers/AccountsControllerTests.cs +++ b/test/Identity.IntegrationTest/Controllers/AccountsControllerTests.cs @@ -1,6 +1,7 @@ using Bit.Core.Auth.Models.Api.Request.Accounts; using Bit.Core.Entities; using Bit.Core.Repositories; +using Bit.Identity.Models.Request.Accounts; using Bit.IntegrationTestCommon.Factories; using Bit.Test.Common.AutoFixture.Attributes; using Microsoft.EntityFrameworkCore; diff --git a/test/Identity.IntegrationTest/Endpoints/IdentityServerSsoTests.cs b/test/Identity.IntegrationTest/Endpoints/IdentityServerSsoTests.cs index c775fce5eb..5968a3bbc1 100644 --- a/test/Identity.IntegrationTest/Endpoints/IdentityServerSsoTests.cs +++ b/test/Identity.IntegrationTest/Endpoints/IdentityServerSsoTests.cs @@ -6,7 +6,6 @@ using Bit.Core.AdminConsole.Enums.Provider; using Bit.Core.AdminConsole.Repositories; using Bit.Core.Auth.Entities; using Bit.Core.Auth.Enums; -using Bit.Core.Auth.Models.Api.Request.Accounts; using Bit.Core.Auth.Models.Data; using Bit.Core.Auth.Repositories; using Bit.Core.Entities; @@ -14,6 +13,7 @@ using Bit.Core.Enums; using Bit.Core.Models.Data; using Bit.Core.Repositories; using Bit.Core.Utilities; +using Bit.Identity.Models.Request.Accounts; using Bit.IntegrationTestCommon.Factories; using Bit.Test.Common.Helpers; using Duende.IdentityServer.Models; diff --git a/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs b/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs index a7f09cfe08..b1e0e9aadc 100644 --- a/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs +++ b/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs @@ -3,10 +3,10 @@ using Bit.Core; using Bit.Core.AdminConsole.Entities; using Bit.Core.AdminConsole.Enums; using Bit.Core.AdminConsole.Repositories; -using Bit.Core.Auth.Models.Api.Request.Accounts; using Bit.Core.Enums; using Bit.Core.Repositories; using Bit.Identity.IdentityServer; +using Bit.Identity.Models.Request.Accounts; using Bit.IntegrationTestCommon.Factories; using Bit.Test.Common.AutoFixture.Attributes; using Bit.Test.Common.Helpers; diff --git a/test/Identity.IntegrationTest/Endpoints/IdentityServerTwoFactorTests.cs b/test/Identity.IntegrationTest/Endpoints/IdentityServerTwoFactorTests.cs index c9e6825988..a995e727b7 100644 --- a/test/Identity.IntegrationTest/Endpoints/IdentityServerTwoFactorTests.cs +++ b/test/Identity.IntegrationTest/Endpoints/IdentityServerTwoFactorTests.cs @@ -1,11 +1,11 @@ using System.Text.Json; using Bit.Core.AdminConsole.Entities; using Bit.Core.Auth.Enums; -using Bit.Core.Auth.Models.Api.Request.Accounts; using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Repositories; using Bit.Core.Services; +using Bit.Identity.Models.Request.Accounts; using Bit.IntegrationTestCommon.Factories; using Bit.Test.Common.AutoFixture.Attributes; using Bit.Test.Common.Helpers; diff --git a/test/Identity.Test/Controllers/AccountsControllerTests.cs b/test/Identity.Test/Controllers/AccountsControllerTests.cs index c26a35d6f6..ee67dc0645 100644 --- a/test/Identity.Test/Controllers/AccountsControllerTests.cs +++ b/test/Identity.Test/Controllers/AccountsControllerTests.cs @@ -16,6 +16,7 @@ using Bit.Core.Tools.Enums; using Bit.Core.Tools.Models.Business; using Bit.Core.Tools.Services; using Bit.Identity.Controllers; +using Bit.Identity.Models.Request.Accounts; using Bit.Test.Common.AutoFixture.Attributes; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; diff --git a/test/IntegrationTestCommon/Factories/IdentityApplicationFactory.cs b/test/IntegrationTestCommon/Factories/IdentityApplicationFactory.cs index aa9e507859..3cd6ed143f 100644 --- a/test/IntegrationTestCommon/Factories/IdentityApplicationFactory.cs +++ b/test/IntegrationTestCommon/Factories/IdentityApplicationFactory.cs @@ -4,6 +4,7 @@ using Bit.Core.Auth.Models.Api.Request.Accounts; using Bit.Core.Enums; using Bit.Core.Utilities; using Bit.Identity; +using Bit.Identity.Models.Request.Accounts; using Bit.Test.Common.Helpers; using Microsoft.AspNetCore.Http;