Merge branch 'main' into km/pm-17668/move-devicetrustservice-to-km

bitwarden · Feb 4, 2025 · 3c59172 · 3c59172
2 parents 4f2455e + aeb4e21
commit 3c59172
Show file tree

Hide file tree

Showing 25 changed files with 357 additions and 1,173 deletions.
diff --git a/apps/desktop/resources/entitlements.mas.plist b/apps/desktop/resources/entitlements.mas.plist
@@ -16,6 +16,8 @@
 	<true/>
 	<key>com.apple.security.files.user-selected.read-write</key>
 	<true/>
+	<key>com.apple.security.device.usb</key>
+	<true/>
 	<!--
 	<key>com.apple.developer.authentication-services.autofill-credential-provider</key>
 	<true/>

diff --git a/apps/web/src/app/auth/register-form/register-form.component.html b/apps/web/src/app/auth/register-form/register-form.component.html
diff --git a/apps/web/src/app/auth/register-form/register-form.component.ts b/apps/web/src/app/auth/register-form/register-form.component.ts
diff --git a/apps/web/src/app/auth/register-form/register-form.module.ts b/apps/web/src/app/auth/register-form/register-form.module.ts
diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
@@ -118,7 +118,13 @@
                         ) | currency: "$"
                       }}
                     </b>
-                    <span class="tw-text-xs tw-px-0"> /{{ "monthPerMember" | i18n }}</span>
+                    <span class="tw-text-xs tw-px-0">
+                      /{{
+                        selectableProduct.productTier === productTypes.Families
+                          ? "month"
+                          : ("monthPerMember" | i18n)
+                      }}</span
+                    >
                     <b class="tw-text-sm tw-font-semibold">
                       <ng-container
                         *ngIf="selectableProduct.PasswordManager.hasAdditionalSeatsOption"

diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.html b/apps/web/src/app/billing/organizations/organization-plans.component.html
@@ -433,7 +433,11 @@ <h2 bitTypography="h2">
     <p class="tw-text-muted tw-italic tw-mb-3 tw-block" bitTypography="body2">
       {{ paymentDesc }}
     </p>
-    <app-payment *ngIf="createOrganization || upgradeRequiresPaymentMethod"></app-payment>
+    <app-payment
+      *ngIf="createOrganization || upgradeRequiresPaymentMethod"
+      [showAccountCredit]="false"
+    >
+    </app-payment>
     <app-manage-tax-information
       class="tw-my-4"
       [showTaxIdField]="showTaxIdField"

diff --git a/...illing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.html b/...illing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.html
@@ -1,17 +1,4 @@
 <app-vertical-stepper #stepper linear>
-  <app-vertical-step
-    label="{{ 'createAccount' | i18n | titlecase }}"
-    [editable]="false"
-    [subLabel]="subLabels.createAccount"
-    [addSubLabelSpacing]="true"
-  >
-    <app-register-form
-      [referenceDataValue]="referenceEventRequest"
-      [isInTrialFlow]="true"
-      (createdAccount)="accountCreated($event)"
-    >
-    </app-register-form>
-  </app-vertical-step>
   <app-vertical-step
     label="{{ 'organizationInformation' | i18n | titlecase }}"
     [subLabel]="subLabels.organizationInfo"

diff --git a/...illing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html b/...illing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html
@@ -1,17 +1,4 @@
 <app-vertical-stepper #stepper linear>
-  <app-vertical-step
-    label="{{ 'createAccount' | i18n | titlecase }}"
-    [editable]="false"
-    [subLabel]="createAccountLabel"
-    [addSubLabelSpacing]="true"
-  >
-    <app-register-form
-      [referenceDataValue]="referenceEventRequest"
-      [isInTrialFlow]="true"
-      (createdAccount)="accountCreated($event)"
-    >
-    </app-register-form>
-  </app-vertical-step>
   <app-vertical-step
     label="{{ 'organizationInformation' | i18n | titlecase }}"
     [subLabel]="subLabels.organizationInfo"

diff --git a/.../billing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.ts b/.../billing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.ts
@@ -19,7 +19,16 @@ import {
 } from "../../../billing/accounts/trial-initiation/trial-billing-step.component";
 import { VerticalStepperComponent } from "../../trial-initiation/vertical-stepper/vertical-stepper.component";
 import { SecretsManagerTrialFreeStepperComponent } from "../secrets-manager/secrets-manager-trial-free-stepper.component";
-import { ValidOrgParams } from "../trial-initiation.component";
+
+export enum ValidOrgParams {
+  families = "families",
+  enterprise = "enterprise",
+  teams = "teams",
+  teamsStarter = "teamsStarter",
+  individual = "individual",
+  premium = "premium",
+  free = "free",
+}
 
 const trialFlowOrgs = [
   ValidOrgParams.teams,
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,8 @@ @@
     	<true/>
     	<key>com.apple.security.files.user-selected.read-write</key>
     	<true/>
+    	<key>com.apple.security.device.usb</key>
+    	<true/>
     	<!--
     	<key>com.apple.developer.authentication-services.autofill-credential-provider</key>
     	<true/>
@@ Expand Down @@