diff --git a/apps/web/src/app/billing/organizations/adjust-subscription.component.ts b/apps/web/src/app/billing/organizations/adjust-subscription.component.ts index 0fb8c4e3a6..c82f30665d 100644 --- a/apps/web/src/app/billing/organizations/adjust-subscription.component.ts +++ b/apps/web/src/app/billing/organizations/adjust-subscription.component.ts @@ -39,10 +39,7 @@ export class AdjustSubscription { async submit() { try { const seatAdjustment = this.newSeatCount - this.currentSeatCount; - const request = OrganizationSubscriptionUpdateRequest.forPasswordManager( - seatAdjustment, - this.newMaxSeats - ); + const request = new OrganizationSubscriptionUpdateRequest(seatAdjustment, this.newMaxSeats); this.formPromise = this.organizationApiService.updatePasswordManagerSeats( this.organizationId, request diff --git a/libs/common/src/billing/models/request/organization-subscription-update.request.ts b/libs/common/src/billing/models/request/organization-subscription-update.request.ts index 1c34607966..d7566806f6 100644 --- a/libs/common/src/billing/models/request/organization-subscription-update.request.ts +++ b/libs/common/src/billing/models/request/organization-subscription-update.request.ts @@ -1,8 +1,4 @@ -import { BitwardenProductType } from "../../enums"; - export class OrganizationSubscriptionUpdateRequest { - bitwardenProduct: BitwardenProductType; - /** * The number of seats to add or remove from the subscription. * Applies to both PM and SM request types. @@ -15,55 +11,13 @@ export class OrganizationSubscriptionUpdateRequest { */ maxAutoscaleSeats?: number; - /** - * The number of additional service accounts to add or remove from the subscription. - * Applies only to the SM request type. - */ - serviceAccountAdjustment?: number; - - /** - * The maximum number of additional service accounts that can be auto-scaled for the subscription. - * Applies only to the SM request type. - */ - maxAutoscaleServiceAccounts?: number; - - constructor(productType: BitwardenProductType) { - this.bitwardenProduct = productType; - } - /** * Build a subscription update request for the Password Manager product type. * @param seatAdjustment - The number of seats to add or remove from the subscription. * @param maxAutoscaleSeats - The maximum number of seats that can be auto-scaled for the subscription. */ - static forPasswordManager( - seatAdjustment: number, - maxAutoscaleSeats?: number - ): OrganizationSubscriptionUpdateRequest { - const request = new OrganizationSubscriptionUpdateRequest(BitwardenProductType.PasswordManager); - request.seatAdjustment = seatAdjustment; - request.maxAutoscaleSeats = maxAutoscaleSeats; - return request; - } - - /** - * Build a subscription update request for the Secrets Manager product type. - * @param seatAdjustment - The number of seats to add or remove from the subscription. - * @param serviceAccountAdjustment - The number of additional service accounts to add or remove from the subscription. - * @param maxAutoscaleSeats - The maximum number of seats that can be auto-scaled for the subscription. - * @param maxAutoscaleServiceAccounts - The maximum number of additional service accounts that can be auto-scaled for the subscription. - */ - static forSecretsManager( - seatAdjustment: number, - serviceAccountAdjustment: number, - maxAutoscaleSeats?: number, - maxAutoscaleServiceAccounts?: number - ): OrganizationSubscriptionUpdateRequest { - const request = new OrganizationSubscriptionUpdateRequest(BitwardenProductType.SecretsManager); - request.seatAdjustment = seatAdjustment; - request.serviceAccountAdjustment = serviceAccountAdjustment; - request.maxAutoscaleSeats = maxAutoscaleSeats; - request.maxAutoscaleServiceAccounts = maxAutoscaleServiceAccounts; - return request; + constructor(seatAdjustment: number, maxAutoscaleSeats?: number) { + this.seatAdjustment = seatAdjustment; + this.maxAutoscaleSeats = maxAutoscaleSeats; } }