mirror of
https://github.com/bitwarden/server
synced 2026-02-19 10:53:34 +00:00
* docs(billing): add design document for replacing SetupIntent cache * docs(billing): add implementation plan for replacing SetupIntent cache * feat(db): add gateway lookup stored procedures for Organization, Provider, and User * feat(db): add gateway lookup indexes to Organization, Provider, and User table definitions * chore(db): add SQL Server migration for gateway lookup indexes and stored procedures * feat(repos): add gateway lookup methods to IOrganizationRepository and Dapper implementation * feat(repos): add gateway lookup methods to IProviderRepository and Dapper implementation * feat(repos): add gateway lookup methods to IUserRepository and Dapper implementation * feat(repos): add EF OrganizationRepository gateway lookup methods and index configuration * feat(repos): add EF ProviderRepository gateway lookup methods and index configuration * feat(repos): add EF UserRepository gateway lookup methods and index configuration * chore(db): add EF migrations for gateway lookup indexes * refactor(billing): update SetupIntentSucceededHandler to use repository instead of cache * refactor(billing): simplify StripeEventService by expanding customer on SetupIntent * refactor(billing): query Stripe for SetupIntents by customer ID in GetPaymentMethodQuery * refactor(billing): query Stripe for SetupIntents by customer ID in HasPaymentMethodQuery * refactor(billing): update OrganizationBillingService to set customer on SetupIntent * refactor(billing): update ProviderBillingService to set customer on SetupIntent and query by customer * refactor(billing): update UpdatePaymentMethodCommand to set customer on SetupIntent * refactor(billing): remove bank account support from CreatePremiumCloudHostedSubscriptionCommand * refactor(billing): remove OrganizationBillingService.UpdatePaymentMethod dead code * refactor(billing): remove ProviderBillingService.UpdatePaymentMethod * refactor(billing): remove PremiumUserBillingService.UpdatePaymentMethod and UserService.ReplacePaymentMethodAsync * refactor(billing): remove SubscriberService.UpdatePaymentSource and related dead code * refactor(billing): update SubscriberService.GetPaymentSourceAsync to query Stripe by customer ID Add Task 15a to plan - this was a missed requirement for updating GetPaymentSourceAsync which still used the cache. * refactor(billing): complete removal of PremiumUserBillingService.Finalize and UserService.SignUpPremiumAsync * refactor(billing): remove ISetupIntentCache and SetupIntentDistributedCache * chore: remove temporary planning documents * chore: run dotnet format * fix(billing): add MaxLength(50) to Provider gateway ID properties * chore(db): add EF migrations for Provider gateway column lengths * chore: run dotnet format * chore: rename SQL migration for chronological order
281 lines
10 KiB
C#
281 lines
10 KiB
C#
using System.Data;
|
|
using Bit.Core.AdminConsole.Entities;
|
|
using Bit.Core.AdminConsole.Enums.Provider;
|
|
using Bit.Core.Auth.Entities;
|
|
using Bit.Core.Entities;
|
|
using Bit.Core.Models.Data.Organizations;
|
|
using Bit.Core.Models.Data.Organizations.OrganizationUsers;
|
|
using Bit.Core.Repositories;
|
|
using Bit.Core.Settings;
|
|
using Dapper;
|
|
using Microsoft.Data.SqlClient;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
#nullable enable
|
|
|
|
namespace Bit.Infrastructure.Dapper.Repositories;
|
|
|
|
public class OrganizationRepository : Repository<Organization, Guid>, IOrganizationRepository
|
|
{
|
|
protected readonly ILogger<OrganizationRepository> _logger;
|
|
|
|
public OrganizationRepository(
|
|
GlobalSettings globalSettings,
|
|
ILogger<OrganizationRepository> logger)
|
|
: base(globalSettings.SqlServer.ConnectionString, globalSettings.SqlServer.ReadOnlyConnectionString)
|
|
{
|
|
_logger = logger;
|
|
}
|
|
|
|
public async Task<Organization?> GetByGatewayCustomerIdAsync(string gatewayCustomerId)
|
|
{
|
|
using (var connection = new SqlConnection(ConnectionString))
|
|
{
|
|
var results = await connection.QueryAsync<Organization>(
|
|
"[dbo].[Organization_ReadByGatewayCustomerId]",
|
|
new { GatewayCustomerId = gatewayCustomerId },
|
|
commandType: CommandType.StoredProcedure);
|
|
|
|
return results.FirstOrDefault();
|
|
}
|
|
}
|
|
|
|
public async Task<Organization?> GetByGatewaySubscriptionIdAsync(string gatewaySubscriptionId)
|
|
{
|
|
using (var connection = new SqlConnection(ConnectionString))
|
|
{
|
|
var results = await connection.QueryAsync<Organization>(
|
|
"[dbo].[Organization_ReadByGatewaySubscriptionId]",
|
|
new { GatewaySubscriptionId = gatewaySubscriptionId },
|
|
commandType: CommandType.StoredProcedure);
|
|
|
|
return results.FirstOrDefault();
|
|
}
|
|
}
|
|
|
|
public async Task<Organization?> GetByIdentifierAsync(string identifier)
|
|
{
|
|
using (var connection = new SqlConnection(ConnectionString))
|
|
{
|
|
var results = await connection.QueryAsync<Organization>(
|
|
"[dbo].[Organization_ReadByIdentifier]",
|
|
new { Identifier = identifier },
|
|
commandType: CommandType.StoredProcedure);
|
|
|
|
return results.SingleOrDefault();
|
|
}
|
|
}
|
|
|
|
public async Task<ICollection<Organization>> GetManyByEnabledAsync()
|
|
{
|
|
using (var connection = new SqlConnection(ConnectionString))
|
|
{
|
|
var results = await connection.QueryAsync<Organization>(
|
|
"[dbo].[Organization_ReadByEnabled]",
|
|
commandType: CommandType.StoredProcedure);
|
|
|
|
return results.ToList();
|
|
}
|
|
}
|
|
|
|
public async Task<ICollection<Organization>> GetManyByUserIdAsync(Guid userId)
|
|
{
|
|
using (var connection = new SqlConnection(ConnectionString))
|
|
{
|
|
var results = await connection.QueryAsync<Organization>(
|
|
"[dbo].[Organization_ReadByUserId]",
|
|
new { UserId = userId },
|
|
commandType: CommandType.StoredProcedure);
|
|
|
|
return results.ToList();
|
|
}
|
|
}
|
|
|
|
public async Task<ICollection<Organization>> SearchAsync(string name, string userEmail, bool? paid,
|
|
int skip, int take)
|
|
{
|
|
using (var connection = new SqlConnection(ReadOnlyConnectionString))
|
|
{
|
|
var results = await connection.QueryAsync<Organization>(
|
|
"[dbo].[Organization_Search]",
|
|
new { Name = name, UserEmail = userEmail, Paid = paid, Skip = skip, Take = take },
|
|
commandType: CommandType.StoredProcedure,
|
|
commandTimeout: 120);
|
|
|
|
return results.ToList();
|
|
}
|
|
}
|
|
|
|
public async Task UpdateStorageAsync(Guid id)
|
|
{
|
|
using (var connection = new SqlConnection(ConnectionString))
|
|
{
|
|
await connection.ExecuteAsync(
|
|
"[dbo].[Organization_UpdateStorage]",
|
|
new { Id = id },
|
|
commandType: CommandType.StoredProcedure,
|
|
commandTimeout: 180);
|
|
}
|
|
}
|
|
|
|
public async Task<ICollection<OrganizationAbility>> GetManyAbilitiesAsync()
|
|
{
|
|
using (var connection = new SqlConnection(ConnectionString))
|
|
{
|
|
var results = await connection.QueryAsync<OrganizationAbility>(
|
|
"[dbo].[Organization_ReadAbilities]",
|
|
commandType: CommandType.StoredProcedure);
|
|
|
|
return results.ToList();
|
|
}
|
|
}
|
|
|
|
public async Task<Organization?> GetByLicenseKeyAsync(string licenseKey)
|
|
{
|
|
using (var connection = new SqlConnection(ConnectionString))
|
|
{
|
|
var result = await connection.QueryAsync<Organization>(
|
|
"[dbo].[Organization_ReadByLicenseKey]",
|
|
new { LicenseKey = licenseKey },
|
|
commandType: CommandType.StoredProcedure);
|
|
|
|
return result.SingleOrDefault();
|
|
}
|
|
}
|
|
|
|
public async Task<SelfHostedOrganizationDetails?> GetSelfHostedOrganizationDetailsById(Guid id)
|
|
{
|
|
using (var connection = new SqlConnection(ConnectionString))
|
|
{
|
|
var result = await connection.QueryMultipleAsync(
|
|
"[dbo].[Organization_ReadSelfHostedDetailsById]",
|
|
new { Id = id },
|
|
commandType: CommandType.StoredProcedure);
|
|
|
|
var selfHostOrganization = await result.ReadSingleOrDefaultAsync<SelfHostedOrganizationDetails>();
|
|
if (selfHostOrganization == null)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
selfHostOrganization.OccupiedSeatCount = await result.ReadSingleAsync<int>();
|
|
selfHostOrganization.CollectionCount = await result.ReadSingleAsync<int>();
|
|
selfHostOrganization.GroupCount = await result.ReadSingleAsync<int>();
|
|
selfHostOrganization.OrganizationUsers = await result.ReadAsync<OrganizationUser>();
|
|
selfHostOrganization.Policies = await result.ReadAsync<Policy>();
|
|
selfHostOrganization.SsoConfig = await result.ReadFirstOrDefaultAsync<SsoConfig>();
|
|
selfHostOrganization.ScimConnections = await result.ReadAsync<OrganizationConnection>();
|
|
|
|
return selfHostOrganization;
|
|
}
|
|
}
|
|
|
|
public async Task<ICollection<Organization>> SearchUnassignedToProviderAsync(string name, string ownerEmail, int skip, int take)
|
|
{
|
|
using (var connection = new SqlConnection(ReadOnlyConnectionString))
|
|
{
|
|
var results = await connection.QueryAsync<Organization>(
|
|
"[dbo].[Organization_UnassignedToProviderSearch]",
|
|
new { Name = name, OwnerEmail = ownerEmail, Skip = skip, Take = take },
|
|
commandType: CommandType.StoredProcedure,
|
|
commandTimeout: 120);
|
|
|
|
return results.ToList();
|
|
}
|
|
}
|
|
|
|
public async Task<IEnumerable<string>> GetOwnerEmailAddressesById(Guid organizationId)
|
|
{
|
|
_logger.LogInformation("AC-1758: Executing GetOwnerEmailAddressesById (Dapper)");
|
|
|
|
await using var connection = new SqlConnection(ConnectionString);
|
|
|
|
return await connection.QueryAsync<string>(
|
|
$"[{Schema}].[{Table}_ReadOwnerEmailAddressesById]",
|
|
new { OrganizationId = organizationId },
|
|
commandType: CommandType.StoredProcedure);
|
|
}
|
|
|
|
public async Task<ICollection<Organization>> GetByVerifiedUserEmailDomainAsync(Guid userId)
|
|
{
|
|
using (var connection = new SqlConnection(ConnectionString))
|
|
{
|
|
var result = await connection.QueryAsync<Organization>(
|
|
"[dbo].[Organization_ReadByClaimedUserEmailDomain]",
|
|
new { UserId = userId },
|
|
commandType: CommandType.StoredProcedure);
|
|
|
|
return result.ToList();
|
|
}
|
|
}
|
|
|
|
public async Task<ICollection<Organization>> GetAddableToProviderByUserIdAsync(
|
|
Guid userId,
|
|
ProviderType providerType)
|
|
{
|
|
using (var connection = new SqlConnection(ConnectionString))
|
|
{
|
|
var result = await connection.QueryAsync<Organization>(
|
|
$"[{Schema}].[{Table}_ReadAddableToProviderByUserId]",
|
|
new { UserId = userId, ProviderType = providerType },
|
|
commandType: CommandType.StoredProcedure);
|
|
|
|
return result.ToList();
|
|
}
|
|
}
|
|
|
|
public async Task<ICollection<Organization>> GetManyByIdsAsync(IEnumerable<Guid> ids)
|
|
{
|
|
await using var connection = new SqlConnection(ConnectionString);
|
|
return (await connection.QueryAsync<Organization>(
|
|
$"[{Schema}].[{Table}_ReadManyByIds]",
|
|
new { OrganizationIds = ids.ToGuidIdArrayTVP() },
|
|
commandType: CommandType.StoredProcedure))
|
|
.ToList();
|
|
}
|
|
|
|
public async Task<OrganizationSeatCounts> GetOccupiedSeatCountByOrganizationIdAsync(Guid organizationId)
|
|
{
|
|
using (var connection = new SqlConnection(ConnectionString))
|
|
{
|
|
var result = await connection.QueryAsync<OrganizationSeatCounts>(
|
|
"[dbo].[Organization_ReadOccupiedSeatCountByOrganizationId]",
|
|
new { OrganizationId = organizationId },
|
|
commandType: CommandType.StoredProcedure);
|
|
|
|
return result.SingleOrDefault() ?? new OrganizationSeatCounts();
|
|
}
|
|
}
|
|
|
|
public async Task<IEnumerable<Organization>> GetOrganizationsForSubscriptionSyncAsync()
|
|
{
|
|
await using var connection = new SqlConnection(ConnectionString);
|
|
|
|
return await connection.QueryAsync<Organization>(
|
|
"[dbo].[Organization_GetOrganizationsForSubscriptionSync]",
|
|
commandType: CommandType.StoredProcedure);
|
|
}
|
|
|
|
public async Task UpdateSuccessfulOrganizationSyncStatusAsync(IEnumerable<Guid> successfulOrganizations, DateTime syncDate)
|
|
{
|
|
await using var connection = new SqlConnection(ConnectionString);
|
|
|
|
await connection.ExecuteAsync("[dbo].[Organization_UpdateSubscriptionStatus]",
|
|
new
|
|
{
|
|
SuccessfulOrganizations = successfulOrganizations.ToGuidIdArrayTVP(),
|
|
SyncDate = syncDate
|
|
},
|
|
commandType: CommandType.StoredProcedure);
|
|
}
|
|
|
|
public async Task IncrementSeatCountAsync(Guid organizationId, int increaseAmount, DateTime requestDate)
|
|
{
|
|
await using var connection = new SqlConnection(ConnectionString);
|
|
|
|
await connection.ExecuteAsync("[dbo].[Organization_IncrementSeatCount]",
|
|
new { OrganizationId = organizationId, SeatsToAdd = increaseAmount, RequestDate = requestDate },
|
|
commandType: CommandType.StoredProcedure);
|
|
}
|
|
}
|