From 92ec2ca85ed9536bb5fc980ed321e5dd7e7ed96c Mon Sep 17 00:00:00 2001
From: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com>
Date: Fri, 21 Feb 2025 21:36:57 +0100
Subject: [PATCH] [PM-17591]Remove feature flag "Refactor self hosting license
 uploader" (#13330)

* Remove the Refactor self hosting license uploader flag

* Remove the changes when is flag is off
---
 .../individual/premium/premium.component.html | 30 -------------------
 .../individual/premium/premium.component.ts   |  5 ----
 .../organization-plans.component.html         | 29 ------------------
 .../organization-plans.component.ts           |  5 ----
 libs/common/src/enums/feature-flag.enum.ts    |  2 --
 5 files changed, 71 deletions(-)

diff --git a/apps/web/src/app/billing/individual/premium/premium.component.html b/apps/web/src/app/billing/individual/premium/premium.component.html
index acf24ed2a34..6a212ef9d7c 100644
--- a/apps/web/src/app/billing/individual/premium/premium.component.html
+++ b/apps/web/src/app/billing/individual/premium/premium.component.html
@@ -66,37 +66,7 @@
   </bit-callout>
 </bit-section>
 <bit-section *ngIf="isSelfHost">
-  <ng-container *ngIf="!(useLicenseUploaderComponent$ | async)">
-    <p bitTypography="body1">{{ "uploadLicenseFilePremium" | i18n }}</p>
-    <form [formGroup]="licenseFormGroup" [bitSubmit]="submitPremiumLicense">
-      <bit-form-field>
-        <bit-label>{{ "licenseFile" | i18n }}</bit-label>
-        <div>
-          <button type="button" bitButton buttonType="secondary" (click)="fileSelector.click()">
-            {{ "chooseFile" | i18n }}
-          </button>
-          {{
-            licenseFormGroup.value.file ? licenseFormGroup.value.file.name : ("noFileChosen" | i18n)
-          }}
-        </div>
-        <input
-          bitInput
-          #fileSelector
-          type="file"
-          formControlName="file"
-          (change)="onLicenseFileSelected($event)"
-          hidden
-          class="tw-hidden"
-        />
-        <bit-hint>{{ "licenseFileDesc" | i18n: "bitwarden_premium_license.json" }}</bit-hint>
-      </bit-form-field>
-      <button type="submit" buttonType="primary" bitButton bitFormButton>
-        {{ "submit" | i18n }}
-      </button>
-    </form>
-  </ng-container>
   <individual-self-hosting-license-uploader
-    *ngIf="useLicenseUploaderComponent$ | async"
     (onLicenseFileUploaded)="onLicenseFileSelectedChanged()"
   />
 </bit-section>
diff --git a/apps/web/src/app/billing/individual/premium/premium.component.ts b/apps/web/src/app/billing/individual/premium/premium.component.ts
index ec19eb02594..2934e69f0ad 100644
--- a/apps/web/src/app/billing/individual/premium/premium.component.ts
+++ b/apps/web/src/app/billing/individual/premium/premium.component.ts
@@ -13,7 +13,6 @@ import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
 import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
 import { PreviewIndividualInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-individual-invoice.request";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -44,10 +43,6 @@ export class PremiumComponent {
   protected cloudWebVaultURL: string;
   protected isSelfHost = false;
 
-  protected useLicenseUploaderComponent$ = this.configService.getFeatureFlag$(
-    FeatureFlag.PM11901_RefactorSelfHostingLicenseUploader,
-  );
-
   protected estimatedTax: number = 0;
   protected readonly familyPlanMaxUserCount = 6;
   protected readonly premiumPrice = 10;
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 0a4eea57f92..263ef12ebea 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.html
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.html
@@ -7,36 +7,7 @@
   <span class="tw-sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container *ngIf="createOrganization && selfHosted">
-  <ng-container *ngIf="!(useLicenseUploaderComponent$ | async)">
-    <p bitTypography="body1">{{ "uploadLicenseFileOrg" | i18n }}</p>
-    <form [formGroup]="selfHostedForm" [bitSubmit]="submit">
-      <bit-form-field>
-        <bit-label>{{ "licenseFile" | i18n }}</bit-label>
-        <div class="tw-pt-2 tw-pb-1">
-          <button bitButton type="button" buttonType="secondary" (click)="fileSelector.click()">
-            {{ "chooseFile" | i18n }}
-          </button>
-          {{ selectedFile?.name ?? ("noFileChosen" | i18n) }}
-        </div>
-        <input
-          #fileSelector
-          bitInput
-          type="file"
-          formControlName="file"
-          (change)="setSelectedFile($event)"
-          accept="application/JSON"
-          hidden
-          class="tw-hidden"
-        />
-        <bit-hint>{{ "licenseFileDesc" | i18n: "bitwarden_organization_license.json" }}</bit-hint>
-      </bit-form-field>
-      <button type="submit" bitButton bitFormButton buttonType="primary">
-        {{ "submit" | i18n }}
-      </button>
-    </form>
-  </ng-container>
   <organization-self-hosting-license-uploader
-    *ngIf="useLicenseUploaderComponent$ | async"
     (onLicenseFileUploaded)="onLicenseFileUploaded($event)"
   />
 </ng-container>
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 f9f5b763a4e..84f2467b1bd 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts
@@ -41,7 +41,6 @@ import { UpdatePaymentMethodRequest } from "@bitwarden/common/billing/models/req
 import { BillingResponse } from "@bitwarden/common/billing/models/response/billing.response";
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
 import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -127,10 +126,6 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
   isInTrialFlow = false;
   discount = 0;
 
-  protected useLicenseUploaderComponent$ = this.configService.getFeatureFlag$(
-    FeatureFlag.PM11901_RefactorSelfHostingLicenseUploader,
-  );
-
   secretsManagerSubscription = secretsManagerSubscribeFormFactory(this.formBuilder);
 
   selfHostedForm = this.formBuilder.group({
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index 75346c0edb8..985d1453090 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -38,7 +38,6 @@ export enum FeatureFlag {
   SSHKeyVaultItem = "ssh-key-vault-item",
   SSHAgent = "ssh-agent",
   CipherKeyEncryption = "cipher-key-encryption",
-  PM11901_RefactorSelfHostingLicenseUploader = "PM-11901-refactor-self-hosting-license-uploader",
   TrialPaymentOptional = "PM-8163-trial-payment",
   SecurityTasks = "security-tasks",
   NewDeviceVerificationTemporaryDismiss = "new-device-temporary-dismiss",
@@ -99,7 +98,6 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.SSHKeyVaultItem]: FALSE,
   [FeatureFlag.SSHAgent]: FALSE,
   [FeatureFlag.CipherKeyEncryption]: FALSE,
-  [FeatureFlag.PM11901_RefactorSelfHostingLicenseUploader]: FALSE,
   [FeatureFlag.TrialPaymentOptional]: FALSE,
   [FeatureFlag.SecurityTasks]: FALSE,
   [FeatureFlag.NewDeviceVerificationTemporaryDismiss]: FALSE,