SM-904: Remove SecretsManagerBeta (Phase 2) (#6891)

* SM-904: Remove SecretsManagerBeta

* SM-904: Remove additional places sm beta is used

* SM-904: Remove unused SM Beta messages

apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html

@@ -85,32 +85,13 @@
               <td bitCell>{{ "passwordManager" | i18n }} - {{ "freeOrganization" | i18n }}</td>
               <td bitCell class="tw-text-right">{{ "free" | i18n }}</td>
             </tr>
-            <tr bitRow *ngIf="userOrg.useSecretsManager && !sub.secretsManagerBeta">
+            <tr bitRow *ngIf="userOrg.useSecretsManager">
               <td bitCell>{{ "secretsManager" | i18n }} - {{ "freeOrganization" | i18n }}</td>
               <td bitCell class="tw-text-right">{{ "free" | i18n }}</td>
             </tr>
           </ng-container>
-          <tr bitRow *ngIf="sub.secretsManagerBeta">
-            <td bitCell>
-              {{ "secretsManager" | i18n }} -
-              {{ "beta" | i18n }}
-              ({{ "annually" | i18n }}) @
-              {{ 0 | currency: "$" }}
-              <span bitBadge variant="warning" class="tw-ml-2">{{
-                "betaEnding" | i18n | uppercase
-              }}</span>
-            </td>
-            <td bitCell class="tw-text-right">{{ 0 | currency: "$" }} /{{ "year" | i18n }}</td>
-          </tr>
         </ng-template>
       </bit-table>
-      <bit-callout
-        *ngIf="sub.secretsManagerBeta && !userOrg.isFreeOrg"
-        type="warning"
-        class="tw-mt-4 tw-block"
-      >
-        {{ smBetaEndedDesc }}
-      </bit-callout>
     </div>
   </ng-container>
 

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<void>();
@@ -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;

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"
   },

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");
   }
 }