Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-21 16:18:28 +01:00
Code Issues Projects Releases Wiki Activity

[AC-1753] Automatically assign provider's pricing to new organizations (#7228)

Browse Source 
* changes for the msp task

* fix an issues

* resolve pr comment
This commit is contained in:
cyprain-okeke 2023-12-20 22:55:30 +01:00 committed by GitHub
parent c1d856430a
commit de04bc4410
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
apps/web/src/app/billing/organizations/organization-plans.component.ts
View File

@ -21,6 +21,7 @@ import { OrganizationCreateRequest } from "@bitwarden/common/admin-console/model
import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request";
import { OrganizationUpgradeRequest } from "@bitwarden/common/admin-console/models/request/organization-upgrade.request";
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 { PaymentMethodType, PlanType } from "@bitwarden/common/billing/enums";
import { PaymentRequest } from "@bitwarden/common/billing/models/request/payment.request";
import { BillingResponse } from "@bitwarden/common/billing/models/response/billing.response";
@ -47,6 +48,13 @@ interface OnSuccessArgs {
organizationId: string;
}
const Allowed2020PlanTypes = [
PlanType.TeamsMonthly2020,
PlanType.TeamsAnnually2020,
PlanType.EnterpriseAnnually2020,
PlanType.EnterpriseMonthly2020,
];
@Component({
selector: "app-organization-plans",
templateUrl: "organization-plans.component.html",
@ -119,6 +127,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
secretsManagerPlans: PlanResponse[];
organization: Organization;
billing: BillingResponse;
provider: ProviderResponse;
private destroy$ = new Subject<void>();
@ -153,6 +162,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
if (this.hasProvider) {
this.formGroup.controls.businessOwned.setValue(true);
this.changedOwnedBusiness();
this.provider = await this.apiService.getProvider(this.providerId);
}
if (!this.createOrganization) {
@ -214,6 +224,17 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
return this.selectedPlan.isAnnual ? "year" : "month";
}
isProviderQualifiedFor2020Plan() {
const targetDate = new Date("2023-11-06");
if (!this.provider || !this.provider.creationDate) {
return false;
}
const creationDate = new Date(this.provider.creationDate);
return creationDate < targetDate;
}
get selectableProducts() {
if (this.acceptingSponsorship) {
const familyPlan = this.passwordManagerPlans.find(
@ -230,14 +251,15 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
plan.type !== PlanType.Custom &&
(!businessOwnedIsChecked || plan.canBeUsedByBusiness) &&
(this.showFree || plan.product !== ProductType.Free) &&
this.planIsEnabled(plan) &&
(plan.isAnnual ||
plan.product === ProductType.Free ||
plan.product === ProductType.TeamsStarter) &&
(this.currentProductType !== ProductType.TeamsStarter ||
plan.product === ProductType.Teams ||
plan.product === ProductType.Enterprise) &&
(!this.providerId || plan.product !== ProductType.TeamsStarter),
(!this.providerId || plan.product !== ProductType.TeamsStarter) &&
((!this.isProviderQualifiedFor2020Plan() && this.planIsEnabled(plan)) ||
(this.isProviderQualifiedFor2020Plan() && Allowed2020PlanTypes.includes(plan.type))),
);
result.sort((planA, planB) => planA.displaySortOrder - planB.displaySortOrder);
@ -247,9 +269,16 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
get selectablePlans() {
const selectedProductType = this.formGroup.controls.product.value;
const result = this.passwordManagerPlans?.filter(
(plan) => this.planIsEnabled(plan) && plan.product === selectedProductType,
);
const result = this.passwordManagerPlans?.filter((plan) => {
const productMatch = plan.product === selectedProductType;
return (
(!this.isProviderQualifiedFor2020Plan() && this.planIsEnabled(plan) && productMatch) ||
(this.isProviderQualifiedFor2020Plan() &&
Allowed2020PlanTypes.includes(plan.type) &&
productMatch)
);
});
result.sort((planA, planB) => planA.displaySortOrder - planB.displaySortOrder);
return result;

2
libs/common/src/admin-console/models/response/provider/provider.response.ts
View File

@ -5,6 +5,7 @@ export class ProviderResponse extends BaseResponse {
name: string;
businessName: string;
billingEmail: string;
creationDate: Date;
constructor(response: any) {
super(response);
@ -12,5 +13,6 @@ export class ProviderResponse extends BaseResponse {
this.name = this.getResponseProperty("Name");
this.businessName = this.getResponseProperty("BusinessName");
this.billingEmail = this.getResponseProperty("BillingEmail");
this.creationDate = this.getResponseProperty("CreationDate");
}
}