[AC-1682] Flexible collections: EF data migrations integration tests

.github/renovate.json

@@ -44,7 +44,6 @@
  "matchPackageNames": [
  "AspNetCoreRateLimit",
  "AspNetCoreRateLimit.Redis",
- "Azure.Data.Tables",
  "Azure.Extensions.AspNetCore.DataProtection.Blobs",
  "Azure.Messaging.EventGrid",
  "Azure.Messaging.ServiceBus",
@@ -54,6 +53,7 @@
  "Fido2.AspNet",
  "Duende.IdentityServer",
  "Microsoft.Azure.Cosmos",
+ "Microsoft.Azure.Cosmos.Table",
  "Microsoft.Extensions.Caching.StackExchangeRedis",
  "Microsoft.Extensions.Identity.Stores",
  "Otp.NET",

.github/workflows/scan.yml

@@ -10,6 +10,8 @@ on:
  pull_request_target:
  types: [opened, synchronize]
 
+permissions: read-all
+
 jobs:
  check-run:
  name: Check PR run
@@ -20,8 +22,6 @@ jobs:
  runs-on: ubuntu-22.04
  needs: check-run
  permissions:
- contents: read
- pull-requests: write
  security-events: write
 
  steps:
@@ -46,17 +46,14 @@ jobs:
  --output-path . ${{ env.INCREMENTAL }}
 
  - name: Upload Checkmarx results to GitHub
- uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+ uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
  with:
  sarif_file: cx_result.sarif
 
  quality:
  name: Quality scan
  runs-on: ubuntu-22.04
  needs: check-run
- permissions:
- contents: read
- pull-requests: write
 
  steps:
  - name: Check out repo

bitwarden_license/src/Scim/appsettings.json

@@ -30,6 +30,10 @@
  "connectionString": "SECRET",
  "applicationCacheTopicName": "SECRET"
  },
+ "documentDb": {
+ "uri": "SECRET",
+ "key": "SECRET"
+ },
  "sentry": {
  "dsn": "SECRET"
  },
@@ -54,5 +58,6 @@
  "region": "SECRET"
  }
  },
- "scimSettings": {}
+ "scimSettings": {
+ }
 }

bitwarden_license/src/Sso/appsettings.json

@@ -31,6 +31,10 @@
  "connectionString": "SECRET",
  "applicationCacheTopicName": "SECRET"
  },
+ "documentDb": {
+ "uri": "SECRET",
+ "key": "SECRET"
+ },
  "notificationHub": {
  "connectionString": "SECRET",
  "hubName": "SECRET"

src/Admin/Jobs/JobsHostedService.cs

@@ -76,18 +76,14 @@ public override async Task StartAsync(CancellationToken cancellationToken)
  {
  new Tuple<Type, ITrigger>(typeof(DeleteSendsJob), everyFiveMinutesTrigger),
  new Tuple<Type, ITrigger>(typeof(DatabaseExpiredGrantsJob), everyFridayAt10pmTrigger),
+ new Tuple<Type, ITrigger>(typeof(DatabaseUpdateStatisticsJob), everySaturdayAtMidnightTrigger),
+ new Tuple<Type, ITrigger>(typeof(DatabaseRebuildlIndexesJob), everySundayAtMidnightTrigger),
  new Tuple<Type, ITrigger>(typeof(DeleteCiphersJob), everyDayAtMidnightUtc),
  new Tuple<Type, ITrigger>(typeof(DatabaseExpiredSponsorshipsJob), everyMondayAtMidnightTrigger),
  new Tuple<Type, ITrigger>(typeof(DeleteAuthRequestsJob), everyFifteenMinutesTrigger),
  new Tuple<Type, ITrigger>(typeof(DeleteUnverifiedOrganizationDomainsJob), everyDayAtTwoAmUtcTrigger),
  };
 
- if (!(_globalSettings.SqlServer?.DisableDatabaseMaintenanceJobs ?? false))
- {
- jobs.Add(new Tuple<Type, ITrigger>(typeof(DatabaseUpdateStatisticsJob), everySaturdayAtMidnightTrigger));
- jobs.Add(new Tuple<Type, ITrigger>(typeof(DatabaseRebuildlIndexesJob), everySundayAtMidnightTrigger));
- }
-
  if (!_globalSettings.SelfHosted)
  {
  jobs.Add(new Tuple<Type, ITrigger>(typeof(AliveJob), everyTopOfTheHourTrigger));

src/Admin/Startup.cs

@@ -88,7 +88,7 @@ public void ConfigureServices(IServiceCollection services)
  services.AddBaseServices(globalSettings);
  services.AddDefaultServices(globalSettings);
  services.AddScoped<IAccessControlService, AccessControlService>();
- services.AddBillingOperations();
+ services.AddBillingCommands();
 
 #if OSS
  services.AddOosServices();

src/Admin/appsettings.json

@@ -30,6 +30,10 @@
  "connectionString": "SECRET",
  "applicationCacheTopicName": "SECRET"
  },
+ "documentDb": {
+ "uri": "SECRET",
+ "key": "SECRET"
+ },
  "notificationHub": {
  "connectionString": "SECRET",
  "hubName": "SECRET"

src/Api/AdminConsole/Controllers/OrganizationsController.cs

@@ -67,7 +67,7 @@ public class OrganizationsController : Controller
  private readonly IAddSecretsManagerSubscriptionCommand _addSecretsManagerSubscriptionCommand;
  private readonly IPushNotificationService _pushNotificationService;
  private readonly ICancelSubscriptionCommand _cancelSubscriptionCommand;
- private readonly ISubscriberQueries _subscriberQueries;
+ private readonly IGetSubscriptionQuery _getSubscriptionQuery;
  private readonly IReferenceEventService _referenceEventService;
  private readonly IOrganizationEnableCollectionEnhancementsCommand _organizationEnableCollectionEnhancementsCommand;
  private readonly IProviderRepository _providerRepository;
@@ -96,7 +96,7 @@ public class OrganizationsController : Controller
  IAddSecretsManagerSubscriptionCommand addSecretsManagerSubscriptionCommand,
  IPushNotificationService pushNotificationService,
  ICancelSubscriptionCommand cancelSubscriptionCommand,
- ISubscriberQueries subscriberQueries,
+ IGetSubscriptionQuery getSubscriptionQuery,
  IReferenceEventService referenceEventService,
  IOrganizationEnableCollectionEnhancementsCommand organizationEnableCollectionEnhancementsCommand,
  IProviderRepository providerRepository,
@@ -124,7 +124,7 @@ public class OrganizationsController : Controller
  _addSecretsManagerSubscriptionCommand = addSecretsManagerSubscriptionCommand;
  _pushNotificationService = pushNotificationService;
  _cancelSubscriptionCommand = cancelSubscriptionCommand;
- _subscriberQueries = subscriberQueries;
+ _getSubscriptionQuery = getSubscriptionQuery;
  _referenceEventService = referenceEventService;
  _organizationEnableCollectionEnhancementsCommand = organizationEnableCollectionEnhancementsCommand;
  _providerRepository = providerRepository;
@@ -486,7 +486,7 @@ public async Task PostCancel(Guid id, [FromBody] SubscriptionCancellationRequest
  throw new NotFoundException();
  }
 
- var subscription = await _subscriberQueries.GetSubscriptionOrThrow(organization);
+ var subscription = await _getSubscriptionQuery.GetSubscription(organization);
 
  await _cancelSubscriptionCommand.CancelSubscription(subscription,
  new OffboardingSurveyResponse

src/Api/AdminConsole/Models/Response/Organizations/OrganizationResponseModel.cs

@@ -126,14 +126,8 @@ public OrganizationSubscriptionResponseModel(Organization organization, Subscrip
  if (hideSensitiveData)
  {
  BillingEmail = null;
- if (Subscription != null)
- {
- Subscription.Items = null;
- }
- if (UpcomingInvoice != null)
- {
- UpcomingInvoice.Amount = null;
- }
+ Subscription.Items = null;
+ UpcomingInvoice.Amount = null;
  }
  }
 

src/Api/Auth/Controllers/AccountsController.cs

@@ -69,7 +69,7 @@ public class AccountsController : Controller
  private readonly IRotateUserKeyCommand _rotateUserKeyCommand;
  private readonly IFeatureService _featureService;
  private readonly ICancelSubscriptionCommand _cancelSubscriptionCommand;
- private readonly ISubscriberQueries _subscriberQueries;
+ private readonly IGetSubscriptionQuery _getSubscriptionQuery;
  private readonly IReferenceEventService _referenceEventService;
  private readonly ICurrentContext _currentContext;
 
@@ -104,7 +104,7 @@ public class AccountsController : Controller
  IRotateUserKeyCommand rotateUserKeyCommand,
  IFeatureService featureService,
  ICancelSubscriptionCommand cancelSubscriptionCommand,
- ISubscriberQueries subscriberQueries,
+ IGetSubscriptionQuery getSubscriptionQuery,
  IReferenceEventService referenceEventService,
  ICurrentContext currentContext,
  IRotationValidator<IEnumerable<CipherWithIdRequestModel>, IEnumerable<Cipher>> cipherValidator,
@@ -133,7 +133,7 @@ public class AccountsController : Controller
  _rotateUserKeyCommand = rotateUserKeyCommand;
  _featureService = featureService;
  _cancelSubscriptionCommand = cancelSubscriptionCommand;
- _subscriberQueries = subscriberQueries;
+ _getSubscriptionQuery = getSubscriptionQuery;
  _referenceEventService = referenceEventService;
  _currentContext = currentContext;
  _cipherValidator = cipherValidator;
@@ -831,7 +831,7 @@ public async Task PostCancel([FromBody] SubscriptionCancellationRequestModel req
  throw new UnauthorizedAccessException();
  }
 
- var subscription = await _subscriberQueries.GetSubscriptionOrThrow(user);
+ var subscription = await _getSubscriptionQuery.GetSubscription(user);
 
  await _cancelSubscriptionCommand.CancelSubscription(subscription,
  new OffboardingSurveyResponse

src/Api/Controllers/CollectionsController.cs

@@ -2,6 +2,7 @@
 using Bit.Api.Models.Response;
 using Bit.Api.Utilities;
 using Bit.Api.Vault.AuthorizationHandlers.Collections;
+using Bit.Core;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
@@ -10,6 +11,7 @@
 using Bit.Core.OrganizationFeatures.OrganizationCollections.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
+using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -320,6 +322,7 @@ public async Task PutUsers(Guid orgId, Guid id, [FromBody] IEnumerable<Selection
  }
 
  [HttpPost("bulk-access")]
+ [RequireFeature(FeatureFlagKeys.BulkCollectionAccess)]
  public async Task PostBulkCollectionAccess(Guid orgId, [FromBody] BulkCollectionAccessRequestModel model)
  {
  // Authorization logic assumes flexible collections is enabled

src/Api/Models/Response/SubscriptionResponseModel.cs

@@ -67,10 +67,6 @@ public BillingSubscription(SubscriptionInfo.BillingSubscription sub)
  {
  Items = sub.Items.Select(i => new BillingSubscriptionItem(i));
  }
- CollectionMethod = sub.CollectionMethod;
- SuspensionDate = sub.SuspensionDate;
- UnpaidPeriodEndDate = sub.UnpaidPeriodEndDate;
- GracePeriod = sub.GracePeriod;
  }
 
  public DateTime? TrialStartDate { get; set; }
@@ -82,10 +78,6 @@ public BillingSubscription(SubscriptionInfo.BillingSubscription sub)
  public string Status { get; set; }
  public bool Cancelled { get; set; }
  public IEnumerable<BillingSubscriptionItem> Items { get; set; } = new List<BillingSubscriptionItem>();
- public string CollectionMethod { get; set; }
- public DateTime? SuspensionDate { get; set; }
- public DateTime? UnpaidPeriodEndDate { get; set; }
- public int? GracePeriod { get; set; }
 
  public class BillingSubscriptionItem
  {

src/Api/Startup.cs

@@ -170,7 +170,8 @@ public void ConfigureServices(IServiceCollection services)
  services.AddDefaultServices(globalSettings);
  services.AddOrganizationSubscriptionServices();
  services.AddCoreLocalizationServices();
- services.AddBillingOperations();
+ services.AddBillingCommands();
+ services.AddBillingQueries();
 
  // Authorization Handlers
  services.AddAuthorizationHandlers();

src/Api/appsettings.json

@@ -32,6 +32,10 @@
  "send": {
  "connectionString": "SECRET"
  },
+ "documentDb": {
+ "uri": "SECRET",
+ "key": "SECRET"
+ },
  "sentry": {
  "dsn": "SECRET"
  },

src/Billing/appsettings.json

@@ -30,6 +30,10 @@
  "connectionString": "SECRET",
  "applicationCacheTopicName": "SECRET"
  },
+ "documentDb": {
+ "uri": "SECRET",
+ "key": "SECRET"
+ },
  "sentry": {
  "dsn": "SECRET"
  },

src/Core/AdminConsole/Entities/Provider/Provider.cs

@@ -6,7 +6,7 @@
 
 namespace Bit.Core.AdminConsole.Entities.Provider;
 
-public class Provider : ITableObject<Guid>, ISubscriber
+public class Provider : ITableObject<Guid>
 {
  public Guid Id { get; set; }
  /// <summary>
@@ -34,26 +34,6 @@ public class Provider : ITableObject<Guid>, ISubscriber
  public string GatewayCustomerId { get; set; }
  public string GatewaySubscriptionId { get; set; }
 
- public string BillingEmailAddress() => BillingEmail?.ToLowerInvariant().Trim();
-
- public string BillingName() => DisplayBusinessName();
-
- public string SubscriberName() => DisplayName();
-
- public string BraintreeCustomerIdPrefix() => "p";
-
- public string BraintreeIdField() => "provider_id";
-
- public string BraintreeCloudRegionField() => "region";
-
- public bool IsOrganization() => false;
-
- public bool IsUser() => false;
-
- public string SubscriberType() => "Provider";
-
- public bool IsExpired() => false;
-
  public void SetNewId()
  {
  if (Id == default)

src/Core/AdminConsole/Models/Data/Organizations/SelfHostedOrganizationDetails.cs

@@ -146,8 +146,7 @@ public Organization ToOrganization()
  OwnersNotifiedOfAutoscaling = OwnersNotifiedOfAutoscaling,
  LimitCollectionCreationDeletion = LimitCollectionCreationDeletion,
  AllowAdminAccessToAllCollectionItems = AllowAdminAccessToAllCollectionItems,
- FlexibleCollections = FlexibleCollections,
- Status = Status
+ FlexibleCollections = FlexibleCollections
  };
  }
 }

src/Core/AdminConsole/Repositories/IOrganizationRepository.cs

@@ -15,5 +15,12 @@ public interface IOrganizationRepository : IRepository<Organization, Guid>
  Task<SelfHostedOrganizationDetails> GetSelfHostedOrganizationDetailsById(Guid id);
  Task<ICollection<Organization>> SearchUnassignedToProviderAsync(string name, string ownerEmail, int skip, int take);
  Task<IEnumerable<string>> GetOwnerEmailAddressesById(Guid organizationId);
+ /// <summary>
+ /// Enable collection enhancements.
+ /// </summary>
+ /// <remarks>
+ /// On SQL, it will migrate the data for the given organization.
+ /// On EF providers, it will migrate the data for all existing organizations.
+ /// </remarks>
  Task EnableCollectionEnhancements(Guid organizationId);
 }

src/Core/Billing/Commands/ICancelSubscriptionCommand.cs

@@ -1,6 +1,7 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Models;
 using Bit.Core.Entities;
+using Bit.Core.Exceptions;
 using Stripe;
 
 namespace Bit.Core.Billing.Commands;
@@ -16,6 +17,7 @@ public interface ICancelSubscriptionCommand
  /// <param name="subscription">The <see cref="User"/> or <see cref="Organization"/> with the subscription to cancel.</param>
  /// <param name="offboardingSurveyResponse">An <see cref="OffboardingSurveyResponse"/> DTO containing user-provided feedback on why they are cancelling the subscription.</param>
  /// <param name="cancelImmediately">A flag indicating whether to cancel the subscription immediately or at the end of the subscription period.</param>
+ /// <exception cref="GatewayException">Thrown when the provided subscription is already in an inactive state.</exception>
  Task CancelSubscription(
  Subscription subscription,
  OffboardingSurveyResponse offboardingSurveyResponse,

src/Core/Billing/Commands/IRemovePaymentMethodCommand.cs

@@ -4,12 +4,5 @@ namespace Bit.Core.Billing.Commands;
 
 public interface IRemovePaymentMethodCommand
 {
- /// <summary>
- /// Attempts to remove an Organization's saved payment method. If the Stripe <see cref="Stripe.Customer"/> representing the
- /// <see cref="Organization"/> contains a valid <b>"btCustomerId"</b> key in its <see cref="Stripe.Customer.Metadata"/> property,
- /// this command will attempt to remove the Braintree <see cref="Braintree.PaymentMethod"/>. Otherwise, it will attempt to remove the
- /// Stripe <see cref="Stripe.PaymentMethod"/>.
- /// </summary>
- /// <param name="organization">The organization to remove the saved payment method for.</param>
  Task RemovePaymentMethod(Organization organization);
 }