diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html index 1be65b36f4..d497878794 100644 --- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html +++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html @@ -85,32 +85,13 @@ {{ "passwordManager" | i18n }} - {{ "freeOrganization" | i18n }} {{ "free" | i18n }} - + {{ "secretsManager" | i18n }} - {{ "freeOrganization" | i18n }} {{ "free" | i18n }} - - - {{ "secretsManager" | i18n }} - - {{ "beta" | i18n }} - ({{ "annually" | i18n }}) @ - {{ 0 | currency: "$" }} - {{ - "betaEnding" | i18n | uppercase - }} - - {{ 0 | currency: "$" }} /{{ "year" | i18n }} - - - {{ smBetaEndedDesc }} - diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts index ad9c20bef8..d2f0fb2224 100644 --- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts +++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts @@ -1,4 +1,3 @@ -import { DatePipe } from "@angular/common"; import { Component, OnDestroy, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { concatMap, firstValueFrom, Subject, takeUntil } from "rxjs"; @@ -15,7 +14,6 @@ import { ProductType } from "@bitwarden/common/enums"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { Utils } from "@bitwarden/common/platform/misc/utils"; import { DialogService } from "@bitwarden/components"; import { BillingSyncApiKeyComponent } from "./billing-sync-api-key.component"; @@ -41,9 +39,6 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy firstLoaded = false; loading: boolean; - private readonly _smBetaEndingDate = new Date(2023, 7, 15); - private readonly _smGracePeriodEndingDate = new Date(2023, 10, 14); - protected readonly teamsStarter = ProductType.TeamsStarter; private destroy$ = new Subject(); @@ -57,7 +52,6 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy private organizationApiService: OrganizationApiServiceAbstraction, private route: ActivatedRoute, private dialogService: DialogService, - private datePipe: DatePipe, ) {} async ngOnInit() { @@ -126,7 +120,6 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy this.userOrg.useSecretsManager && this.subscription != null && this.sub.plan?.SecretsManager?.hasAdditionalSeatsOption && - !this.sub.secretsManagerBeta && !this.subscription.cancelled && !this.subscriptionMarkedForCancel; @@ -275,14 +268,6 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy ); } - get smBetaEndedDesc() { - return this.i18nService.translate( - "smBetaEndedDesc", - this.datePipe.transform(this._smBetaEndingDate), - Utils.daysRemaining(this._smGracePeriodEndingDate).toString(), - ); - } - cancel = async () => { if (this.loading) { return; diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index 419dcb605d..756b6afde3 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -6859,9 +6859,6 @@ "secretsManager": { "message": "Secrets Manager" }, - "secretsManagerBeta": { - "message": "Secrets Manager Beta" - }, "secretsManagerAccessDescription": { "message": "Activate user access to Secrets Manager." }, @@ -6965,12 +6962,6 @@ "selectionIsRequired": { "message": "Selection is required." }, - "secretsManagerSubscriptionDesc": { - "message": "Turn on organization access to the Secrets Manager at no charge during the Beta program. Users can be granted access to the Beta in Members." - }, - "secretsManagerEnable": { - "message": "Enable Secrets Manager Beta" - }, "saPeopleWarningTitle": { "message": "Access tokens still available" }, @@ -7413,22 +7404,6 @@ "loggedInExclamation": { "message": "Logged in!" }, - "smBetaEndedDesc": { - "message": "The Secrets Manager Beta ended $BETA_ENDING_DATE$. You have $DAYS$ days left to add Secrets Manager to your paid subscription and maintain access to Secrets Manager data. Contact Customer Success to add Secrets Manager to your subscription.", - "placeholders": { - "beta_ending_date": { - "content": "$1", - "example": "August 1, 2023" - }, - "days": { - "content": "$2", - "example": "11" - } - } - }, - "betaEnding": { - "message": "Beta Ending" - }, "beta": { "message": "Beta" }, diff --git a/libs/common/src/billing/models/response/organization-subscription.response.ts b/libs/common/src/billing/models/response/organization-subscription.response.ts index c3704f6023..101eacef6d 100644 --- a/libs/common/src/billing/models/response/organization-subscription.response.ts +++ b/libs/common/src/billing/models/response/organization-subscription.response.ts @@ -14,7 +14,6 @@ export class OrganizationSubscriptionResponse extends OrganizationResponse { customerDiscount: BillingCustomerDiscount; expiration: string; expirationWithoutGracePeriod: string; - secretsManagerBeta: boolean; constructor(response: any) { super(response); @@ -32,7 +31,6 @@ export class OrganizationSubscriptionResponse extends OrganizationResponse { customerDiscount == null ? null : new BillingCustomerDiscount(customerDiscount); this.expiration = this.getResponseProperty("Expiration"); this.expirationWithoutGracePeriod = this.getResponseProperty("ExpirationWithoutGracePeriod"); - this.secretsManagerBeta = this.getResponseProperty("SecretsManagerBeta"); } }