Merge branch 'master' into feature/org-admin-refresh

2025-12-15 15:53:27 +00:00 · 2022-09-12 12:41:11 -05:00
parent ef9d957320 376389988b
commit 54606a1d0b
152 changed files with 2973 additions and 961 deletions
--- a/apps/web/src/app/accounts/register-form/register-form.component.html
+++ b/apps/web/src/app/accounts/register-form/register-form.component.html
@@ -113,16 +113,21 @@
    </div>

    <div class="tw-mb-3 tw-flex">
-      <bit-submit-button [loading]="form.loading">{{ "createAccount" | i18n }}</bit-submit-button>
-      <a
-        bitButton
-        buttonType="secondary"
-        routerLink="/login"
-        class="tw-ml-3 tw-inline-flex tw-items-center tw-px-3"
-      >
-        <i class="bwi bwi-sign-in tw-mr-2"></i>
-        {{ "logIn" | i18n }}
-      </a>
+      <ng-container *ngIf="!accountCreated">
+        <bit-submit-button [loading]="form.loading">{{ "createAccount" | i18n }}</bit-submit-button>
+        <a
+          bitButton
+          buttonType="secondary"
+          routerLink="/login"
+          class="tw-ml-3 tw-inline-flex tw-items-center tw-px-3"
+        >
+          <i class="bwi bwi-sign-in tw-mr-2"></i>
+          {{ "logIn" | i18n }}
+        </a>
+      </ng-container>
+      <ng-container *ngIf="accountCreated">
+        <bit-submit-button [loading]="form.loading">{{ "logIn" | i18n }}</bit-submit-button>
+      </ng-container>
    </div>
    <bit-error-summary *ngIf="showErrorSummary" [formGroup]="formGroup"></bit-error-summary>
  </div>
--- a/apps/web/src/app/accounts/trial-initiation/content/abm-enterprise-content.component.html
+++ b/apps/web/src/app/accounts/trial-initiation/content/abm-enterprise-content.component.html
@@ -0,0 +1,17 @@
+<h1 class="tw-text-4xl !tw-text-alt2">The Bitwarden Password Manager</h1>
+<div class="tw-pt-32">
+  <h2 class="tw-text-2xl">
+    Trusted by millions of individuals, teams, and organizations worldwide for secure password
+    storage and sharing.
+  </h2>
+</div>
+<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main">
+  <li>Store logins, secure notes, and more</li>
+  <li>Collaborate and share securely</li>
+  <li>Access anywhere on any device</li>
+  <li>Create your account to get started</li>
+</ul>
+<div class="tw-mt-28 tw-flex tw-flex-col tw-items-center tw-gap-5">
+  <app-logo-forbes></app-logo-forbes>
+  <app-logo-us-news></app-logo-us-news>
+</div>
--- a/apps/web/src/app/accounts/trial-initiation/content/abm-enterprise-content.component.ts
+++ b/apps/web/src/app/accounts/trial-initiation/content/abm-enterprise-content.component.ts
@@ -0,0 +1,7 @@
+import { Component } from "@angular/core";
+
+@Component({
+  selector: "app-abm-enterprise-content",
+  templateUrl: "abm-enterprise-content.component.html",
+})
+export class AbmEnterpriseContentComponent {}
--- a/apps/web/src/app/accounts/trial-initiation/content/abm-teams-content.component.html
+++ b/apps/web/src/app/accounts/trial-initiation/content/abm-teams-content.component.html
@@ -0,0 +1,17 @@
+<h1 class="tw-text-4xl !tw-text-alt2">The Bitwarden Password Manager</h1>
+<div class="tw-pt-32">
+  <h2 class="tw-text-2xl">
+    Trusted by millions of individuals, teams, and organizations worldwide for secure password
+    storage and sharing.
+  </h2>
+</div>
+<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main">
+  <li>Store logins, secure notes, and more</li>
+  <li>Collaborate and share securely</li>
+  <li>Access anywhere on any device</li>
+  <li>Create your account to get started</li>
+</ul>
+<div class="tw-mt-28 tw-flex tw-flex-col tw-items-center tw-gap-5">
+  <app-logo-forbes></app-logo-forbes>
+  <app-logo-us-news></app-logo-us-news>
+</div>
--- a/apps/web/src/app/accounts/trial-initiation/content/abm-teams-content.component.ts
+++ b/apps/web/src/app/accounts/trial-initiation/content/abm-teams-content.component.ts
@@ -0,0 +1,7 @@
+import { Component } from "@angular/core";
+
+@Component({
+  selector: "app-abm-teams-content",
+  templateUrl: "abm-teams-content.component.html",
+})
+export class AbmTeamsContentComponent {}
--- a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.html
+++ b/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.html
@@ -37,6 +37,8 @@
          *ngIf="layout === 'cnetcmpgnind'"
        ></app-cnet-individual-content>
        <app-cnet-teams-content *ngIf="layout === 'cnetcmpgnteams'"></app-cnet-teams-content>
+        <app-abm-enterprise-content *ngIf="layout === 'abmenterprise'"></app-abm-enterprise-content>
+        <app-abm-teams-content *ngIf="layout === 'abmteams'"></app-abm-teams-content>
      </div>
    </div>
    <div class="tw-w-1/2">
--- a/apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts
+++ b/apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts
@@ -10,6 +10,8 @@ import { RegisterFormModule } from "../register-form/register-form.module";

 import { BillingComponent } from "./billing.component";
 import { ConfirmationDetailsComponent } from "./confirmation-details.component";
+import { AbmEnterpriseContentComponent } from "./content/abm-enterprise-content.component";
+import { AbmTeamsContentComponent } from "./content/abm-teams-content.component";
 import { CnetEnterpriseContentComponent } from "./content/cnet-enterprise-content.component";
 import { CnetIndividualContentComponent } from "./content/cnet-individual-content.component";
 import { CnetTeamsContentComponent } from "./content/cnet-teams-content.component";
@@ -52,6 +54,8 @@ import { VerticalStepperModule } from "./vertical-stepper/vertical-stepper.modul
    CnetEnterpriseContentComponent,
    CnetIndividualContentComponent,
    CnetTeamsContentComponent,
+    AbmEnterpriseContentComponent,
+    AbmTeamsContentComponent,
    LogoCnetComponent,
    LogoForbesComponent,
    LogoUSNewsComponent,
--- a/apps/web/src/app/core/core.module.ts
+++ b/apps/web/src/app/core/core.module.ts
@@ -2,14 +2,14 @@ import { CommonModule } from "@angular/common";
 import { APP_INITIALIZER, NgModule, Optional, SkipSelf } from "@angular/core";

 import {
-  JslibServicesModule,
  SECURE_STORAGE,
  STATE_FACTORY,
  STATE_SERVICE_USE_CACHE,
  LOCALES_DIRECTORY,
  SYSTEM_LANGUAGE,
  MEMORY_STORAGE,
-} from "@bitwarden/angular/services/jslib-services.module";
+} from "@bitwarden/angular/services/injection-tokens";
+import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services.module";
 import { ModalService as ModalServiceAbstraction } from "@bitwarden/angular/services/modal.service";
 import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
--- a/apps/web/src/app/core/init.service.ts
+++ b/apps/web/src/app/core/init.service.ts
@@ -1,6 +1,6 @@
 import { Inject, Injectable } from "@angular/core";

-import { WINDOW } from "@bitwarden/angular/services/jslib-services.module";
+import { WINDOW } from "@bitwarden/angular/services/injection-tokens";
 import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction";
 import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractEncrypt.service";
 import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service";
--- a/apps/web/src/app/core/state/state.service.ts
+++ b/apps/web/src/app/core/state/state.service.ts
@@ -5,7 +5,7 @@ import {
  SECURE_STORAGE,
  STATE_FACTORY,
  STATE_SERVICE_USE_CACHE,
-} from "@bitwarden/angular/services/jslib-services.module";
+} from "@bitwarden/angular/services/injection-tokens";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { StateMigrationService } from "@bitwarden/common/abstractions/stateMigration.service";
 import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service";
--- a/apps/web/src/locales/be/messages.json
+++ b/apps/web/src/locales/be/messages.json
--- a/apps/web/src/locales/eu/messages.json
+++ b/apps/web/src/locales/eu/messages.json
@@ -679,7 +679,7 @@
    "message": "Master pasahitz baliogabea"
  },
  "invalidFilePassword": {
-    "message": "Invalid file password, please use the password you entered when you created the export file."
+    "message": "Fitxategi pasahitzak ez du balio; mesedez, erabili esportazio fitxategia sortzean sartutako pasahitza."
  },
  "lockNow": {
    "message": "Blokeatu orain"
@@ -894,46 +894,46 @@
    "message": "Fitxategiaren formatua"
  },
  "fileEncryptedExportWarningDesc": {
-    "message": "This file export will be password protected and require the file password to decrypt."
+    "message": "Fitxategien esportazio hori pasahitzaren bidez babestuta egongo da eta deszifratzeko fitxategi pasahitza beharko da."
  },
  "exportPasswordDescription": {
-    "message": "This password will be used to export and import this file"
+    "message": "Fitxategi hau esportatu eta inportatzeko erabiliko da pasahitz hau"
  },
  "confirmMasterPassword": {
-    "message": "Confirm Master Password"
+    "message": "Pasahitz nagusia baieztatu"
  },
  "confirmFormat": {
-    "message": "Confirm Format"
+    "message": "Formatua baieztatu"
  },
  "filePassword": {
-    "message": "File Password"
+    "message": "Fitxategi pasahitza"
  },
  "confirmFilePassword": {
-    "message": "Confirm File Password"
+    "message": "Fitxategi pasahitza berretsi"
  },
  "accountBackupOptionDescription": {
-    "message": "Use your account encryption key to encrypt the export and restrict import to only the current Bitwarden account."
+    "message": "Erabili zure kontuaren zifratze-gakoa esportazioa zifratzeko eta inportazioa egungo Bitwarden kontura bakarrik mugatzeko."
  },
  "passwordProtectedOptionDescription": {
-    "message": "Set a password to encrypt the export and import it to any Bitwarden account using the password for decryption."
+    "message": "Erabili pasahitza esportazioa zifratzeko eta Bitwardeneko edozein kontutara inportatzean deszifratzeko."
  },
  "fileTypeHeading": {
    "message": "Fitxategi mota"
  },
  "accountBackup": {
-    "message": "Account Backup"
+    "message": "Kontuaren segurtasun kopia"
  },
  "passwordProtected": {
-    "message": "Password Protected"
+    "message": "Pasahitz babestua"
  },
  "filePasswordAndConfirmFilePasswordDoNotMatch": {
-    "message": "“File password”  and “Confirm File Password“ do not match."
+    "message": "“Fitxategi pasahitza” eta “Fitxategi pasahitza berretsi” ez datoz bat."
  },
  "confirmVaultImport": {
-    "message": "Confirm Vault Import"
+    "message": "Berretsi kutxa gotorra inportatzea"
  },
  "confirmVaultImportDesc": {
-    "message": "This file is password-protected. Please enter the file password to import data."
+    "message": "Fitxategi hau pasahitzez babestuta dago. Sartu fitxategiaren pasahitza datuak inportatzeko."
  },
  "exportSuccess": {
    "message": "Zure kutxa gotorra esportatu da."
--- a/apps/web/src/locales/fi/messages.json
+++ b/apps/web/src/locales/fi/messages.json
@@ -679,7 +679,7 @@
    "message": "Virheellinen pääsalasana"
  },
  "invalidFilePassword": {
-    "message": "Tiedoston salasana on virheellinen. Käytä vientitiedoston luonnin yhteydessä käytettyä salasanaa."
+    "message": "Tiedoston salasana on virheellinen. Käytä vientitiedoston luonnin yhteydessä syötettyä salasanaa."
  },
  "lockNow": {
    "message": "Lukitse nyt"
@@ -912,10 +912,10 @@
    "message": "Vahvista tiedoston salasana"
  },
  "accountBackupOptionDescription": {
-    "message": "Hyödyntää viennin suojauksessa Bitwarden-tilisi salausta sen pääsalasanan sijaan. Tällainen vienti voidaan tuoda vain nykyiselle käyttäjätilille. Tämän avulla voidaan luoda varmuuskopio, jota ei ole mahdollista käyttää muilla tileillä."
+    "message": "Salaa vienti tilisi salausavaimella, joka rajoittaa sen tuonnin vain tälle Bitwarden-tilille."
  },
  "passwordProtectedOptionDescription": {
-    "message": "Suojaa vienti omavalintaisella salasanalla. Tämän avulla voidaan luoda vienti, jota on mahdollista käyttää myös muilla käyttäjätileillä."
+    "message": "Salaa vienti salasanalla, joka mahdollistaa sen tuonnin mille tahansa Bitwarden-tilille."
  },
  "fileTypeHeading": {
    "message": "Tiedostotyyppi"
--- a/apps/web/src/locales/it/messages.json
+++ b/apps/web/src/locales/it/messages.json
@@ -679,7 +679,7 @@
    "message": "Password principale errata"
  },
  "invalidFilePassword": {
-    "message": "Invalid file password, please use the password you entered when you created the export file."
+    "message": "Password errata, usa la password che hai inserito quando hai creato il file di esportazione."
  },
  "lockNow": {
    "message": "Blocca"
--- a/apps/web/src/locales/zh_CN/messages.json
+++ b/apps/web/src/locales/zh_CN/messages.json
@@ -645,7 +645,7 @@
    "message": "您的新账户已创建！您现在可以登录了。"
  },
  "trialAccountCreated": {
-    "message": "帐户创建成功。"
+    "message": "账户创建成功。"
  },
  "masterPassSent": {
    "message": "我们已经为您发送了包含主密码提示的邮件。"
@@ -915,13 +915,13 @@
    "message": "使用您的账户加密密钥来加密导出的数据，并且限制只能导入到当前的 Bitwarden 账户。"
  },
  "passwordProtectedOptionDescription": {
-    "message": "设置一个密码来加密导出的数据，并使用密码解密以导入到任何 Bitwarden 账户。"
+    "message": "设置一个密码用来加密导出的数据，并使用此密码解密以导入到任何 Bitwarden 账户。"
  },
  "fileTypeHeading": {
    "message": "文件类型"
  },
  "accountBackup": {
-    "message": "帐户备份"
+    "message": "账户备份"
  },
  "passwordProtected": {
    "message": "密码保护"
@@ -3687,7 +3687,7 @@
    "message": "先决条件"
  },
  "requireSsoPolicyReq": {
-    "message": "激活此策略前，需先启用「单一组织」企业策略。"
+    "message": "激活此策略前，需先开启「单一组织」企业策略。"
  },
  "requireSsoPolicyReqError": {
    "message": "单一组织策略未启用。"
@@ -5347,7 +5347,7 @@
    }
  },
  "turnOn": {
-    "message": "打开"
+    "message": "开启"
  },
  "on": {
    "message": "开启"
--- a/apps/web/src/locales/zh_TW/messages.json
+++ b/apps/web/src/locales/zh_TW/messages.json
@@ -915,7 +915,7 @@
    "message": "使用您的帳戶加密金鑰來加密匯出的資料，並限制只能匯入到目前的 Bitwarden 帳戶。"
  },
  "passwordProtectedOptionDescription": {
-    "message": "設定一个密碼來加密匯出的資料，並使用密碼解密以匯入到任何 Bitwarden 帳戶。"
+    "message": "設定一个密碼來加密匯出的資料，並使用此密碼解密以匯入到任何 Bitwarden 帳戶。"
  },
  "fileTypeHeading": {
    "message": "檔案類型"
@@ -2302,7 +2302,7 @@
    "message": "原則"
  },
  "singleSignOn": {
-    "message": "單一登入 (SSO)"
+    "message": "單一登入"
  },
  "editPolicy": {
    "message": "編輯原則"
@@ -5347,7 +5347,7 @@
    }
  },
  "turnOn": {
-    "message": "打開"
+    "message": "開啟"
  },
  "on": {
    "message": "開啟"
--- a/apps/web/webpack.config.js
+++ b/apps/web/webpack.config.js
@@ -209,6 +209,12 @@ const devServer =
            secure: false,
            changeOrigin: true,
          },
+          "/icons": {
+            target: envConfig.dev?.proxyIcons,
+            pathRewrite: { "^/icons": "" },
+            secure: false,
+            changeOrigin: true,
+          },
        },
        headers: (req) => {
          if (!req.originalUrl.includes("connector.html")) {