[AC-1863] Send initiationPath on organization or user signup (#7747)

* Sent initiation path for organization and user signups * Rename organizationQueryParameter > organizationTypeQueryParameter * Jared's feedback * Split PM & SM initiation path
bitwarden · Feb 26, 2024 · f53af7c · f53af7c
1 parent 4cf911a
commit f53af7c
Show file tree

Hide file tree

Showing 20 changed files with 366 additions and 350 deletions.
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
@@ -70,7 +70,6 @@ export class RegisterFormComponent extends BaseRegisterComponent {
   async ngOnInit() {
     await super.ngOnInit();
     this.referenceData = this.referenceDataValue;
-
     if (this.queryParamEmail) {
       this.formGroup.get("email")?.setValue(this.queryParamEmail);
     }

diff --git a/...app/auth/trial-initiation/secrets-manager/secrets-manager-trial-billing-step.component.ts b/...app/auth/trial-initiation/secrets-manager/secrets-manager-trial-billing-step.component.ts
diff --git a/...p/auth/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.html b/...p/auth/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.html
@@ -5,7 +5,11 @@
     [subLabel]="subLabels.createAccount"
     [addSubLabelSpacing]="true"
   >
-    <app-register-form [isInTrialFlow]="true" (createdAccount)="accountCreated($event)">
+    <app-register-form
+      [referenceDataValue]="referenceEventRequest"
+      [isInTrialFlow]="true"
+      (createdAccount)="accountCreated($event)"
+    >
     </app-register-form>
   </app-vertical-step>
   <app-vertical-step

diff --git a/...app/auth/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.ts b/...app/auth/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.ts
@@ -1,9 +1,10 @@
-import { Component, ViewChild } from "@angular/core";
+import { Component, OnInit, ViewChild } from "@angular/core";
 import { UntypedFormBuilder, Validators } from "@angular/forms";
 import { Router } from "@angular/router";
 
 import { OrganizationBillingServiceAbstraction as OrganizationBillingService } from "@bitwarden/common/billing/abstractions/organization-billing.service";
 import { PlanType } from "@bitwarden/common/billing/enums";
+import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
 import { VerticalStepperComponent } from "../../trial-initiation/vertical-stepper/vertical-stepper.component";
@@ -12,7 +13,7 @@ import { VerticalStepperComponent } from "../../trial-initiation/vertical-steppe
   selector: "app-secrets-manager-trial-free-stepper",
   templateUrl: "secrets-manager-trial-free-stepper.component.html",
 })
-export class SecretsManagerTrialFreeStepperComponent {
+export class SecretsManagerTrialFreeStepperComponent implements OnInit {
   @ViewChild("stepper", { static: false }) verticalStepper: VerticalStepperComponent;
 
   formGroup = this.formBuilder.group({
@@ -39,13 +40,20 @@ export class SecretsManagerTrialFreeStepperComponent {
 
   organizationId: string;
 
+  referenceEventRequest: ReferenceEventRequest;
+
   constructor(
     protected formBuilder: UntypedFormBuilder,
     protected i18nService: I18nService,
     protected organizationBillingService: OrganizationBillingService,
     private router: Router,
   ) {}
 
+  ngOnInit(): void {
+    this.referenceEventRequest = new ReferenceEventRequest();
+    this.referenceEventRequest.initiationPath = "Secrets Manager trial from marketing website";
+  }
+
   accountCreated(email: string): void {
     this.formGroup.get("email")?.setValue(email);
     this.subLabels.createAccount = email;

diff --git a/...p/auth/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html b/...p/auth/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html
@@ -5,7 +5,11 @@
     [subLabel]="createAccountLabel"
     [addSubLabelSpacing]="true"
   >
-    <app-register-form [isInTrialFlow]="true" (createdAccount)="accountCreated($event)">
+    <app-register-form
+      [referenceDataValue]="referenceEventRequest"
+      [isInTrialFlow]="true"
+      (createdAccount)="accountCreated($event)"
+    >
     </app-register-form>
   </app-vertical-step>
   <app-vertical-step
@@ -24,21 +28,22 @@
     </button>
   </app-vertical-step>
   <app-vertical-step label="{{ 'billing' | i18n | titlecase }}" [subLabel]="billingSubLabel">
-    <app-secrets-manager-trial-billing-step
+    <app-trial-billing-step
       *ngIf="stepper.selectedIndex === 2"
       [organizationInfo]="{
         name: formGroup.get('name').value,
-        email: formGroup.get('email').value
+        email: formGroup.get('email').value,
+        type: productType
       }"
-      [subscriptionType]="paidSubscriptionType"
+      [subscriptionProduct]="SubscriptionProduct.SecretsManager"
       (steppedBack)="steppedBack()"
       (organizationCreated)="organizationCreated($event)"
-    ></app-secrets-manager-trial-billing-step>
+    ></app-trial-billing-step>
   </app-vertical-step>
   <app-vertical-step label="{{ 'confirmationDetails' | i18n | titlecase }}">
     <app-trial-confirmation-details
       [email]="formGroup.get('email').value"
-      [orgLabel]="subscriptionType"
+      [orgLabel]="organizationTypeQueryParameter"
     ></app-trial-confirmation-details>
     <div class="tw-mb-3 tw-flex">
       <button type="button" bitButton buttonType="primary" (click)="navigateTo('vault')">

diff --git a/...app/auth/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.ts b/...app/auth/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.ts
@@ -1,20 +1,22 @@
 import { Component, Input, ViewChild } from "@angular/core";
 
-import { VerticalStepperComponent } from "../../trial-initiation/vertical-stepper/vertical-stepper.component";
-import { SecretsManagerTrialFreeStepperComponent } from "../secrets-manager/secrets-manager-trial-free-stepper.component";
+import { ProductType } from "@bitwarden/common/enums";
 
 import {
   OrganizationCreatedEvent,
-  SubscriptionType,
-} from "./secrets-manager-trial-billing-step.component";
+  SubscriptionProduct,
+  TrialOrganizationType,
+} 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";
 
 @Component({
   selector: "app-secrets-manager-trial-paid-stepper",
   templateUrl: "secrets-manager-trial-paid-stepper.component.html",
 })
 export class SecretsManagerTrialPaidStepperComponent extends SecretsManagerTrialFreeStepperComponent {
   @ViewChild("stepper", { static: false }) verticalStepper: VerticalStepperComponent;
-  @Input() subscriptionType: string;
+  @Input() organizationTypeQueryParameter: string;
 
   billingSubLabel = this.i18nService.t("billingTrialSubLabel");
   organizationId: string;
@@ -31,16 +33,24 @@ export class SecretsManagerTrialPaidStepperComponent extends SecretsManagerTrial
 
   get createAccountLabel() {
     const organizationType =
-      this.paidSubscriptionType == SubscriptionType.Enterprise ? "Enterprise" : "Teams";
+      this.productType === ProductType.TeamsStarter
+        ? "Teams Starter"
+        : ProductType[this.productType];
     return `Before creating your ${organizationType} organization, you first need to log in or create a personal account.`;
   }
 
-  get paidSubscriptionType() {
-    switch (this.subscriptionType) {
+  get productType(): TrialOrganizationType {
+    switch (this.organizationTypeQueryParameter) {
       case "enterprise":
-        return SubscriptionType.Enterprise;
+        return ProductType.Enterprise;
+      case "families":
+        return ProductType.Families;
       case "teams":
-        return SubscriptionType.Teams;
+        return ProductType.Teams;
+      case "teamsStarter":
+        return ProductType.TeamsStarter;
     }
   }
+
+  protected readonly SubscriptionProduct = SubscriptionProduct;
 }
diff --git a/apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial.component.html b/apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial.component.html
@@ -21,7 +21,10 @@
             class="tw-flex tw-h-auto tw-w-full tw-gap-5 tw-rounded-t tw-bg-secondary-100"
           >
             <h2 class="tw-pb-4 tw-pl-4 tw-pt-5 tw-text-base tw-font-bold tw-uppercase">
-              {{ "startYour7DayFreeTrialOfBitwardenSecretsManagerFor" | i18n: subscriptionType }}
+              {{
+                "startYour7DayFreeTrialOfBitwardenSecretsManagerFor"
+                  | i18n: organizationTypeQueryParameter
+              }}
             </h2>
             <environment-selector
               class="tw-mr-4 tw-mt-6 tw-flex-shrink-0 tw-text-end"
@@ -32,7 +35,7 @@ <h2 class="tw-pb-4 tw-pl-4 tw-pt-5 tw-text-base tw-font-bold tw-uppercase">
           ></app-secrets-manager-trial-free-stepper>
           <app-secrets-manager-trial-paid-stepper
             *ngIf="!freeOrganization"
-            [subscriptionType]="subscriptionType"
+            [organizationTypeQueryParameter]="organizationTypeQueryParameter"
           ></app-secrets-manager-trial-paid-stepper>
         </div>
       </div>

diff --git a/apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial.component.ts b/apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial.component.ts
@@ -7,15 +7,15 @@ import { Subject, takeUntil } from "rxjs";
   templateUrl: "secrets-manager-trial.component.html",
 })
 export class SecretsManagerTrialComponent implements OnInit, OnDestroy {
-  subscriptionType: string;
+  organizationTypeQueryParameter: string;
 
   private destroy$ = new Subject<void>();
 
   constructor(private route: ActivatedRoute) {}
 
   ngOnInit(): void {
     this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe((queryParameters) => {
-      this.subscriptionType = queryParameters.org;
+      this.organizationTypeQueryParameter = queryParameters.org;
     });
   }
 
@@ -25,6 +25,6 @@ export class SecretsManagerTrialComponent implements OnInit, OnDestroy {
   }
 
   get freeOrganization() {
-    return this.subscriptionType === "free";
+    return this.organizationTypeQueryParameter === "free";
   }
 }