[PM-7004] Org Admin Initiate Delete

src/Admin/AdminConsole/Controllers/OrganizationsController.cs

@@ -243,6 +243,20 @@
  return RedirectToAction("Index");
  }
 
+ [HttpPost]
+ [ValidateAntiForgeryToken]
+ [RequirePermission(Permission.Org_Delete)]
+ public async Task<IActionResult> DeleteInitiation(Guid id, OrganizationInitiateDeleteModel model)
+ {
+ var organization = await _organizationRepository.GetByIdAsync(id);
+ if (organization != null)
+ {
+ await _organizationService.InitiateDeleteAsync(organization, model.AdminEmail);
+ }
+
+ return RedirectToAction("Edit", new { id });
+ }
+
  public async Task<IActionResult> TriggerBillingSync(Guid id)
  {
  var organization = await _organizationRepository.GetByIdAsync(id);

src/Admin/AdminConsole/Models/OrganizationInitiateDeleteModel.cs

@@ -0,0 +1,10 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Bit.Admin.AdminConsole.Models;
+
+public class OrganizationInitiateDeleteModel
+{
+ [Required]
+ [Display(Name = "Admin Email")]
+ public string AdminEmail { get; set; }
+}

src/Admin/AdminConsole/Views/Organizations/Edit.cshtml

@@ -1,4 +1,4 @@
-@using Bit.Admin.Enums;
+@using Bit.Admin.Enums;
 @using Bit.Admin.Models
 @using Bit.Core.Enums
 @inject Bit.Admin.Services.IAccessControlService AccessControlService
@@ -37,6 +37,15 @@
  document.getElementById('@(nameof(Model.Plan))').value = 'Enterprise (Trial)';
  });
 
+ document.getElementById('initiate-delete-form').addEventListener('submit', (e) => {
+ const email = prompt('Enter the email address of the owner/admin that your want to ' +
+ 'initiate the organization delete verification process with.');
+ document.getElementById('AdminEmail').value = email;
+ if (email == null || email === '') {
+ e.preventDefault();
+ }
+ });
+
  function setTrialDefaults(planType) {
  // Plan
  document.getElementById('@(nameof(Model.PlanType))').value = planType;
@@ -76,7 +85,7 @@
 {
  <h2>Billing Information</h2>
  @await Html.PartialAsync("_BillingInformation",
- new BillingInformationModel { BillingInfo = Model.BillingInfo, OrganizationId = Model.Organization.Id, Entity = "Organization" })
+  new BillingInformationModel { BillingInfo = Model.BillingInfo, OrganizationId = Model.Organization.Id, Entity = "Organization" })
 }
 
 @await Html.PartialAsync("~/AdminConsole/Views/Shared/_OrganizationForm.cshtml", Model)
@@ -95,18 +104,20 @@
  }
  @if (canUnlinkFromProvider && Model.Provider is not null)
  {
- <button
- class="btn btn-outline-danger mr-2"
- onclick="return unlinkProvider('@Model.Organization.Id');"
- >
+ <button class="btn btn-outline-danger mr-2"
+ onclick="return unlinkProvider('@Model.Organization.Id');">
  Unlink provider
  </button>
  }
  @if (canDelete)
  {
+ <form asp-action="DeleteInitiation" asp-route-id="@Model.Organization.Id" id="initiate-delete-form">
+ <input type="hidden" name="AdminEmail" id="AdminEmail" />
+ <button class="btn btn-danger mr-2" type="submit">Initiate Delete</button>
+ </form>
  <form asp-action="Delete" asp-route-id="@Model.Organization.Id"
- onsubmit="return confirm('Are you sure you want to delete this organization?')">
- <button class="btn btn-danger" type="submit">Delete</button>
+  onsubmit="return confirm('Are you sure you want to hard delete this organization?')">
+ <button class="btn btn-danger" type="submit">Hard Delete</button>
  </form>
  }
  </div>

src/Api/AdminConsole/Controllers/OrganizationsController.cs

@@ -579,6 +579,18 @@
  }
  }
 
+ [HttpPost("delete-recover-token")]
+ [AllowAnonymous]
+ public async Task PostDeleteRecoverToken([FromBody] OrganizationVerifyDeleteRecoverRequestModel model)
+ {
+ var organization = await _organizationRepository.GetByIdAsync(new Guid(model.OrganizationId));
+ if (organization == null)
+ {
+ throw new UnauthorizedAccessException();
+ }
+ await _organizationService.DeleteAsync(organization, model.Token);
+ }
+
  [HttpPost("{id}/import")]
  public async Task Import(string id, [FromBody] ImportOrganizationUsersRequestModel model)
  {

src/Api/AdminConsole/Models/Request/Organizations/OrganizationVerifyDeleteRecoverRequestModel.cs

@@ -0,0 +1,11 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Bit.Api.AdminConsole.Models.Request.Organizations;
+
+public class OrganizationVerifyDeleteRecoverRequestModel
+{
+ [Required]
+ public string OrganizationId { get; set; }
+ [Required]
+ public string Token { get; set; }
+}

src/Core/AdminConsole/Services/IOrganizationService.cs

@@ -32,6 +32,8 @@ public interface IOrganizationService
  /// </summary>
  Task<(Organization organization, OrganizationUser organizationUser)> SignUpAsync(OrganizationLicense license, User owner,
  string ownerKey, string collectionName, string publicKey, string privateKey);
+ Task InitiateDeleteAsync(Organization organization, string orgAdminEmail);
+ Task DeleteAsync(Organization organization, string token);
  Task DeleteAsync(Organization organization);
  Task EnableAsync(Guid organizationId, DateTime? expirationDate);
  Task DisableAsync(Guid organizationId, DateTime? expirationDate);

src/Core/AdminConsole/Services/Implementations/OrganizationService.cs

@@ -60,6 +60,7 @@
  private readonly IProviderUserRepository _providerUserRepository;
  private readonly ICountNewSmSeatsRequiredQuery _countNewSmSeatsRequiredQuery;
  private readonly IUpdateSecretsManagerSubscriptionCommand _updateSecretsManagerSubscriptionCommand;
+ private readonly IDataProtectorTokenFactory<OrgDeleteTokenable> _orgDeleteTokenDataFactory;
  private readonly IProviderRepository _providerRepository;
  private readonly IOrgUserInviteTokenableFactory _orgUserInviteTokenableFactory;
  private readonly IDataProtectorTokenFactory<OrgUserInviteTokenable> _orgUserInviteTokenDataFactory;
@@ -94,6 +95,7 @@
  IOrgUserInviteTokenableFactory orgUserInviteTokenableFactory,
  IDataProtectorTokenFactory<OrgUserInviteTokenable> orgUserInviteTokenDataFactory,
  IUpdateSecretsManagerSubscriptionCommand updateSecretsManagerSubscriptionCommand,
+ IDataProtectorTokenFactory<OrgDeleteTokenable> orgDeleteTokenDataFactory,
  IProviderRepository providerRepository,
  IFeatureService featureService)
  {
@@ -123,6 +125,7 @@
  _providerUserRepository = providerUserRepository;
  _countNewSmSeatsRequiredQuery = countNewSmSeatsRequiredQuery;
  _updateSecretsManagerSubscriptionCommand = updateSecretsManagerSubscriptionCommand;
+ _orgDeleteTokenDataFactory = orgDeleteTokenDataFactory;
  _providerRepository = providerRepository;
  _orgUserInviteTokenableFactory = orgUserInviteTokenableFactory;
  _orgUserInviteTokenDataFactory = orgUserInviteTokenDataFactory;
@@ -728,6 +731,32 @@
  }
  }
 
+ public async Task InitiateDeleteAsync(Organization organization, string orgAdminEmail)
+ {
+ var orgAdmin = await _userRepository.GetByEmailAsync(orgAdminEmail);
+ if (orgAdmin == null)
+ {
+ throw new BadRequestException("Org admin not found.");
+ }
+ var orgAdminOrgUser = await _organizationUserRepository.GetDetailsByUserAsync(orgAdmin.Id, organization.Id);
+ if (orgAdminOrgUser == null || orgAdminOrgUser.Status != OrganizationUserStatusType.Confirmed ||
+ (orgAdminOrgUser.Type != OrganizationUserType.Admin && orgAdminOrgUser.Type != OrganizationUserType.Owner))
+ {
+ throw new BadRequestException("Org admin not found.");
+ }
+ var token = _orgDeleteTokenDataFactory.Protect(new OrgDeleteTokenable(organization, 1));
+ await _mailService.SendInitiateDeleteOrganzationEmailAsync(orgAdminEmail, organization, token);
+ }
+
+ public async Task DeleteAsync(Organization organization, string token)
+ {
+ if (!_orgDeleteTokenDataFactory.TryUnprotect(token, out var data) && data.IsValid(organization))
+ {
+ throw new BadRequestException("Invalid token.");
+ }
+ await DeleteAsync(organization);
+ }
+
  public async Task DeleteAsync(Organization organization)
  {
  await ValidateDeleteOrganizationAsync(organization);

src/Core/Auth/Models/Business/Tokenables/OrgDeleteTokenable.cs

@@ -0,0 +1,32 @@
+using System.Text.Json.Serialization;
+using Bit.Core.AdminConsole.Entities;
+
+namespace Bit.Core.Auth.Models.Business.Tokenables;
+
+public class OrgDeleteTokenable : Tokens.ExpiringTokenable
+{
+ public const string ClearTextPrefix = "";
+ public const string DataProtectorPurpose = "OrgDeleteDataProtector";
+ public const string TokenIdentifier = "OrgDelete";
+ public string Identifier { get; set; } = TokenIdentifier;
+ public Guid Id { get; set; }
+
+ [JsonConstructor]
+ public OrgDeleteTokenable(DateTime expirationDate)
+ {
+ ExpirationDate = expirationDate;
+ }
+
+ public OrgDeleteTokenable(Organization organization, int hoursTillExpiration)
+ {
+ Id = organization.Id;
+ ExpirationDate = DateTime.UtcNow.AddHours(hoursTillExpiration);
+ }
+
+ public bool IsValid(Organization organization)
+ {
+ return Id == organization.Id;
+ }
+
+ protected override bool TokenIsValid() => Identifier == TokenIdentifier && Id != default;
+}

src/Core/MailTemplates/Handlebars/InitiateDeleteOrganzation.html.hbs

@@ -0,0 +1,39 @@
+{{#>FullHtmlLayout}}
+<table width="100%" cellpadding="0" cellspacing="0" style="margin: 0; box-sizing: border-box; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
+ <tr style="margin: 0; box-sizing: border-box; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
+ <td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none; text-align: left;" valign="top" align="center">
+ We recently received your request to permanently delete the following Bitwarden organization:
+ </td>
+ </tr>
+ <tr style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
+ <td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none;" valign="top">
+ <b style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">Name:</b> {{OrganizationName}}<br style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;" />
+ <b style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">ID:</b> {{OrganizationId}}<br style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;" />
+ <b style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">Created:</b> {{OrganizationCreationDate}} at {{OrganizationCreationTime}} {{TimeZone}}<br style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;" />
+ <b style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">Plan:</b> {{OrganizationPlan}}<br style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;" />
+ <b style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">Number of seats:</b> {{OrganizationSeats}}<br style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;" />
+ <b style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">Billing email address:</b> {{OrganizationBillingEmail}}
+ </td>
+ </tr>
+ <tr style="margin: 0; box-sizing: border-box; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
+ <td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none; text-align: left;" valign="top" align="center">
+ Click the link below to delete your Bitwarden organization.
+ </td>
+ </tr>
+ <tr style="margin: 0; box-sizing: border-box; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
+ <td class="content-block last" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0; -webkit-text-size-adjust: none; text-align: left;" valign="top" align="center">
+ If you did not request this email to delete your Bitwarden organization, you can safely ignore it.
+ <br style="margin: 0; box-sizing: border-box; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;" />
+ <br style="margin: 0; box-sizing: border-box; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;" />
+ </td>
+ </tr>
+ <tr style="margin: 0; box-sizing: border-box; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
+ <td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none; text-align: center;" valign="top" align="center">
+ <a href="{{{Url}}}" clicktracking=off target="_blank" style="color: #ffffff; text-decoration: none; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; background-color: #175DDC; border-color: #175DDC; border-style: solid; border-width: 10px 20px; margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
+ Delete Your Organization
+ </a>
+ <br style="margin: 0; box-sizing: border-box; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;" />
+ </td>
+ </tr>
+</table>
+{{/FullHtmlLayout}}

src/Core/MailTemplates/Handlebars/InitiateDeleteOrganzation.text.hbs

@@ -0,0 +1,17 @@
+{{#>BasicTextLayout}}
+We recently received your request to permanently delete the following Bitwarden organization:
+
+- Name: {{OrganizationName}}
+- ID: {{OrganizationId}}
+- Created: {{OrganizationCreationDate}} at {{OrganizationCreationTime}} {{TimeZone}}
+- Plan: {{OrganizationPlan}}
+- Number of seats: {{OrganizationSeats}}
+- Billing email address: {{OrganizationBillingEmail}}
+
+Click the link below to complete the deletion of your organization.
+
+If you did not request this email to delete your Bitwarden organization, you can safely ignore it.
+
+{{{Url}}}
+
+{{/BasicTextLayout}}

src/Core/Models/Mail/OrgInitiateDeleteModel.cs

@@ -0,0 +1,21 @@
+using Bit.Core.Models.Mail;
+
+namespace Bit.Core.Auth.Models.Mail;
+
+public class OrgInitiateDeleteModel : BaseMailModel
+{
+ public string Url => string.Format("{0}/verify-org-delete?orgId={1}&token={2}",
+ WebVaultUrl,
+ OrganizationId,
+ Token);
+
+ public string Token { get; set; }
+ public Guid OrganizationId { get; set; }
+ public string OrganizationName { get; set; }
+ public string OrganizationPlan { get; set; }
+ public string OrganizationSeats { get; set; }
+ public string OrganizationBillingEmail { get; set; }
+ public string OrganizationCreationDate { get; set; }
+ public string OrganizationCreationTime { get; set; }
+ public string TimeZone { get; set; }
+}

src/Core/Services/IMailService.cs

@@ -78,5 +78,6 @@ public interface IMailService
  Task SendSecretsManagerMaxServiceAccountLimitReachedEmailAsync(Organization organization, int maxSeatCount, IEnumerable<string> ownerEmails);
  Task SendTrustedDeviceAdminApprovalEmailAsync(string email, DateTime utcNow, string ip, string deviceTypeAndIdentifier);
  Task SendTrialInitiationEmailAsync(string email);
+ Task SendInitiateDeleteOrganzationEmailAsync(string email, Organization organization, string token);
 }
 

src/Core/Services/Implementations/HandlebarsMailService.cs

@@ -977,6 +977,29 @@
  await _mailDeliveryService.SendEmailAsync(message);
  }
 
+ public async Task SendInitiateDeleteOrganzationEmailAsync(string email, Organization organization, string token)
+ {
+ var message = CreateDefaultMessage("Delete Your Organization", email);
+ var model = new OrgInitiateDeleteModel
+ {
+ Token = WebUtility.UrlEncode(token),
+ WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
+ SiteName = _globalSettings.SiteName,
+ OrganizationId = organization.Id,
+ OrganizationName = organization.Name,
+ OrganizationBillingEmail = organization.BillingEmail,
+ OrganizationPlan = organization.Plan,
+ OrganizationSeats = organization.Seats.ToString(),
+ OrganizationCreationDate = organization.CreationDate.ToLongDateString(),
+ OrganizationCreationTime = organization.CreationDate.ToShortTimeString(),
+ TimeZone = _utcTimeZoneDisplay,
+ };
+ await AddMessageContentAsync(message, "InitiateDeleteOrganzation", model);
+ message.MetaData.Add("SendGridBypassListManagement", true);
+ message.Category = "InitiateDeleteOrganzation";
+ await _mailDeliveryService.SendEmailAsync(message);
+ }
+
  private static string GetUserIdentifier(string email, string userName)
  {
  return string.IsNullOrEmpty(userName) ? email : CoreHelpers.SanitizeForEmail(userName, false);