();
+ protected taxInformation: TaxInformation;
+
constructor(
@Inject(DIALOG_DATA) private dialogParams: ChangePlanDialogParams,
private dialogRef: DialogRef,
@@ -189,6 +195,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
private organizationApiService: OrganizationApiServiceAbstraction,
private configService: ConfigService,
private billingApiService: BillingApiServiceAbstraction,
+ private taxService: TaxServiceAbstraction,
) {}
async ngOnInit(): Promise {
@@ -267,6 +274,11 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
this.setInitialPlanSelection();
this.loading = false;
+
+ const taxInfo = await this.organizationApiService.getTaxInfo(this.organizationId);
+ this.taxInformation = TaxInformation.from(taxInfo);
+
+ this.refreshSalesTax();
}
setInitialPlanSelection() {
@@ -402,6 +414,12 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
}
this.selectedPlan = plan;
this.formGroup.patchValue({ productTier: plan.productTier });
+
+ try {
+ this.refreshSalesTax();
+ } catch {
+ this.estimatedTax = 0;
+ }
}
ngOnDestroy() {
@@ -567,12 +585,6 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
);
}
- get taxCharges() {
- return this.taxComponent != null && this.taxComponent.taxRate != null
- ? (this.taxComponent.taxRate / 100) * this.passwordManagerSubtotal
- : 0;
- }
-
get passwordManagerSeats() {
if (this.selectedPlan.productTier === ProductTierType.Families) {
return this.selectedPlan.PasswordManager.baseSeats;
@@ -584,15 +596,15 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
if (this.organization.useSecretsManager) {
return (
this.passwordManagerSubtotal +
- this.additionalStorageTotal(this.selectedPlan) +
- this.secretsManagerSubtotal +
- this.taxCharges || 0
+ this.additionalStorageTotal(this.selectedPlan) +
+ this.secretsManagerSubtotal +
+ this.estimatedTax
);
}
return (
this.passwordManagerSubtotal +
- this.additionalStorageTotal(this.selectedPlan) +
- this.taxCharges || 0
+ this.additionalStorageTotal(this.selectedPlan) +
+ this.estimatedTax
);
}
@@ -645,8 +657,8 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
}
changedCountry() {
- if (this.deprecateStripeSourcesAPI && this.paymentV2Component && this.taxComponent) {
- this.paymentV2Component.showBankAccount = this.taxComponent.country === "US";
+ if (this.deprecateStripeSourcesAPI && this.paymentV2Component) {
+ this.paymentV2Component.showBankAccount = this.taxInformation.country === "US";
if (
!this.paymentV2Component.showBankAccount &&
@@ -654,8 +666,8 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
) {
this.paymentV2Component.select(PaymentMethodType.Card);
}
- } else if (this.paymentComponent && this.taxComponent) {
- this.paymentComponent!.hideBank = this.taxComponent?.taxFormGroup?.value.country !== "US";
+ } else if (this.paymentComponent && this.taxInformation) {
+ this.paymentComponent!.hideBank = this.taxInformation.country !== "US";
// Bank Account payments are only available for US customers
if (
this.paymentComponent.hideBank &&
@@ -667,9 +679,14 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
}
}
+ protected taxInformationChanged(event: TaxInformation): void {
+ this.taxInformation = event;
+ this.changedCountry();
+ this.refreshSalesTax();
+ }
+
submit = async () => {
- if (!this.taxComponent?.taxFormGroup.valid && this.taxComponent?.taxFormGroup.touched) {
- this.taxComponent?.taxFormGroup.markAllAsTouched();
+ if (this.taxComponent !== undefined && !this.taxComponent.validate()) {
return;
}
@@ -723,8 +740,8 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
this.formGroup.controls.premiumAccessAddon.value;
request.planType = this.selectedPlan.type;
if (this.showPayment) {
- request.billingAddressCountry = this.taxComponent.taxFormGroup?.value.country;
- request.billingAddressPostalCode = this.taxComponent.taxFormGroup?.value.postalCode;
+ request.billingAddressCountry = this.taxInformation.country;
+ request.billingAddressPostalCode = this.taxInformation.postalCode;
}
// Secrets Manager
@@ -735,15 +752,9 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
const tokenizedPaymentSource = await this.paymentV2Component.tokenize();
const updatePaymentMethodRequest = new UpdatePaymentMethodRequest();
updatePaymentMethodRequest.paymentSource = tokenizedPaymentSource;
- updatePaymentMethodRequest.taxInformation = {
- country: this.taxComponent.country,
- postalCode: this.taxComponent.postalCode,
- taxId: this.taxComponent.taxId,
- line1: this.taxComponent.line1,
- line2: this.taxComponent.line2,
- city: this.taxComponent.city,
- state: this.taxComponent.state,
- };
+ updatePaymentMethodRequest.taxInformation = ExpandedTaxInfoUpdateRequest.From(
+ this.taxInformation,
+ );
await this.billingApiService.updateOrganizationPaymentMethod(
this.organizationId,
@@ -754,8 +765,8 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
const paymentRequest = new PaymentRequest();
paymentRequest.paymentToken = tokenResult[0];
paymentRequest.paymentMethodType = tokenResult[1];
- paymentRequest.country = this.taxComponent.taxFormGroup?.value.country;
- paymentRequest.postalCode = this.taxComponent.taxFormGroup?.value.postalCode;
+ paymentRequest.country = this.taxInformation.country;
+ paymentRequest.postalCode = this.taxInformation.postalCode;
await this.organizationApiService.updatePayment(this.organizationId, paymentRequest);
}
}
@@ -944,4 +955,48 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
manageSelectableProduct(index: number) {
return index;
}
+
+ private refreshSalesTax(): void {
+ if (!this.taxInformation.country || !this.taxInformation.postalCode) {
+ return;
+ }
+
+ const request: PreviewOrganizationInvoiceRequest = {
+ organizationId: this.organizationId,
+ passwordManager: {
+ additionalStorage: 0,
+ plan: this.selectedPlan?.type,
+ seats: this.sub.seats,
+ },
+ taxInformation: {
+ postalCode: this.taxInformation.postalCode,
+ country: this.taxInformation.country,
+ taxId: this.taxInformation.taxId,
+ },
+ };
+
+ if (this.organization.useSecretsManager) {
+ request.secretsManager = {
+ seats: this.sub.smSeats,
+ additionalMachineAccounts: this.sub.smServiceAccounts,
+ };
+ }
+
+ this.taxService
+ .previewOrganizationInvoice(request)
+ .then((invoice) => {
+ this.estimatedTax = invoice.taxAmount;
+ })
+ .catch((error) => {
+ this.toastService.showToast({
+ title: "",
+ variant: "error",
+ message: this.i18nService.t(error.message),
+ });
+ });
+ }
+
+ protected canUpdatePaymentInformation(): boolean {
+ return this.upgradeRequiresPaymentMethod || this.showPayment || this.isPaymentSourceEmpty();
+ }
}
diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.html b/apps/web/src/app/billing/organizations/organization-plans.component.html
index e1b74abea71..d37f95e3aa2 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.html
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.html
@@ -335,7 +335,7 @@
>{{ "additionalUsers" | i18n }}:
{{ "users" | i18n }}:
- {{ formGroup.controls["additionalSeats"].value || 0 }} ×
+ {{ formGroup.controls.additionalSeats.value || 0 }} ×
{{
(selectablePlan.isAnnual
? selectablePlan.PasswordManager.seatPrice / 12
@@ -355,7 +355,7 @@
*ngIf="selectablePlan.PasswordManager.hasAdditionalStorageOption"
>
{{ "additionalStorageGb" | i18n }}:
- {{ formGroup.controls["additionalStorage"].value || 0 }} ×
+ {{ formGroup.controls.additionalStorage.value || 0 }} ×
{{
(selectablePlan.isAnnual
? selectablePlan.PasswordManager.additionalStoragePricePerGb / 12
@@ -388,7 +388,7 @@
>{{ "additionalUsers" | i18n }}:
{{ "users" | i18n }}:
- {{ formGroup.controls["additionalSeats"].value || 0 }} ×
+ {{ formGroup.controls.additionalSeats.value || 0 }} ×
{{ selectablePlan.PasswordManager.seatPrice | currency: "$" }}
{{ "monthAbbr" | i18n }} =
{{
@@ -403,7 +403,7 @@
*ngIf="selectablePlan.PasswordManager.hasAdditionalStorageOption"
>
{{ "additionalStorageGb" | i18n }}:
- {{ formGroup.controls["additionalStorage"].value || 0 }} ×
+ {{ formGroup.controls.additionalStorage.value || 0 }} ×
{{ selectablePlan.PasswordManager.additionalStoragePricePerGb | currency: "$" }}
{{ "monthAbbr" | i18n }} =
{{ additionalStorageTotal(selectablePlan) | currency: "$" }} /{{ "month" | i18n }}
@@ -440,7 +440,12 @@
-
+
{{ "passwordManagerPlanPrice" | i18n }}: {{ passwordManagerSubtotal | currency: "USD $" }}
@@ -450,7 +455,7 @@
- {{ "estimatedTax" | i18n }}: {{ taxCharges | currency: "USD $" }}
+ {{ "estimatedTax" | i18n }}: {{ estimatedTax | currency: "USD $" }}
diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.ts b/apps/web/src/app/billing/organizations/organization-plans.component.ts
index e7a011792ae..4592f8de894 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts
@@ -12,7 +12,9 @@ import {
import { FormBuilder, Validators } from "@angular/forms";
import { Router } from "@angular/router";
import { Subject, takeUntil } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
@@ -26,9 +28,12 @@ import { OrganizationUpgradeRequest } from "@bitwarden/common/admin-console/mode
import { ProviderOrganizationCreateRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-organization-create.request";
import { ProviderResponse } from "@bitwarden/common/admin-console/models/response/provider/provider.response";
import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
+import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
import { PaymentMethodType, PlanType, ProductTierType } from "@bitwarden/common/billing/enums";
+import { TaxInformation } from "@bitwarden/common/billing/models/domain";
import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
import { PaymentRequest } from "@bitwarden/common/billing/models/request/payment.request";
+import { PreviewOrganizationInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-organization-invoice.request";
import { UpdatePaymentMethodRequest } from "@bitwarden/common/billing/models/request/update-payment-method.request";
import { BillingResponse } from "@bitwarden/common/billing/models/response/billing.response";
import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
@@ -50,7 +55,6 @@ import { OrganizationCreateModule } from "../../admin-console/organizations/crea
import { BillingSharedModule, secretsManagerSubscribeFormFactory } from "../shared";
import { PaymentV2Component } from "../shared/payment/payment-v2.component";
import { PaymentComponent } from "../shared/payment/payment.component";
-import { TaxInfoComponent } from "../shared/tax-info.component";
interface OnSuccessArgs {
organizationId: string;
@@ -72,13 +76,14 @@ const Allowed2020PlansForLegacyProviders = [
export class OrganizationPlansComponent implements OnInit, OnDestroy {
@ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
@ViewChild(PaymentV2Component) paymentV2Component: PaymentV2Component;
- @ViewChild(TaxInfoComponent) taxComponent: TaxInfoComponent;
+ @ViewChild(ManageTaxInformationComponent) taxComponent: ManageTaxInformationComponent;
- @Input() organizationId: string;
+ @Input() organizationId?: string;
@Input() showFree = true;
@Input() showCancel = false;
@Input() acceptingSponsorship = false;
@Input() currentPlan: PlanResponse;
+
selectedFile: File;
@Input()
@@ -93,6 +98,8 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
private _productTier = ProductTierType.Free;
+ protected taxInformation: TaxInformation;
+
@Input()
get plan(): PlanType {
return this._plan;
@@ -149,7 +156,10 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
billing: BillingResponse;
provider: ProviderResponse;
- private destroy$ = new Subject
();
+ protected estimatedTax: number = 0;
+ protected total: number = 0;
+
+ private destroy$: Subject = new Subject();
constructor(
private apiService: ApiService,
@@ -168,6 +178,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
private toastService: ToastService,
private configService: ConfigService,
private billingApiService: BillingApiServiceAbstraction,
+ private taxService: TaxServiceAbstraction,
) {
this.selfHosted = this.platformUtilsService.isSelfHost();
}
@@ -181,6 +192,9 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
this.organization = await this.organizationService.get(this.organizationId);
this.billing = await this.organizationApiService.getBilling(this.organizationId);
this.sub = await this.organizationApiService.getSubscription(this.organizationId);
+ this.taxInformation = await this.organizationApiService.getTaxInfo(this.organizationId);
+ } else {
+ this.taxInformation = await this.apiService.getTaxInfo();
}
if (!this.selfHosted) {
@@ -241,6 +255,16 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
}
this.loading = false;
+
+ this.formGroup.valueChanges.pipe(debounceTime(1000), takeUntil(this.destroy$)).subscribe(() => {
+ this.refreshSalesTax();
+ });
+
+ this.secretsManagerForm.valueChanges
+ .pipe(debounceTime(1000), takeUntil(this.destroy$))
+ .subscribe(() => {
+ this.refreshSalesTax();
+ });
}
ngOnDestroy() {
@@ -438,17 +462,6 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
return this.selectedPlan.trialPeriodDays != null;
}
- get taxCharges() {
- return this.taxComponent != null && this.taxComponent.taxRate != null
- ? (this.taxComponent.taxRate / 100) *
- (this.passwordManagerSubtotal + this.secretsManagerSubtotal)
- : 0;
- }
-
- get total() {
- return this.passwordManagerSubtotal + this.secretsManagerSubtotal + this.taxCharges || 0;
- }
-
get paymentDesc() {
if (this.acceptingSponsorship) {
return this.i18nService.t("paymentSponsored");
@@ -554,9 +567,9 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
this.changedProduct();
}
- changedCountry() {
+ protected changedCountry(): void {
if (this.deprecateStripeSourcesAPI) {
- this.paymentV2Component.showBankAccount = this.taxComponent.country === "US";
+ this.paymentV2Component.showBankAccount = this.taxInformation?.country === "US";
if (
!this.paymentV2Component.showBankAccount &&
this.paymentV2Component.selected === PaymentMethodType.BankAccount
@@ -564,7 +577,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
this.paymentV2Component.select(PaymentMethodType.Card);
}
} else {
- this.paymentComponent.hideBank = this.taxComponent.taxFormGroup?.value.country !== "US";
+ this.paymentComponent.hideBank = this.taxInformation?.country !== "US";
if (
this.paymentComponent.hideBank &&
this.paymentComponent.method === PaymentMethodType.BankAccount
@@ -575,28 +588,31 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
}
}
- cancel() {
+ protected onTaxInformationChanged(event: TaxInformation): void {
+ this.taxInformation = event;
+ this.changedCountry();
+ this.refreshSalesTax();
+ }
+
+ protected cancel(): void {
this.onCanceled.emit();
}
- setSelectedFile(event: Event) {
+ protected setSelectedFile(event: Event): void {
const fileInputEl = event.target;
this.selectedFile = fileInputEl.files.length > 0 ? fileInputEl.files[0] : null;
}
submit = async () => {
- if (this.taxComponent) {
- if (!this.taxComponent?.taxFormGroup.valid) {
- this.taxComponent?.taxFormGroup.markAllAsTouched();
- return;
- }
+ if (this.taxComponent && !this.taxComponent.validate()) {
+ return;
}
if (this.singleOrgPolicyBlock) {
return;
}
const doSubmit = async (): Promise => {
- let orgId: string = null;
+ let orgId: string;
if (this.createOrganization) {
const orgKey = await this.keyService.makeOrgKey();
const key = orgKey[0].encryptedString;
@@ -607,11 +623,9 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
const collectionCt = collection.encryptedString;
const orgKeys = await this.keyService.makeKeyPair(orgKey[1]);
- if (this.selfHosted) {
- orgId = await this.createSelfHosted(key, collectionCt, orgKeys);
- } else {
- orgId = await this.createCloudHosted(key, collectionCt, orgKeys, orgKey[1]);
- }
+ orgId = this.selfHosted
+ ? await this.createSelfHosted(key, collectionCt, orgKeys)
+ : await this.createCloudHosted(key, collectionCt, orgKeys, orgKey[1]);
this.toastService.showToast({
variant: "success",
@@ -619,7 +633,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
message: this.i18nService.t("organizationReadyToGo"),
});
} else {
- orgId = await this.updateOrganization(orgId);
+ orgId = await this.updateOrganization();
this.toastService.showToast({
variant: "success",
title: null,
@@ -653,7 +667,63 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
this.messagingService.send("organizationCreated", { organizationId });
};
- private async updateOrganization(orgId: string) {
+ protected get showTaxIdField(): boolean {
+ switch (this.formGroup.controls.productTier.value) {
+ case ProductTierType.Free:
+ case ProductTierType.Families:
+ return false;
+ default:
+ return true;
+ }
+ }
+
+ private refreshSalesTax(): void {
+ if (this.formGroup.controls.plan.value == PlanType.Free) {
+ this.estimatedTax = 0;
+ return;
+ }
+
+ if (!this.taxComponent.validate()) {
+ return;
+ }
+
+ const request: PreviewOrganizationInvoiceRequest = {
+ organizationId: this.organizationId,
+ passwordManager: {
+ additionalStorage: this.formGroup.controls.additionalStorage.value,
+ plan: this.formGroup.controls.plan.value,
+ seats: this.formGroup.controls.additionalSeats.value,
+ },
+ taxInformation: {
+ postalCode: this.taxInformation.postalCode,
+ country: this.taxInformation.country,
+ taxId: this.taxInformation.taxId,
+ },
+ };
+
+ if (this.secretsManagerForm.controls.enabled.value === true) {
+ request.secretsManager = {
+ seats: this.secretsManagerForm.controls.userSeats.value,
+ additionalMachineAccounts: this.secretsManagerForm.controls.additionalServiceAccounts.value,
+ };
+ }
+
+ this.taxService
+ .previewOrganizationInvoice(request)
+ .then((invoice) => {
+ this.estimatedTax = invoice.taxAmount;
+ this.total = invoice.totalAmount;
+ })
+ .catch((error) => {
+ this.toastService.showToast({
+ title: "",
+ variant: "error",
+ message: this.i18nService.t(error.message),
+ });
+ });
+ }
+
+ private async updateOrganization() {
const request = new OrganizationUpgradeRequest();
request.additionalSeats = this.formGroup.controls.additionalSeats.value;
request.additionalStorageGb = this.formGroup.controls.additionalStorage.value;
@@ -661,8 +731,8 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
this.selectedPlan.PasswordManager.hasPremiumAccessOption &&
this.formGroup.controls.premiumAccessAddon.value;
request.planType = this.selectedPlan.type;
- request.billingAddressCountry = this.taxComponent.taxFormGroup?.value.country;
- request.billingAddressPostalCode = this.taxComponent.taxFormGroup?.value.postalCode;
+ request.billingAddressCountry = this.taxInformation?.country;
+ request.billingAddressPostalCode = this.taxInformation?.postalCode;
// Secrets Manager
this.buildSecretsManagerRequest(request);
@@ -671,10 +741,9 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
if (this.deprecateStripeSourcesAPI) {
const updatePaymentMethodRequest = new UpdatePaymentMethodRequest();
updatePaymentMethodRequest.paymentSource = await this.paymentV2Component.tokenize();
- const expandedTaxInfoUpdateRequest = new ExpandedTaxInfoUpdateRequest();
- expandedTaxInfoUpdateRequest.country = this.taxComponent.country;
- expandedTaxInfoUpdateRequest.postalCode = this.taxComponent.postalCode;
- updatePaymentMethodRequest.taxInformation = expandedTaxInfoUpdateRequest;
+ updatePaymentMethodRequest.taxInformation = ExpandedTaxInfoUpdateRequest.From(
+ this.taxInformation,
+ );
await this.billingApiService.updateOrganizationPaymentMethod(
this.organizationId,
updatePaymentMethodRequest,
@@ -684,8 +753,8 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
const paymentRequest = new PaymentRequest();
paymentRequest.paymentToken = paymentToken;
paymentRequest.paymentMethodType = paymentMethodType;
- paymentRequest.country = this.taxComponent.taxFormGroup?.value.country;
- paymentRequest.postalCode = this.taxComponent.taxFormGroup?.value.postalCode;
+ paymentRequest.country = this.taxInformation?.country;
+ paymentRequest.postalCode = this.taxInformation?.postalCode;
await this.organizationApiService.updatePayment(this.organizationId, paymentRequest);
}
}
@@ -709,7 +778,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
collectionCt: string,
orgKeys: [string, EncString],
orgKey: SymmetricCryptoKey,
- ) {
+ ): Promise {
const request = new OrganizationCreateRequest();
request.key = key;
request.collectionName = collectionCt;
@@ -738,15 +807,13 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
this.selectedPlan.PasswordManager.hasPremiumAccessOption &&
this.formGroup.controls.premiumAccessAddon.value;
request.planType = this.selectedPlan.type;
- request.billingAddressPostalCode = this.taxComponent.taxFormGroup?.value.postalCode;
- request.billingAddressCountry = this.taxComponent.taxFormGroup?.value.country;
- if (this.taxComponent.taxFormGroup?.value.includeTaxId) {
- request.taxIdNumber = this.taxComponent.taxFormGroup?.value.taxId;
- request.billingAddressLine1 = this.taxComponent.taxFormGroup?.value.line1;
- request.billingAddressLine2 = this.taxComponent.taxFormGroup?.value.line2;
- request.billingAddressCity = this.taxComponent.taxFormGroup?.value.city;
- request.billingAddressState = this.taxComponent.taxFormGroup?.value.state;
- }
+ request.billingAddressPostalCode = this.taxInformation?.postalCode;
+ request.billingAddressCountry = this.taxInformation?.country;
+ request.taxIdNumber = this.taxInformation?.taxId;
+ request.billingAddressLine1 = this.taxInformation?.line1;
+ request.billingAddressLine2 = this.taxInformation?.line2;
+ request.billingAddressCity = this.taxInformation?.city;
+ request.billingAddressState = this.taxInformation?.state;
}
// Secrets Manager
diff --git a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html
index 78f9955d31a..2c2dba938bc 100644
--- a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html
+++ b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html
@@ -63,20 +63,5 @@
{{ "paymentChargedWithUnpaidSubscription" | i18n }}
-
-
- {{ "taxInformation" | i18n }}
- {{ "taxInformationDesc" | i18n }}
-
-
-
diff --git a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
index 4ed35461c72..270ba54f70d 100644
--- a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
+++ b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
@@ -1,7 +1,7 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
import { Location } from "@angular/common";
-import { Component, OnDestroy, ViewChild } from "@angular/core";
+import { Component, OnDestroy } from "@angular/core";
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { ActivatedRoute, Router } from "@angular/router";
import { from, lastValueFrom, switchMap } from "rxjs";
@@ -11,7 +11,6 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
import { PaymentMethodType } from "@bitwarden/common/billing/enums";
-import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
import { VerifyBankAccountRequest } from "@bitwarden/common/billing/models/request/verify-bank-account.request";
import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
import { PaymentSourceResponse } from "@bitwarden/common/billing/models/response/payment-source.response";
@@ -22,7 +21,6 @@ import { DialogService, ToastService } from "@bitwarden/components";
import { FreeTrial } from "../../../core/types/free-trial";
import { TrialFlowService } from "../../services/trial-flow.service";
-import { TaxInfoComponent } from "../../shared";
import {
AddCreditDialogResult,
openAddCreditDialog,
@@ -36,8 +34,6 @@ import {
templateUrl: "./organization-payment-method.component.html",
})
export class OrganizationPaymentMethodComponent implements OnDestroy {
- @ViewChild(TaxInfoComponent) taxInfoComponent: TaxInfoComponent;
-
organizationId: string;
isUnpaid = false;
accountCredit: number;
@@ -155,6 +151,7 @@ export class OrganizationPaymentMethodComponent implements OnDestroy {
data: {
initialPaymentMethod: this.paymentSource?.type,
organizationId: this.organizationId,
+ productTier: this.organization?.productTierType,
},
});
@@ -170,6 +167,7 @@ export class OrganizationPaymentMethodComponent implements OnDestroy {
data: {
initialPaymentMethod: this.paymentSource?.type,
organizationId: this.organizationId,
+ productTier: this.organization?.productTierType,
},
});
const result = await lastValueFrom(dialogRef.closed);
@@ -183,32 +181,6 @@ export class OrganizationPaymentMethodComponent implements OnDestroy {
}
};
- protected updateTaxInformation = async (): Promise => {
- this.taxInfoComponent.taxFormGroup.updateValueAndValidity();
- this.taxInfoComponent.taxFormGroup.markAllAsTouched();
-
- if (this.taxInfoComponent.taxFormGroup.invalid) {
- return;
- }
-
- const request = new ExpandedTaxInfoUpdateRequest();
- request.country = this.taxInfoComponent.country;
- request.postalCode = this.taxInfoComponent.postalCode;
- request.taxId = this.taxInfoComponent.taxId;
- request.line1 = this.taxInfoComponent.line1;
- request.line2 = this.taxInfoComponent.line2;
- request.city = this.taxInfoComponent.city;
- request.state = this.taxInfoComponent.state;
-
- await this.billingApiService.updateOrganizationTaxInformation(this.organizationId, request);
-
- this.toastService.showToast({
- variant: "success",
- title: null,
- message: this.i18nService.t("taxInfoUpdated"),
- });
- };
-
protected verifyBankAccount = async (request: VerifyBankAccountRequest): Promise => {
await this.billingApiService.verifyOrganizationBankAccount(this.organizationId, request);
this.toastService.showToast({
diff --git a/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.ts b/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.ts
index 4a4f309c68b..fc7a188f967 100644
--- a/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.ts
+++ b/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.ts
@@ -5,6 +5,8 @@ import { FormBuilder, Validators } from "@angular/forms";
import { Subject, takeUntil } from "rxjs";
import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { InternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { OrganizationData } from "@bitwarden/common/admin-console/models/data/organization.data";
import { OrganizationSmSubscriptionUpdateRequest } from "@bitwarden/common/billing/models/request/organization-sm-subscription-update.request";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -104,6 +106,7 @@ export class SecretsManagerAdjustSubscriptionComponent implements OnInit, OnDest
private i18nService: I18nService,
private platformUtilsService: PlatformUtilsService,
private toastService: ToastService,
+ private internalOrganizationService: InternalOrganizationServiceAbstraction,
) {}
ngOnInit() {
@@ -157,11 +160,20 @@ export class SecretsManagerAdjustSubscriptionComponent implements OnInit, OnDest
? this.formGroup.value.maxAutoscaleServiceAccounts
: null;
- await this.organizationApiService.updateSecretsManagerSubscription(
+ const response = await this.organizationApiService.updateSecretsManagerSubscription(
this.organizationId,
request,
);
+ const organization = await this.internalOrganizationService.get(this.organizationId);
+
+ const organizationData = new OrganizationData(response, {
+ isMember: organization.isMember,
+ isProviderUser: organization.isProviderUser,
+ });
+
+ await this.internalOrganizationService.upsert(organizationData);
+
this.toastService.showToast({
variant: "success",
title: null,
diff --git a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.html b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.html
index e41d3d961cd..bb06f87ca03 100644
--- a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.html
+++ b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.html
@@ -5,7 +5,12 @@
[showBankAccount]="!!organizationId"
[initialPaymentMethod]="initialPaymentMethod"
>
-
+
-
+
{{ "zipPostalCode" | i18n }}
-
-
-
-
diff --git a/apps/web/src/app/billing/shared/tax-info.component.ts b/apps/web/src/app/billing/shared/tax-info.component.ts
index 8ebec5e1dfe..214364e4cf2 100644
--- a/apps/web/src/app/billing/shared/tax-info.component.ts
+++ b/apps/web/src/app/billing/shared/tax-info.component.ts
@@ -1,31 +1,20 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
-import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core";
import { FormControl, FormGroup, Validators } from "@angular/forms";
import { ActivatedRoute } from "@angular/router";
import { Subject, takeUntil } from "rxjs";
+import { debounceTime } from "rxjs/operators";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
+import { CountryListItem } from "@bitwarden/common/billing/models/domain";
import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
-import { TaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/tax-info-update.request";
-import { TaxInfoResponse } from "@bitwarden/common/billing/models/response/tax-info.response";
-import { TaxRateResponse } from "@bitwarden/common/billing/models/response/tax-rate.response";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { SharedModule } from "../../shared";
-type TaxInfoView = Omit
& {
- includeTaxId: boolean;
- [key: string]: unknown;
-};
-
-type CountryList = {
- name: string;
- value: string;
- disabled: boolean;
-};
-
@Component({
selector: "app-tax-info",
templateUrl: "tax-info.component.html",
@@ -33,359 +22,68 @@ type CountryList = {
imports: [SharedModule],
})
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
-export class TaxInfoComponent implements OnInit {
- @Input() trialFlow = false;
- @Output() onCountryChanged = new EventEmitter();
+export class TaxInfoComponent implements OnInit, OnDestroy {
private destroy$ = new Subject();
+ @Input() trialFlow = false;
+ @Output() countryChanged = new EventEmitter();
+ @Output() taxInformationChanged: EventEmitter = new EventEmitter();
+
taxFormGroup = new FormGroup({
- country: new FormControl(null, [Validators.required]),
- postalCode: new FormControl(null),
- includeTaxId: new FormControl(null),
- taxId: new FormControl(null),
- line1: new FormControl(null),
- line2: new FormControl(null),
- city: new FormControl(null),
- state: new FormControl(null),
+ country: new FormControl(null, [Validators.required]),
+ postalCode: new FormControl(null, [Validators.required]),
+ taxId: new FormControl(null),
+ line1: new FormControl(null),
+ line2: new FormControl(null),
+ city: new FormControl(null),
+ state: new FormControl(null),
});
+ protected isTaxSupported: boolean;
+
loading = true;
organizationId: string;
providerId: string;
- taxInfo: TaxInfoView = {
- taxId: null,
- line1: null,
- line2: null,
- city: null,
- state: null,
- postalCode: null,
- country: "US",
- includeTaxId: false,
- };
- countryList: CountryList[] = [
- { name: "-- Select --", value: "", disabled: false },
- { name: "United States", value: "US", disabled: false },
- { name: "China", value: "CN", disabled: false },
- { name: "France", value: "FR", disabled: false },
- { name: "Germany", value: "DE", disabled: false },
- { name: "Canada", value: "CA", disabled: false },
- { name: "United Kingdom", value: "GB", disabled: false },
- { name: "Australia", value: "AU", disabled: false },
- { name: "India", value: "IN", disabled: false },
- { name: "", value: "-", disabled: true },
- { name: "Afghanistan", value: "AF", disabled: false },
- { name: "Åland Islands", value: "AX", disabled: false },
- { name: "Albania", value: "AL", disabled: false },
- { name: "Algeria", value: "DZ", disabled: false },
- { name: "American Samoa", value: "AS", disabled: false },
- { name: "Andorra", value: "AD", disabled: false },
- { name: "Angola", value: "AO", disabled: false },
- { name: "Anguilla", value: "AI", disabled: false },
- { name: "Antarctica", value: "AQ", disabled: false },
- { name: "Antigua and Barbuda", value: "AG", disabled: false },
- { name: "Argentina", value: "AR", disabled: false },
- { name: "Armenia", value: "AM", disabled: false },
- { name: "Aruba", value: "AW", disabled: false },
- { name: "Austria", value: "AT", disabled: false },
- { name: "Azerbaijan", value: "AZ", disabled: false },
- { name: "Bahamas", value: "BS", disabled: false },
- { name: "Bahrain", value: "BH", disabled: false },
- { name: "Bangladesh", value: "BD", disabled: false },
- { name: "Barbados", value: "BB", disabled: false },
- { name: "Belarus", value: "BY", disabled: false },
- { name: "Belgium", value: "BE", disabled: false },
- { name: "Belize", value: "BZ", disabled: false },
- { name: "Benin", value: "BJ", disabled: false },
- { name: "Bermuda", value: "BM", disabled: false },
- { name: "Bhutan", value: "BT", disabled: false },
- { name: "Bolivia, Plurinational State of", value: "BO", disabled: false },
- { name: "Bonaire, Sint Eustatius and Saba", value: "BQ", disabled: false },
- { name: "Bosnia and Herzegovina", value: "BA", disabled: false },
- { name: "Botswana", value: "BW", disabled: false },
- { name: "Bouvet Island", value: "BV", disabled: false },
- { name: "Brazil", value: "BR", disabled: false },
- { name: "British Indian Ocean Territory", value: "IO", disabled: false },
- { name: "Brunei Darussalam", value: "BN", disabled: false },
- { name: "Bulgaria", value: "BG", disabled: false },
- { name: "Burkina Faso", value: "BF", disabled: false },
- { name: "Burundi", value: "BI", disabled: false },
- { name: "Cambodia", value: "KH", disabled: false },
- { name: "Cameroon", value: "CM", disabled: false },
- { name: "Cape Verde", value: "CV", disabled: false },
- { name: "Cayman Islands", value: "KY", disabled: false },
- { name: "Central African Republic", value: "CF", disabled: false },
- { name: "Chad", value: "TD", disabled: false },
- { name: "Chile", value: "CL", disabled: false },
- { name: "Christmas Island", value: "CX", disabled: false },
- { name: "Cocos (Keeling) Islands", value: "CC", disabled: false },
- { name: "Colombia", value: "CO", disabled: false },
- { name: "Comoros", value: "KM", disabled: false },
- { name: "Congo", value: "CG", disabled: false },
- { name: "Congo, the Democratic Republic of the", value: "CD", disabled: false },
- { name: "Cook Islands", value: "CK", disabled: false },
- { name: "Costa Rica", value: "CR", disabled: false },
- { name: "Côte d'Ivoire", value: "CI", disabled: false },
- { name: "Croatia", value: "HR", disabled: false },
- { name: "Cuba", value: "CU", disabled: false },
- { name: "Curaçao", value: "CW", disabled: false },
- { name: "Cyprus", value: "CY", disabled: false },
- { name: "Czech Republic", value: "CZ", disabled: false },
- { name: "Denmark", value: "DK", disabled: false },
- { name: "Djibouti", value: "DJ", disabled: false },
- { name: "Dominica", value: "DM", disabled: false },
- { name: "Dominican Republic", value: "DO", disabled: false },
- { name: "Ecuador", value: "EC", disabled: false },
- { name: "Egypt", value: "EG", disabled: false },
- { name: "El Salvador", value: "SV", disabled: false },
- { name: "Equatorial Guinea", value: "GQ", disabled: false },
- { name: "Eritrea", value: "ER", disabled: false },
- { name: "Estonia", value: "EE", disabled: false },
- { name: "Ethiopia", value: "ET", disabled: false },
- { name: "Falkland Islands (Malvinas)", value: "FK", disabled: false },
- { name: "Faroe Islands", value: "FO", disabled: false },
- { name: "Fiji", value: "FJ", disabled: false },
- { name: "Finland", value: "FI", disabled: false },
- { name: "French Guiana", value: "GF", disabled: false },
- { name: "French Polynesia", value: "PF", disabled: false },
- { name: "French Southern Territories", value: "TF", disabled: false },
- { name: "Gabon", value: "GA", disabled: false },
- { name: "Gambia", value: "GM", disabled: false },
- { name: "Georgia", value: "GE", disabled: false },
- { name: "Ghana", value: "GH", disabled: false },
- { name: "Gibraltar", value: "GI", disabled: false },
- { name: "Greece", value: "GR", disabled: false },
- { name: "Greenland", value: "GL", disabled: false },
- { name: "Grenada", value: "GD", disabled: false },
- { name: "Guadeloupe", value: "GP", disabled: false },
- { name: "Guam", value: "GU", disabled: false },
- { name: "Guatemala", value: "GT", disabled: false },
- { name: "Guernsey", value: "GG", disabled: false },
- { name: "Guinea", value: "GN", disabled: false },
- { name: "Guinea-Bissau", value: "GW", disabled: false },
- { name: "Guyana", value: "GY", disabled: false },
- { name: "Haiti", value: "HT", disabled: false },
- { name: "Heard Island and McDonald Islands", value: "HM", disabled: false },
- { name: "Holy See (Vatican City State)", value: "VA", disabled: false },
- { name: "Honduras", value: "HN", disabled: false },
- { name: "Hong Kong", value: "HK", disabled: false },
- { name: "Hungary", value: "HU", disabled: false },
- { name: "Iceland", value: "IS", disabled: false },
- { name: "Indonesia", value: "ID", disabled: false },
- { name: "Iran, Islamic Republic of", value: "IR", disabled: false },
- { name: "Iraq", value: "IQ", disabled: false },
- { name: "Ireland", value: "IE", disabled: false },
- { name: "Isle of Man", value: "IM", disabled: false },
- { name: "Israel", value: "IL", disabled: false },
- { name: "Italy", value: "IT", disabled: false },
- { name: "Jamaica", value: "JM", disabled: false },
- { name: "Japan", value: "JP", disabled: false },
- { name: "Jersey", value: "JE", disabled: false },
- { name: "Jordan", value: "JO", disabled: false },
- { name: "Kazakhstan", value: "KZ", disabled: false },
- { name: "Kenya", value: "KE", disabled: false },
- { name: "Kiribati", value: "KI", disabled: false },
- { name: "Korea, Democratic People's Republic of", value: "KP", disabled: false },
- { name: "Korea, Republic of", value: "KR", disabled: false },
- { name: "Kuwait", value: "KW", disabled: false },
- { name: "Kyrgyzstan", value: "KG", disabled: false },
- { name: "Lao People's Democratic Republic", value: "LA", disabled: false },
- { name: "Latvia", value: "LV", disabled: false },
- { name: "Lebanon", value: "LB", disabled: false },
- { name: "Lesotho", value: "LS", disabled: false },
- { name: "Liberia", value: "LR", disabled: false },
- { name: "Libya", value: "LY", disabled: false },
- { name: "Liechtenstein", value: "LI", disabled: false },
- { name: "Lithuania", value: "LT", disabled: false },
- { name: "Luxembourg", value: "LU", disabled: false },
- { name: "Macao", value: "MO", disabled: false },
- { name: "Macedonia, the former Yugoslav Republic of", value: "MK", disabled: false },
- { name: "Madagascar", value: "MG", disabled: false },
- { name: "Malawi", value: "MW", disabled: false },
- { name: "Malaysia", value: "MY", disabled: false },
- { name: "Maldives", value: "MV", disabled: false },
- { name: "Mali", value: "ML", disabled: false },
- { name: "Malta", value: "MT", disabled: false },
- { name: "Marshall Islands", value: "MH", disabled: false },
- { name: "Martinique", value: "MQ", disabled: false },
- { name: "Mauritania", value: "MR", disabled: false },
- { name: "Mauritius", value: "MU", disabled: false },
- { name: "Mayotte", value: "YT", disabled: false },
- { name: "Mexico", value: "MX", disabled: false },
- { name: "Micronesia, Federated States of", value: "FM", disabled: false },
- { name: "Moldova, Republic of", value: "MD", disabled: false },
- { name: "Monaco", value: "MC", disabled: false },
- { name: "Mongolia", value: "MN", disabled: false },
- { name: "Montenegro", value: "ME", disabled: false },
- { name: "Montserrat", value: "MS", disabled: false },
- { name: "Morocco", value: "MA", disabled: false },
- { name: "Mozambique", value: "MZ", disabled: false },
- { name: "Myanmar", value: "MM", disabled: false },
- { name: "Namibia", value: "NA", disabled: false },
- { name: "Nauru", value: "NR", disabled: false },
- { name: "Nepal", value: "NP", disabled: false },
- { name: "Netherlands", value: "NL", disabled: false },
- { name: "New Caledonia", value: "NC", disabled: false },
- { name: "New Zealand", value: "NZ", disabled: false },
- { name: "Nicaragua", value: "NI", disabled: false },
- { name: "Niger", value: "NE", disabled: false },
- { name: "Nigeria", value: "NG", disabled: false },
- { name: "Niue", value: "NU", disabled: false },
- { name: "Norfolk Island", value: "NF", disabled: false },
- { name: "Northern Mariana Islands", value: "MP", disabled: false },
- { name: "Norway", value: "NO", disabled: false },
- { name: "Oman", value: "OM", disabled: false },
- { name: "Pakistan", value: "PK", disabled: false },
- { name: "Palau", value: "PW", disabled: false },
- { name: "Palestinian Territory, Occupied", value: "PS", disabled: false },
- { name: "Panama", value: "PA", disabled: false },
- { name: "Papua New Guinea", value: "PG", disabled: false },
- { name: "Paraguay", value: "PY", disabled: false },
- { name: "Peru", value: "PE", disabled: false },
- { name: "Philippines", value: "PH", disabled: false },
- { name: "Pitcairn", value: "PN", disabled: false },
- { name: "Poland", value: "PL", disabled: false },
- { name: "Portugal", value: "PT", disabled: false },
- { name: "Puerto Rico", value: "PR", disabled: false },
- { name: "Qatar", value: "QA", disabled: false },
- { name: "Réunion", value: "RE", disabled: false },
- { name: "Romania", value: "RO", disabled: false },
- { name: "Russian Federation", value: "RU", disabled: false },
- { name: "Rwanda", value: "RW", disabled: false },
- { name: "Saint Barthélemy", value: "BL", disabled: false },
- { name: "Saint Helena, Ascension and Tristan da Cunha", value: "SH", disabled: false },
- { name: "Saint Kitts and Nevis", value: "KN", disabled: false },
- { name: "Saint Lucia", value: "LC", disabled: false },
- { name: "Saint Martin (French part)", value: "MF", disabled: false },
- { name: "Saint Pierre and Miquelon", value: "PM", disabled: false },
- { name: "Saint Vincent and the Grenadines", value: "VC", disabled: false },
- { name: "Samoa", value: "WS", disabled: false },
- { name: "San Marino", value: "SM", disabled: false },
- { name: "Sao Tome and Principe", value: "ST", disabled: false },
- { name: "Saudi Arabia", value: "SA", disabled: false },
- { name: "Senegal", value: "SN", disabled: false },
- { name: "Serbia", value: "RS", disabled: false },
- { name: "Seychelles", value: "SC", disabled: false },
- { name: "Sierra Leone", value: "SL", disabled: false },
- { name: "Singapore", value: "SG", disabled: false },
- { name: "Sint Maarten (Dutch part)", value: "SX", disabled: false },
- { name: "Slovakia", value: "SK", disabled: false },
- { name: "Slovenia", value: "SI", disabled: false },
- { name: "Solomon Islands", value: "SB", disabled: false },
- { name: "Somalia", value: "SO", disabled: false },
- { name: "South Africa", value: "ZA", disabled: false },
- { name: "South Georgia and the South Sandwich Islands", value: "GS", disabled: false },
- { name: "South Sudan", value: "SS", disabled: false },
- { name: "Spain", value: "ES", disabled: false },
- { name: "Sri Lanka", value: "LK", disabled: false },
- { name: "Sudan", value: "SD", disabled: false },
- { name: "Suriname", value: "SR", disabled: false },
- { name: "Svalbard and Jan Mayen", value: "SJ", disabled: false },
- { name: "Swaziland", value: "SZ", disabled: false },
- { name: "Sweden", value: "SE", disabled: false },
- { name: "Switzerland", value: "CH", disabled: false },
- { name: "Syrian Arab Republic", value: "SY", disabled: false },
- { name: "Taiwan", value: "TW", disabled: false },
- { name: "Tajikistan", value: "TJ", disabled: false },
- { name: "Tanzania, United Republic of", value: "TZ", disabled: false },
- { name: "Thailand", value: "TH", disabled: false },
- { name: "Timor-Leste", value: "TL", disabled: false },
- { name: "Togo", value: "TG", disabled: false },
- { name: "Tokelau", value: "TK", disabled: false },
- { name: "Tonga", value: "TO", disabled: false },
- { name: "Trinidad and Tobago", value: "TT", disabled: false },
- { name: "Tunisia", value: "TN", disabled: false },
- { name: "Turkey", value: "TR", disabled: false },
- { name: "Turkmenistan", value: "TM", disabled: false },
- { name: "Turks and Caicos Islands", value: "TC", disabled: false },
- { name: "Tuvalu", value: "TV", disabled: false },
- { name: "Uganda", value: "UG", disabled: false },
- { name: "Ukraine", value: "UA", disabled: false },
- { name: "United Arab Emirates", value: "AE", disabled: false },
- { name: "United States Minor Outlying Islands", value: "UM", disabled: false },
- { name: "Uruguay", value: "UY", disabled: false },
- { name: "Uzbekistan", value: "UZ", disabled: false },
- { name: "Vanuatu", value: "VU", disabled: false },
- { name: "Venezuela, Bolivarian Republic of", value: "VE", disabled: false },
- { name: "Viet Nam", value: "VN", disabled: false },
- { name: "Virgin Islands, British", value: "VG", disabled: false },
- { name: "Virgin Islands, U.S.", value: "VI", disabled: false },
- { name: "Wallis and Futuna", value: "WF", disabled: false },
- { name: "Western Sahara", value: "EH", disabled: false },
- { name: "Yemen", value: "YE", disabled: false },
- { name: "Zambia", value: "ZM", disabled: false },
- { name: "Zimbabwe", value: "ZW", disabled: false },
- ];
- taxRates: TaxRateResponse[];
+ countryList: CountryListItem[] = this.taxService.getCountries();
constructor(
private apiService: ApiService,
private route: ActivatedRoute,
private logService: LogService,
private organizationApiService: OrganizationApiServiceAbstraction,
+ private taxService: TaxServiceAbstraction,
) {}
get country(): string {
- return this.taxFormGroup.get("country").value;
- }
-
- set country(country: string) {
- this.taxFormGroup.get("country").setValue(country);
+ return this.taxFormGroup.controls.country.value;
}
get postalCode(): string {
- return this.taxFormGroup.get("postalCode").value;
- }
-
- set postalCode(postalCode: string) {
- this.taxFormGroup.get("postalCode").setValue(postalCode);
- }
-
- get includeTaxId(): boolean {
- return this.taxFormGroup.get("includeTaxId").value;
- }
-
- set includeTaxId(includeTaxId: boolean) {
- this.taxFormGroup.get("includeTaxId").setValue(includeTaxId);
+ return this.taxFormGroup.controls.postalCode.value;
}
get taxId(): string {
- return this.taxFormGroup.get("taxId").value;
- }
-
- set taxId(taxId: string) {
- this.taxFormGroup.get("taxId").setValue(taxId);
+ return this.taxFormGroup.controls.taxId.value;
}
get line1(): string {
- return this.taxFormGroup.get("line1").value;
- }
-
- set line1(line1: string) {
- this.taxFormGroup.get("line1").setValue(line1);
+ return this.taxFormGroup.controls.line1.value;
}
get line2(): string {
- return this.taxFormGroup.get("line2").value;
- }
-
- set line2(line2: string) {
- this.taxFormGroup.get("line2").setValue(line2);
+ return this.taxFormGroup.controls.line2.value;
}
get city(): string {
- return this.taxFormGroup.get("city").value;
- }
-
- set city(city: string) {
- this.taxFormGroup.get("city").setValue(city);
+ return this.taxFormGroup.controls.city.value;
}
get state(): string {
- return this.taxFormGroup.get("state").value;
+ return this.taxFormGroup.controls.state.value;
}
- set state(state: string) {
- this.taxFormGroup.get("state").setValue(state);
+ get showTaxIdField(): boolean {
+ return !!this.organizationId;
}
async ngOnInit() {
@@ -402,22 +100,13 @@ export class TaxInfoComponent implements OnInit {
try {
const taxInfo = await this.organizationApiService.getTaxInfo(this.organizationId);
if (taxInfo) {
- this.taxId = taxInfo.taxId;
- this.state = taxInfo.state;
- this.line1 = taxInfo.line1;
- this.line2 = taxInfo.line2;
- this.city = taxInfo.city;
- this.state = taxInfo.state;
- this.postalCode = taxInfo.postalCode;
- this.country = taxInfo.country || "US";
- this.includeTaxId =
- this.countrySupportsTax(this.country) &&
- (!!taxInfo.taxId ||
- !!taxInfo.line1 ||
- !!taxInfo.line2 ||
- !!taxInfo.city ||
- !!taxInfo.state);
- this.setTaxInfoObject();
+ this.taxFormGroup.controls.taxId.setValue(taxInfo.taxId);
+ this.taxFormGroup.controls.state.setValue(taxInfo.state);
+ this.taxFormGroup.controls.line1.setValue(taxInfo.line1);
+ this.taxFormGroup.controls.line2.setValue(taxInfo.line2);
+ this.taxFormGroup.controls.city.setValue(taxInfo.city);
+ this.taxFormGroup.controls.postalCode.setValue(taxInfo.postalCode);
+ this.taxFormGroup.controls.country.setValue(taxInfo.country);
}
} catch (e) {
this.logService.error(e);
@@ -426,119 +115,79 @@ export class TaxInfoComponent implements OnInit {
try {
const taxInfo = await this.apiService.getTaxInfo();
if (taxInfo) {
- this.postalCode = taxInfo.postalCode;
- this.country = taxInfo.country || "US";
+ this.taxFormGroup.controls.postalCode.setValue(taxInfo.postalCode);
+ this.taxFormGroup.controls.country.setValue(taxInfo.country);
}
- this.setTaxInfoObject();
} catch (e) {
this.logService.error(e);
}
}
- if (this.country === "US") {
- this.taxFormGroup.get("postalCode").setValidators([Validators.required]);
- this.taxFormGroup.get("postalCode").updateValueAndValidity();
- }
+ this.isTaxSupported = await this.taxService.isCountrySupported(
+ this.taxFormGroup.controls.country.value,
+ );
- if (this.country !== "US") {
- this.onCountryChanged.emit();
- }
+ this.countryChanged.emit();
});
- this.taxFormGroup
- .get("country")
- .valueChanges.pipe(takeUntil(this.destroy$))
+ this.taxFormGroup.controls.country.valueChanges
+ .pipe(debounceTime(1000), takeUntil(this.destroy$))
.subscribe((value) => {
- if (value === "US") {
- this.taxFormGroup.get("postalCode").setValidators([Validators.required]);
- } else {
- this.taxFormGroup.get("postalCode").clearValidators();
- }
- this.taxFormGroup.get("postalCode").updateValueAndValidity();
- this.setTaxInfoObject();
- this.changeCountry();
+ this.taxService
+ .isCountrySupported(this.taxFormGroup.controls.country.value)
+ .then((isSupported) => {
+ this.isTaxSupported = isSupported;
+ })
+ .catch(() => {
+ this.isTaxSupported = false;
+ })
+ .finally(() => {
+ if (!this.isTaxSupported) {
+ this.taxFormGroup.controls.taxId.setValue(null);
+ this.taxFormGroup.controls.line1.setValue(null);
+ this.taxFormGroup.controls.line2.setValue(null);
+ this.taxFormGroup.controls.city.setValue(null);
+ this.taxFormGroup.controls.state.setValue(null);
+ }
+
+ this.countryChanged.emit();
+ });
+ this.taxInformationChanged.emit();
});
- try {
- const taxRates = await this.apiService.getTaxRates();
- if (taxRates) {
- this.taxRates = taxRates.data;
- }
- } catch (e) {
- this.logService.error(e);
- } finally {
- this.loading = false;
- }
+ this.taxFormGroup.controls.postalCode.valueChanges
+ .pipe(debounceTime(1000), takeUntil(this.destroy$))
+ .subscribe(() => {
+ this.taxInformationChanged.emit();
+ });
+
+ this.taxFormGroup.controls.taxId.valueChanges
+ .pipe(debounceTime(1000), takeUntil(this.destroy$))
+ .subscribe(() => {
+ this.taxInformationChanged.emit();
+ });
+
+ this.loading = false;
}
- get taxRate() {
- if (this.taxRates != null) {
- const localTaxRate = this.taxRates.find(
- (x) => x.country === this.country && x.postalCode === this.postalCode,
- );
- return localTaxRate?.rate ?? null;
- }
- }
-
- setTaxInfoObject() {
- this.taxInfo.country = this.country;
- this.taxInfo.postalCode = this.postalCode;
- this.taxInfo.includeTaxId = this.includeTaxId;
- this.taxInfo.taxId = this.taxId;
- this.taxInfo.line1 = this.line1;
- this.taxInfo.line2 = this.line2;
- this.taxInfo.city = this.city;
- this.taxInfo.state = this.state;
- }
-
- get showTaxIdCheckbox() {
- return (
- (this.organizationId || this.providerId) &&
- this.country !== "US" &&
- this.countrySupportsTax(this.taxInfo.country)
- );
- }
-
- get showTaxIdFields() {
- return (
- (this.organizationId || this.providerId) &&
- this.includeTaxId &&
- this.countrySupportsTax(this.country)
- );
- }
-
- getTaxInfoRequest(): TaxInfoUpdateRequest {
- if (this.organizationId || this.providerId) {
- const request = new ExpandedTaxInfoUpdateRequest();
- request.country = this.country;
- request.postalCode = this.postalCode;
-
- if (this.includeTaxId) {
- request.taxId = this.taxId;
- request.line1 = this.line1;
- request.line2 = this.line2;
- request.city = this.city;
- request.state = this.state;
- } else {
- request.taxId = null;
- request.line1 = null;
- request.line2 = null;
- request.city = null;
- request.state = null;
- }
- return request;
- } else {
- const request = new TaxInfoUpdateRequest();
- request.postalCode = this.postalCode;
- request.country = this.country;
- return request;
- }
+ ngOnDestroy() {
+ this.destroy$.next();
+ this.destroy$.complete();
}
submitTaxInfo(): Promise {
this.taxFormGroup.updateValueAndValidity();
this.taxFormGroup.markAllAsTouched();
- const request = this.getTaxInfoRequest();
+
+ const request = new ExpandedTaxInfoUpdateRequest();
+ request.country = this.country;
+ request.postalCode = this.postalCode;
+ request.taxId = this.taxId;
+ request.line1 = this.line1;
+ request.line2 = this.line2;
+ request.city = this.city;
+ request.state = this.state;
+
return this.organizationId
? this.organizationApiService.updateTaxInfo(
this.organizationId,
@@ -546,97 +195,4 @@ export class TaxInfoComponent implements OnInit {
)
: this.apiService.putTaxInfo(request);
}
-
- changeCountry() {
- if (!this.countrySupportsTax(this.country)) {
- this.includeTaxId = false;
- this.taxId = null;
- this.line1 = null;
- this.line2 = null;
- this.city = null;
- this.state = null;
- this.setTaxInfoObject();
- }
- this.onCountryChanged.emit();
- }
-
- countrySupportsTax(countryCode: string) {
- return this.taxSupportedCountryCodes.includes(countryCode);
- }
-
- private taxSupportedCountryCodes: string[] = [
- "CN",
- "FR",
- "DE",
- "CA",
- "GB",
- "AU",
- "IN",
- "AD",
- "AR",
- "AT",
- "BE",
- "BO",
- "BR",
- "BG",
- "CL",
- "CO",
- "CR",
- "HR",
- "CY",
- "CZ",
- "DK",
- "DO",
- "EC",
- "EG",
- "SV",
- "EE",
- "FI",
- "GE",
- "GR",
- "HK",
- "HU",
- "IS",
- "ID",
- "IQ",
- "IE",
- "IL",
- "IT",
- "JP",
- "KE",
- "KR",
- "LV",
- "LI",
- "LT",
- "LU",
- "MY",
- "MT",
- "MX",
- "NL",
- "NZ",
- "NO",
- "PE",
- "PH",
- "PL",
- "PT",
- "RO",
- "RU",
- "SA",
- "RS",
- "SG",
- "SK",
- "SI",
- "ZA",
- "ES",
- "SE",
- "CH",
- "TW",
- "TH",
- "TR",
- "UA",
- "AE",
- "UY",
- "VE",
- "VN",
- ];
}
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 7c338fc6e97..08e08ccad15 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -9275,6 +9275,18 @@
"updatedTaxInformation": {
"message": "Updated tax information"
},
+ "billingInvalidTaxIdError": {
+ "message": "Invalid tax ID, if you believe this is an error please contact support."
+ },
+ "billingTaxIdTypeInferenceError": {
+ "message": "We were unable to validate your tax ID, if you believe this is an error please contact support."
+ },
+ "billingPreviewInvalidTaxIdError": {
+ "message": "Invalid tax ID, if you believe this is an error please contact support."
+ },
+ "billingPreviewInvoiceError": {
+ "message": "An error occurred while previewing the invoice. Please try again later."
+ },
"unverified": {
"message": "Unverified"
},
diff --git a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/risk-insights-report.service.ts b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/risk-insights-report.service.ts
index c5e9e3625de..1a01905ed74 100644
--- a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/risk-insights-report.service.ts
+++ b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/risk-insights-report.service.ts
@@ -291,10 +291,11 @@ export class RiskInsightsReportService {
} as ApplicationHealthReportDetail;
if (isAtRisk) {
- (reportDetail.atRiskPasswordCount = reportDetail.atRiskPasswordCount + 1),
- (reportDetail.atRiskMemberDetails = this.getUniqueMembers(
- reportDetail.atRiskMemberDetails.concat(newUriDetail.cipherMembers),
- ));
+ reportDetail.atRiskPasswordCount = reportDetail.atRiskPasswordCount + 1;
+ reportDetail.atRiskMemberDetails = this.getUniqueMembers(
+ reportDetail.atRiskMemberDetails.concat(newUriDetail.cipherMembers),
+ );
+ reportDetail.atRiskMemberCount += reportDetail.atRiskMemberDetails.length;
}
reportDetail.memberCount = reportDetail.memberDetails.length;
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
index 33a20444c2b..74aa468c42e 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
@@ -29,7 +29,7 @@