Revert "[PM-5718] Fix free organization generating TOTP (#11918)" (#13357)

This reverts commit 459fb1bcf4.

Co-authored-by: SmithThe4th <gsmithwalter@gmail.com>

apps/desktop/src/app/app.component.ts

@@ -318,20 +318,6 @@ export class AppComponent implements OnInit, OnDestroy {
             }
             break;
           }
-          case "upgradeOrganization": {
-            const upgradeConfirmed = await this.dialogService.openSimpleDialog({
-              title: { key: "upgradeOrganization" },
-              content: { key: "upgradeOrganizationDesc" },
-              acceptButtonText: { key: "learnMore" },
-              type: "info",
-            });
-            if (upgradeConfirmed) {
-              this.platformUtilsService.launchUri(
-                "https://bitwarden.com/help/upgrade-from-individual-to-org/",
-              );
-            }
-            break;
-          }
           case "emailVerificationRequired": {
             const emailVerificationConfirmed = await this.dialogService.openSimpleDialog({
               title: { key: "emailVerificationRequired" },

apps/desktop/src/locales/en/messages.json

@@ -3502,15 +3502,6 @@
   "allowScreenshotsDesc": {
     "message": "Allow the Bitwarden desktop application to be captured in screenshots and viewed in remote desktop sessions. Disabling this will prevent access on some external displays."
   },
-  "organizationUpgradeRequired": {
-    "message": "Organization upgrade required"
-  },
-  "upgradeOrganization": {
-    "message": "Upgrade organization"
-  },
-  "upgradeOrganizationDesc": {
-    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
-  },
   "confirmWindowStillVisibleTitle": {
     "message": "Confirm window still visible"
   },

apps/desktop/src/vault/app/vault/view.component.html

@@ -186,16 +186,6 @@
               </span>
             </div>
           </div>
-          <div class="box-content-row box-content-row-flex totp" *ngIf="showUpgradeRequiredTotp">
-            <div class="row-main">
-              <span class="row-label">{{ "verificationCodeTotp" | i18n }}</span>
-              <span class="row-label">
-                <a [routerLink]="" (click)="upgradeOrganization()"
-                  >{{ "organizationUpgradeRequired" | i18n }}
-                </a>
-              </span>
-            </div>
-          </div>
         </div>
         <!-- Card -->
         <div *ngIf="cipher.card">

apps/desktop/src/vault/app/vault/view.component.ts

@@ -159,10 +159,4 @@ export class ViewComponent extends BaseViewComponent implements OnInit, OnDestro
       this.messagingService.send("premiumRequired");
     }
   }
-
-  upgradeOrganization() {
-    this.messagingService.send("upgradeOrganization", {
-      organizationId: this.cipher.organizationId,
-    });
-  }
 }

apps/web/src/app/vault/individual-vault/add-edit.component.ts

@@ -66,7 +66,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit, On
     protected messagingService: MessagingService,
     eventCollectionService: EventCollectionService,
     protected policyService: PolicyService,
-    protected organizationService: OrganizationService,
+    organizationService: OrganizationService,
     logService: LogService,
     passwordRepromptService: PasswordRepromptService,
     dialogService: DialogService,
@@ -303,8 +303,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit, On
       this.cipher.type === CipherType.Login &&
       this.cipher.login.totp &&
       this.organization?.productTierType != ProductTierType.Free &&
-      ((this.canAccessPremium && this.cipher.organizationId == null) ||
-        this.cipher.organizationUseTotp)
+      (this.cipher.organizationUseTotp || this.canAccessPremium)
     );
   }