Updating provider enabled status based on webhook events

bitwarden_license/src/Commercial.Core/AdminConsole/Services/ProviderService.cs

@@ -647,6 +647,38 @@ public async Task DeleteAsync(Provider provider)
  await _applicationCacheService.DeleteProviderAbilityAsync(provider.Id);
  }
 
+ public async Task EnableAsync(Guid providerId)
+ {
+ var provider = await _providerRepository.GetByIdAsync(providerId);
+
+ if (provider is not { Enabled: false, Gateway: not null })
+ {
+ return;
+ }
+
+ provider.Enabled = true;
+ provider.RevisionDate = DateTime.UtcNow;
+
+ await _providerRepository.ReplaceAsync(provider);
+ await _applicationCacheService.UpsertProviderAbilityAsync(provider);
+ }
+
+ public async Task DisableAsync(Guid providerId)
+ {
+ var provider = await _providerRepository.GetByIdAsync(providerId);
+
+ if (provider is not { Enabled: true })
+ {
+ return;
+ }
+
+ provider.Enabled = true;
+ provider.RevisionDate = DateTime.UtcNow;
+
+ await _providerRepository.ReplaceAsync(provider);
+ await _applicationCacheService.UpsertProviderAbilityAsync(provider);
+ }
+
  private async Task SendInviteAsync(ProviderUser providerUser, Provider provider)
  {
  var nowMillis = CoreHelpers.ToEpocMilliseconds(DateTime.UtcNow);

src/Billing/Billing.csproj

@@ -7,6 +7,7 @@
 
  <PropertyGroup Condition=" '$(RunConfiguration)' == 'Billing' " />
  <ItemGroup>
+ <ProjectReference Include="..\..\bitwarden_license\src\Commercial.Core\Commercial.Core.csproj" />
  <ProjectReference Include="..\SharedWeb\SharedWeb.csproj" />
  <ProjectReference Include="..\Core\Core.csproj" />
  </ItemGroup>

src/Billing/Controllers/StripeController.cs

@@ -3,6 +3,7 @@
 using Bit.Billing.Services;
 using Bit.Core;
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Billing.Constants;
 using Bit.Core.Context;
 using Bit.Core.Enums;
@@ -55,6 +56,7 @@ public class StripeController : Controller
  private readonly IStripeEventService _stripeEventService;
  private readonly IStripeFacade _stripeFacade;
  private readonly IFeatureService _featureService;
+ private readonly IProviderService _providerService;
 
  public StripeController(
  GlobalSettings globalSettings,
@@ -74,7 +76,8 @@ public class StripeController : Controller
  ICurrentContext currentContext,
  IStripeEventService stripeEventService,
  IStripeFacade stripeFacade,
- IFeatureService featureService)
+ IFeatureService featureService,
+ IProviderService providerService)
  {
  _billingSettings = billingSettings?.Value;
  _hostingEnvironment = hostingEnvironment;
@@ -102,6 +105,7 @@ public class StripeController : Controller
  _stripeEventService = stripeEventService;
  _stripeFacade = stripeFacade;
  _featureService = featureService;
+ _providerService = providerService;
  }
 
  [HttpPost("webhook")]
@@ -224,13 +228,8 @@ private async Task HandleCustomerSubscriptionUpdatedEventAsync(Event parsedEvent
  await _organizationService.DisableAsync(organizationId.Value, subscription.CurrentPeriodEnd);
  break;
  }
- case StripeSubscriptionStatus.Unpaid or StripeSubscriptionStatus.IncompleteExpired:
+ case StripeSubscriptionStatus.Unpaid or StripeSubscriptionStatus.IncompleteExpired when userId.HasValue:
  {
- if (!userId.HasValue)
- {
- break;
- }
-
  if (subscription.Status is StripeSubscriptionStatus.Unpaid &&
  subscription.Items.Any(i => i.Price.Id is PremiumPlanId or PremiumPlanIdAppStore))
  {
@@ -240,19 +239,27 @@ private async Task HandleCustomerSubscriptionUpdatedEventAsync(Event parsedEvent
 
  await _userService.DisablePremiumAsync(userId.Value, subscription.CurrentPeriodEnd);
 
+ break;
+ }
+ case StripeSubscriptionStatus.Unpaid or StripeSubscriptionStatus.IncompleteExpired when providerId.HasValue:
+ {
+ await _providerService.DisableAsync(providerId.Value);
  break;
  }
  case StripeSubscriptionStatus.Active when organizationId.HasValue:
  {
  await _organizationService.EnableAsync(organizationId.Value);
  break;
  }
- case StripeSubscriptionStatus.Active:
+ case StripeSubscriptionStatus.Active when userId.HasValue:
  {
- if (userId.HasValue)
- {
- await _userService.EnablePremiumAsync(userId.Value, subscription.CurrentPeriodEnd);
- }
+ await _userService.EnablePremiumAsync(userId.Value, subscription.CurrentPeriodEnd);
+
+ break;
+ }
+ case StripeSubscriptionStatus.Active when providerId.HasValue:
+ {
+ await _providerService.EnableAsync(providerId.Value);
 
  break;
  }
@@ -272,6 +279,7 @@ private async Task HandleCustomerSubscriptionUpdatedEventAsync(Event parsedEvent
  {
  await _userService.UpdatePremiumExpirationAsync(userId.Value, subscription.CurrentPeriodEnd);
  }
+ // No need to update the expiration date for providers as they don't have one
  }
 
  /// <summary>
@@ -355,6 +363,10 @@ private async Task HandleCustomerSubscriptionDeletedEventAsync(Event parsedEvent
  {
  await _userService.DisablePremiumAsync(userId.Value, subscription.CurrentPeriodEnd);
  }
+ else if (providerId.HasValue)
+ {
+ await _providerService.DisableAsync(providerId.Value);
+ }
  }
 
  /// <summary>

src/Billing/Startup.cs

@@ -1,6 +1,7 @@
 using System.Globalization;
 using Bit.Billing.Services;
 using Bit.Billing.Services.Implementations;
+using Bit.Commercial.Core.Utilities;
 using Bit.Core.Context;
 using Bit.Core.SecretsManager.Repositories;
 using Bit.Core.SecretsManager.Repositories.Noop;
@@ -66,6 +67,12 @@ public void ConfigureServices(IServiceCollection services)
  // TODO: no longer be required - see PM-1880
  services.AddScoped<IServiceAccountRepository, NoopServiceAccountRepository>();
 
+#if OSS
+ services.AddOosServices();
+#else
+ services.AddCommercialCoreServices();
+#endif
+
  // Mvc
  services.AddMvc(config =>
  {

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

@@ -29,7 +29,7 @@ public class Provider : ITableObject<Guid>, ISubscriber
  public ProviderType Type { get; set; }
  public bool Enabled { get; set; } = true;
  public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
- public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
+ public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
  public GatewayType? Gateway { get; set; }
  public string GatewayCustomerId { get; set; }
  public string GatewaySubscriptionId { get; set; }

src/Core/AdminConsole/Services/IProviderService.cs

@@ -29,5 +29,7 @@ public interface IProviderService
  Task InitiateDeleteAsync(Provider provider, string providerAdminEmail);
  Task DeleteAsync(Provider provider, string token);
  Task DeleteAsync(Provider provider);
+ Task EnableAsync(Guid providerId);
+ Task DisableAsync(Guid providerId);
 }
 

src/Core/AdminConsole/Services/NoopImplementations/NoopProviderService.cs

@@ -38,4 +38,6 @@ public class NoopProviderService : IProviderService
  public Task InitiateDeleteAsync(Provider provider, string providerAdminEmail) => throw new NotImplementedException();
  public Task DeleteAsync(Provider provider, string token) => throw new NotImplementedException();
  public Task DeleteAsync(Provider provider) => throw new NotImplementedException();
+ public Task EnableAsync(Guid providerId) => throw new NotImplementedException();
+ public Task DisableAsync(Guid providerId) => throw new NotImplementedException();
 }