mirror of
https://github.com/bitwarden/server.git
synced 2025-06-20 02:48:03 -05:00

* WIP changes for Invite User optimization from Scim * feature flag string * Added plan validation to PasswordManagerInviteUserValidation. Cleaned up a few things. * Added Secrets Manager Validations and Tests. * Added bulk procedure for saving users, collections and groups from inviting. Added test to validate Ef and Sproc * Created SendOrganizationInvitesCommand and moved some tests from OrgServiceTests. Fixed some tests in org service in relation to moving out SendOrgInviteCommand code. Added side effects to InviteOrganizationUsersCommand * First test of new command. * Added test to verify valid request with a user calls db method and sends the invite * Added more tests for the updates * Added integration test around enabling feature and sending invite via scim. Did a bit of refactoring on the SM validation. Fixed couple bugs found. * Switching over to a local factory. * created response model and split interface out. * switched to initialization block * Moved to private method. Made ScimInvite inherit the single invite base model. Moved create methods to constructors. A few more CR changes included. * Moved `FromOrganization` mapper method to a constructor * Updated to use new pricing client. Supressed null dereference errors. * Fixing bad merge. * Rename of OrgDto * undoing this * Moved into class * turned into a switch statement * Separated into separate files. * Renamed dto and added ctor * Dto rename. Moved from static methods to ctors * Removed unused request model * changes from main * missed value * Fixed some compilation errors. * Fixed some changes. * Removed comment * fixed compiler warning. * Refactored to use new ValidationResult pattern. added mapping method. * Added throwing of Failure as the previous implementation would have. * Cleaned up return. * fixing test. * Made HasSecretsManagerStandalone return if org doesn't have sm. Added overload for lighter weight model and moved common code to private method. * Fixed tests. * Made public method private. added some comments. * Refactor validation parameter to improve clarity and consistency. Added XML doc * fixed test * Removed test only constructor from InviteOrganization * Separated old and new code explicitly. Moved old code checks down into new code as well. Added error and mapper to Failure<T> * Variable/Field/Property renames * Renamed InviteUsersValidation to InviteUsersValidator * Rename for InvitingUserOrganizationValidation to InvitingUserOrganizationValidator * PasswordManagerInviteUserValidation to PasswordManagerInviteUserValidator * Moved XML comment. Added check to see if additional seats are needed. * Fixing name. * Updated names. * Corrected double negation. * Added groups and collection and users checks. * Fixed comment. Fixed multiple enumeration. Changed variable name. * Cleaned up DTO models. Moved some validation steps around. A few quick fixes to address CR concerns. Still need to move a few things yet. * Fixed naming in subscription update models. * put back in the request for now. * Quick rename * Added provider email addresses as well. * Removed valid wrapper to pass in to validation methods. * fix tests * Code Review changes. * Removed unused classes * Using GetPlanOrThrow instead. * Switches to extension method * Made Revert and Adjust Sm methods consistent. Corrected string comparer. Added comment for revert sm. * Fixing compiler complaint. * Adding XML docs * Calculated seat addition for SM. * Fixing compiler complaints. * Renames for organization. * Fixing comparison issue. * Adding error and aligning message. * fixing name of method. * Made extension method. * Rearranged some things. Fixed the tests. * Added test around validating the revert. * Added test to validate the provider email is sent if org is managed by a provider. * Created new errors and removed references in business code to ErrorMessages property. This aligns Invite User code to use Errors instead of ErrorMessages * Delayed the hasSecretsManagerStandalone call as long as possible. * Corrected model name. Corrected SM seat calculation. Added test for it. * Corrected logic and added more tests.
74 lines
2.8 KiB
C#
74 lines
2.8 KiB
C#
using Bit.Core.AdminConsole.Entities;
|
|
using Bit.Core.AdminConsole.Entities.Provider;
|
|
using Bit.Core.AdminConsole.Enums.Provider;
|
|
using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Validation.Provider;
|
|
using Bit.Core.Billing.Enums;
|
|
using Bit.Core.Entities;
|
|
using Bit.Core.Enums;
|
|
using Stripe;
|
|
|
|
namespace Bit.Core.Billing.Extensions;
|
|
|
|
public static class BillingExtensions
|
|
{
|
|
public static ProductTierType GetProductTier(this PlanType planType)
|
|
=> planType switch
|
|
{
|
|
PlanType.Custom or PlanType.Free => ProductTierType.Free,
|
|
PlanType.FamiliesAnnually or PlanType.FamiliesAnnually2019 => ProductTierType.Families,
|
|
PlanType.TeamsStarter or PlanType.TeamsStarter2023 => ProductTierType.TeamsStarter,
|
|
_ when planType.ToString().Contains("Teams") => ProductTierType.Teams,
|
|
_ when planType.ToString().Contains("Enterprise") => ProductTierType.Enterprise,
|
|
_ => throw new BillingException($"PlanType {planType} could not be matched to a ProductTierType")
|
|
};
|
|
|
|
public static bool IsBillable(this Provider provider) =>
|
|
provider is
|
|
{
|
|
Type: ProviderType.Msp or ProviderType.MultiOrganizationEnterprise,
|
|
Status: ProviderStatusType.Billable
|
|
};
|
|
|
|
public static bool IsBillable(this InviteOrganizationProvider inviteOrganizationProvider) =>
|
|
inviteOrganizationProvider is
|
|
{
|
|
Type: ProviderType.Msp or ProviderType.MultiOrganizationEnterprise,
|
|
Status: ProviderStatusType.Billable
|
|
};
|
|
|
|
public static bool SupportsConsolidatedBilling(this ProviderType providerType)
|
|
=> providerType is ProviderType.Msp or ProviderType.MultiOrganizationEnterprise;
|
|
|
|
public static bool IsValidClient(this Organization organization)
|
|
=> organization is
|
|
{
|
|
Seats: not null,
|
|
Status: OrganizationStatusType.Managed,
|
|
PlanType: PlanType.TeamsMonthly or PlanType.EnterpriseMonthly or PlanType.EnterpriseAnnually
|
|
};
|
|
|
|
public static bool IsStripeEnabled(this ISubscriber subscriber)
|
|
=> subscriber is
|
|
{
|
|
GatewayCustomerId: not null and not "",
|
|
GatewaySubscriptionId: not null and not ""
|
|
};
|
|
|
|
public static bool IsUnverifiedBankAccount(this SetupIntent setupIntent) =>
|
|
setupIntent is
|
|
{
|
|
Status: "requires_action",
|
|
NextAction:
|
|
{
|
|
VerifyWithMicrodeposits: not null
|
|
},
|
|
PaymentMethod:
|
|
{
|
|
UsBankAccount: not null
|
|
}
|
|
};
|
|
|
|
public static bool SupportsConsolidatedBilling(this PlanType planType)
|
|
=> planType is PlanType.TeamsMonthly or PlanType.EnterpriseMonthly or PlanType.EnterpriseAnnually;
|
|
}
|