mirror of
https://github.com/bitwarden/server.git
synced 2024-12-11 15:17:44 +01:00
c126fee296
* Add check for managed user before purging account * Rename IOrganizationRepository.GetByClaimedUserDomainAsync to GetByVerifiedUserEmailDomainAsync and refactor to return a list. Remove ManagedByOrganizationId from ProfileResponseMode. Add ManagesActiveUser to ProfileOrganizationResponseModel * Rename the property ManagesActiveUser to UserIsManagedByOrganization * Remove whole class #nullable enable and add it to specific places * [PM-11405] Account Deprovisioning: Prevent a verified user from changing their email address * Remove unnecessary .ToList() * Refactor IUserService methods GetOrganizationsManagingUserAsync and IsManagedByAnyOrganizationAsync to not return nullable objects. Update ProfileOrganizationResponseModel.UserIsManagedByOrganization to not be nullable * Update error message when unable to purge vault for managed account * Update error message when unable to change email for managed account * Update expected error messages on unit tests * Add TestFeatureService to Api.IntegrationTest.Helpers and use it on ApiApplicationFactory to be able to enable specific features for each test * Add CreateVerifiedDomainAsync method to OrganizationTestHelpers * Add tests to AccountsControllerTest to prevent changing email for managed accounts * Remove setting the feature flag value in ApiApplicationFactory and set it on AccountsControllerTest * Remove TestFeatureService class from Api.IntegrationTest.Helpers
126 lines
4.7 KiB
C#
126 lines
4.7 KiB
C#
using System.Net;
|
|
using System.Net.Http.Headers;
|
|
using Bit.Api.Auth.Models.Request.Accounts;
|
|
using Bit.Api.IntegrationTest.Factories;
|
|
using Bit.Api.IntegrationTest.Helpers;
|
|
using Bit.Api.Models.Response;
|
|
using Bit.Core;
|
|
using Bit.Core.Billing.Enums;
|
|
using Bit.Core.Enums;
|
|
using Bit.Core.Models.Data;
|
|
using Bit.Core.Services;
|
|
using NSubstitute;
|
|
using Xunit;
|
|
|
|
namespace Bit.Api.IntegrationTest.Controllers;
|
|
|
|
public class AccountsControllerTest : IClassFixture<ApiApplicationFactory>
|
|
{
|
|
private readonly ApiApplicationFactory _factory;
|
|
|
|
public AccountsControllerTest(ApiApplicationFactory factory) => _factory = factory;
|
|
|
|
[Fact]
|
|
public async Task GetPublicKey()
|
|
{
|
|
var tokens = await _factory.LoginWithNewAccount();
|
|
var client = _factory.CreateClient();
|
|
|
|
using var message = new HttpRequestMessage(HttpMethod.Get, "/accounts/profile");
|
|
message.Headers.Authorization = new AuthenticationHeaderValue("Bearer", tokens.Token);
|
|
var response = await client.SendAsync(message);
|
|
|
|
response.EnsureSuccessStatusCode();
|
|
|
|
var content = await response.Content.ReadFromJsonAsync<ProfileResponseModel>();
|
|
Assert.NotNull(content);
|
|
Assert.Equal("integration-test@bitwarden.com", content.Email);
|
|
Assert.Null(content.Name);
|
|
Assert.False(content.EmailVerified);
|
|
Assert.False(content.Premium);
|
|
Assert.False(content.PremiumFromOrganization);
|
|
Assert.Equal("en-US", content.Culture);
|
|
Assert.Null(content.Key);
|
|
Assert.Null(content.PrivateKey);
|
|
Assert.NotNull(content.SecurityStamp);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task PostEmailToken_WhenAccountDeprovisioningEnabled_WithManagedAccount_ThrowsBadRequest()
|
|
{
|
|
var email = await SetupOrganizationManagedAccount();
|
|
|
|
var tokens = await _factory.LoginAsync(email);
|
|
var client = _factory.CreateClient();
|
|
|
|
var model = new EmailTokenRequestModel
|
|
{
|
|
NewEmail = $"{Guid.NewGuid()}@example.com",
|
|
MasterPasswordHash = "master_password_hash"
|
|
};
|
|
|
|
using var message = new HttpRequestMessage(HttpMethod.Post, "/accounts/email-token")
|
|
{
|
|
Content = JsonContent.Create(model)
|
|
};
|
|
message.Headers.Authorization = new AuthenticationHeaderValue("Bearer", tokens.Token);
|
|
var response = await client.SendAsync(message);
|
|
|
|
Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
|
|
var content = await response.Content.ReadAsStringAsync();
|
|
Assert.Contains("Cannot change emails for accounts owned by an organization", content);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task PostEmail_WhenAccountDeprovisioningEnabled_WithManagedAccount_ThrowsBadRequest()
|
|
{
|
|
var email = await SetupOrganizationManagedAccount();
|
|
|
|
var tokens = await _factory.LoginAsync(email);
|
|
var client = _factory.CreateClient();
|
|
|
|
var model = new EmailRequestModel
|
|
{
|
|
NewEmail = $"{Guid.NewGuid()}@example.com",
|
|
MasterPasswordHash = "master_password_hash",
|
|
NewMasterPasswordHash = "master_password_hash",
|
|
Token = "validtoken",
|
|
Key = "key"
|
|
};
|
|
|
|
using var message = new HttpRequestMessage(HttpMethod.Post, "/accounts/email")
|
|
{
|
|
Content = JsonContent.Create(model)
|
|
};
|
|
message.Headers.Authorization = new AuthenticationHeaderValue("Bearer", tokens.Token);
|
|
var response = await client.SendAsync(message);
|
|
|
|
Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
|
|
var content = await response.Content.ReadAsStringAsync();
|
|
Assert.Contains("Cannot change emails for accounts owned by an organization", content);
|
|
}
|
|
|
|
private async Task<string> SetupOrganizationManagedAccount()
|
|
{
|
|
_factory.SubstituteService<IFeatureService>(featureService =>
|
|
featureService.IsEnabled(FeatureFlagKeys.AccountDeprovisioning).Returns(true));
|
|
|
|
// Create the owner account
|
|
var ownerEmail = $"{Guid.NewGuid()}@bitwarden.com";
|
|
await _factory.LoginWithNewAccount(ownerEmail);
|
|
|
|
// Create the organization
|
|
var (_organization, _) = await OrganizationTestHelpers.SignUpAsync(_factory, plan: PlanType.EnterpriseAnnually2023,
|
|
ownerEmail: ownerEmail, passwordManagerSeats: 10, paymentMethod: PaymentMethodType.Card);
|
|
|
|
// Create a new organization member
|
|
var (email, orgUser) = await OrganizationTestHelpers.CreateNewUserWithAccountAsync(_factory, _organization.Id,
|
|
OrganizationUserType.Custom, new Permissions { AccessReports = true, ManageScim = true });
|
|
|
|
// Add a verified domain
|
|
await OrganizationTestHelpers.CreateVerifiedDomainAsync(_factory, _organization.Id, "bitwarden.com");
|
|
|
|
return email;
|
|
}
|
|
}
|