fix: package.json & package-lock.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-NODEFORGE-2330875 - https://snyk.io/vuln/SNYK-JS-NODEFORGE-2331908
Add eslint (#1437 )
2025-12-16 00:03:25 +00:00 · 2022-02-24 11:10:17 +00:00 · 2022-02-24 12:10:07 +01:00 · 2022-02-22 16:22:45 +01:00 · 2022-02-22 15:46:59 +01:00 · 2022-02-22 14:04:06 +01:00
401 changed files with 11947 additions and 5937 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -0,0 +1,8 @@
+**/dist
+**/build
+jslib
+webpack.config.js
+scripts/optimize.js
+config.js
+
+**/node_modules
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -0,0 +1,31 @@
+{
+  "root": true,
+  "env": {
+    "browser": true
+  },
+  "extends": ["./jslib/shared/eslintrc.json"],
+  "rules": {
+    "import/order": [
+      "error",
+      {
+        "alphabetize": {
+          "order": "asc"
+        },
+        "newlines-between": "always",
+        "pathGroups": [
+          {
+            "pattern": "jslib-*/**",
+            "group": "external",
+            "position": "after"
+          },
+          {
+            "pattern": "src/**/*",
+            "group": "parent",
+            "position": "before"
+          }
+        ],
+        "pathGroupsExcludedImportTypes": ["builtin"]
+      }
+    ]
+  }
+}
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -175,9 +175,6 @@ jobs:
      - name: Checkout repo
        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f

-      - name: Restore
-        run: dotnet tool restore
-
      - name: Install dependencies
        run: npm ci

@@ -281,9 +278,6 @@ jobs:
      - name: Checkout repo
        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f

-      - name: Restore
-        run: dotnet tool restore
-
      - name: Install dependencies
        run: npm ci

@@ -367,7 +361,6 @@ jobs:
        run: |
          nuget help | grep Version
          msbuild -version
-          dotnet --info
          node --version
          npm --version
          echo "GitHub ref: $GITHUB_REF"
--- a/.github/workflows/enforce-labels.yml
+++ b/.github/workflows/enforce-labels.yml
@@ -0,0 +1,16 @@
+---
+name: Enforce PR labels
+
+on:
+  pull_request:
+    types: [labeled, unlabeled, opened, edited, synchronize]
+jobs:
+  enforce-label:
+    name: EnforceLabel
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Enforce Label
+        uses: yogevbd/enforce-label-action@8d1e1709b1011e6d90400a0e6cf7c0b77aa5efeb
+        with:
+          BANNED_LABELS: "hold"
+          BANNED_LABELS_DESCRIPTION: "PRs on hold cannot be merged"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
    outputs:
      release_version: ${{ steps.version.outputs.package }}
      tag_version: ${{ steps.version.outputs.tag }}
-      branch-name: ${{ steps.branch.outputs.branch-name }}
+      branch_name: ${{ steps.branch.outputs.branch_name }}
    steps:
      - name: Branch check
        run: |
@@ -55,14 +55,14 @@ jobs:
        id: branch
        run: |
          BRANCH_NAME=$(basename ${{ github.ref }})
-          echo "::set-output name=branch-name::$BRANCH_NAME"
+          echo "::set-output name=branch_name::$BRANCH_NAME"

  self-host:
    name: Release self-host docker
    runs-on: ubuntu-20.04
    needs: setup
    env:
-      _BRANCH_NAME: ${{ needs.setup.outputs.branch-name }}
+      _BRANCH_NAME: ${{ needs.setup.outputs.branch_name }}
      _RELEASE_VERSION: ${{ needs.setup.outputs.release_version }}
    steps:
      - name: Print environment
@@ -139,7 +139,7 @@ jobs:
        with:
          workflow: build.yml
          workflow_conclusion: success
-          branch: ${{ needs.setup.outputs.branch-name }}
+          branch: ${{ needs.setup.outputs.branch_name }}
          artifacts: web-*-cloud-COMMERCIAL.zip

      # This should result in a build directory in the current working directory
@@ -179,7 +179,7 @@ jobs:
        with:
          workflow: build.yml
          workflow_conclusion: success
-          branch: ${{ needs.setup.outputs.branch-name }}
+          branch: ${{ needs.setup.outputs.branch_name }}
          artifacts: "web-*-selfhosted-COMMERCIAL.zip,
            web-*-selfhosted-open-source.zip"

--- a/.github/workflows/version-bump.yml
+++ b/.github/workflows/version-bump.yml
@@ -27,13 +27,13 @@ jobs:
          ref: version_bump_${{ github.event.inputs.version_number }}

      - name: Bump Version - package.json
-        uses: bitwarden/gh-actions/version-bump@0c263b3963211ccaf5804313c3b3a0bcc52d4b19
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./package.json"

      - name: Bump Version - package-lock.json
-        uses: bitwarden/gh-actions/version-bump@0c263b3963211ccaf5804313c3b3a0bcc52d4b19
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./package-lock.json"
--- a/.github/workflows/workflow-linter.yml
+++ b/.github/workflows/workflow-linter.yml
@@ -0,0 +1,11 @@
+---
+name: Workflow Linter
+
+on:
+  pull_request:
+    paths:
+      - .github/workflows/**
+
+jobs:
+  call-workflow:
+    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@master
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
--- a/.prettierignore
+++ b/.prettierignore
@@ -7,7 +7,6 @@ jslib
 # External libraries / auto synced locales
 src/locales
 src/404/*.min.css
-src/scripts/u2f.js

 # Github Workflows
-.github/workflows
+.github/workflows
--- a/README.md
+++ b/README.md
@@ -61,6 +61,10 @@ You can also manually adjusting your API endpoint settings by adding `config/loc

 Where the `urls` object is defined by the [Urls type in jslib](https://github.com/bitwarden/jslib/blob/master/common/src/abstractions/environment.service.ts).

+## We're Hiring!
+
+Interested in contributing in a big way? Consider joining our team! We're hiring for many positions. Please take a look at our [Careers page](https://bitwarden.com/careers/) to see what opportunities are currently open as well as what it's like to work at Bitwarden.
+
 ## Contribute

 Code contributions are welcome! Please commit any pull requests against the `master` branch. Learn more about how to contribute by reading the [`CONTRIBUTING.md`](CONTRIBUTING.md) file.
--- a/bitwarden_license/src/app/app.component.ts
+++ b/bitwarden_license/src/app/app.component.ts
@@ -1,6 +1,7 @@
 import { Component } from "@angular/core";

 import { AppComponent as BaseAppComponent } from "src/app/app.component";
+
 import { DisablePersonalVaultExportPolicy } from "./policies/disable-personal-vault-export.component";
 import { MaximumVaultTimeoutPolicy } from "./policies/maximum-vault-timeout.component";

--- a/bitwarden_license/src/app/app.module.ts
+++ b/bitwarden_license/src/app/app.module.ts
@@ -7,17 +7,17 @@ import { InfiniteScrollModule } from "ngx-infinite-scroll";

 import { BitwardenToastModule } from "jslib-angular/components/toastr.component";

+import { OssRoutingModule } from "src/app/oss-routing.module";
+import { OssModule } from "src/app/oss.module";
+import { ServicesModule } from "src/app/services/services.module";
+import { WildcardRoutingModule } from "src/app/wildcard-routing.module";
+
 import { AppRoutingModule } from "./app-routing.module";
 import { AppComponent } from "./app.component";
 import { OrganizationsModule } from "./organizations/organizations.module";
 import { DisablePersonalVaultExportPolicyComponent } from "./policies/disable-personal-vault-export.component";
 import { MaximumVaultTimeoutPolicyComponent } from "./policies/maximum-vault-timeout.component";

-import { OssRoutingModule } from "src/app/oss-routing.module";
-import { OssModule } from "src/app/oss.module";
-import { ServicesModule } from "src/app/services/services.module";
-import { WildcardRoutingModule } from "src/app/wildcard-routing.module";
-
@NgModule({
  imports: [
    OssModule,
--- a/bitwarden_license/src/app/main.ts
+++ b/bitwarden_license/src/app/main.ts
@@ -5,7 +5,6 @@ import "bootstrap";
 import "jquery";
 import "popper.js";

-// tslint:disable-next-line
 require("src/scss/styles.scss");

 import { AppModule } from "./app.module";
--- a/bitwarden_license/src/app/organizations/manage/sso.component.html
+++ b/bitwarden_license/src/app/organizations/manage/sso.component.html
@@ -3,7 +3,11 @@
 </div>

 <ng-container *ngIf="loading">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>

@@ -67,9 +71,9 @@
          target="_blank"
          rel="noopener"
          appA11yTitle="{{ 'learnMore' | i18n }}"
-          href="https://bitwarden.com/help/article/about-key-connector/"
+          href="https://bitwarden.com/help/about-key-connector/"
        >
-          <i class="fa fa-question-circle-o" aria-hidden="true"></i>
+          <i class="bwi bwi-question-circle" aria-hidden="true"></i>
        </a>
        <small>{{ "memberDecryptionKeyConnectorDesc" | i18n }}</small>
      </label>
@@ -98,7 +102,7 @@
            [disabled]="!enableTestKeyConnector"
          >
            <i
-              class="fa fa-spinner fa-spin"
+              class="bwi bwi-spinner bwi-spin"
              title="{{ 'loading' | i18n }}"
              aria-hidden="true"
              *ngIf="keyConnectorUrl.pending"
@@ -111,11 +115,11 @@
      </div>
      <ng-container *ngIf="keyConnectorUrl.pristine && !keyConnectorUrl.pending">
        <div class="text-danger" *ngIf="keyConnectorUrl.hasError('invalidUrl')" role="alert">
-          <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+          <i class="bwi bwi-exclamation-circle" aria-hidden="true"></i>
          {{ "keyConnectorTestFail" | i18n }}
        </div>
        <div class="text-success" *ngIf="!keyConnectorUrl.hasError('invalidUrl')" role="alert">
-          <i class="fa fa-check-circle-o" aria-hidden="true"></i>
+          <i class="bwi bwi-check-circle" aria-hidden="true"></i>
          {{ "keyConnectorTestSuccess" | i18n }}
        </div>
      </ng-container>
@@ -146,7 +150,7 @@
              appA11yTitle="{{ 'copyValue' | i18n }}"
              (click)="copy(callbackPath)"
            >
-              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
+              <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
            </button>
          </div>
        </div>
@@ -162,7 +166,7 @@
              appA11yTitle="{{ 'copyValue' | i18n }}"
              (click)="copy(signedOutCallbackPath)"
            >
-              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
+              <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
            </button>
          </div>
        </div>
@@ -261,7 +265,7 @@
              appA11yTitle="{{ 'copyValue' | i18n }}"
              (click)="copy(spEntityId)"
            >
-              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
+              <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
            </button>
          </div>
        </div>
@@ -277,7 +281,7 @@
              appA11yTitle="{{ 'launch' | i18n }}"
              (click)="launchUri(spMetadataUrl)"
            >
-              <i class="fa fa-lg fa-external-link" aria-hidden="true"></i>
+              <i class="bwi bwi-lg bwi-external-link" aria-hidden="true"></i>
            </button>
            <button
              type="button"
@@ -285,7 +289,7 @@
              appA11yTitle="{{ 'copyValue' | i18n }}"
              (click)="copy(spMetadataUrl)"
            >
-              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
+              <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
            </button>
          </div>
        </div>
@@ -301,7 +305,7 @@
              appA11yTitle="{{ 'copyValue' | i18n }}"
              (click)="copy(spAcsUrl)"
            >
-              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
+              <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
            </button>
          </div>
        </div>
@@ -309,15 +313,15 @@
      <div class="form-group">
        <label for="spNameIdFormat">{{ "spNameIdFormat" | i18n }}</label>
        <select class="form-control" formControlName="spNameIdFormat" id="spNameIdFormat">
-          <option value="0">Not Configured</option>
-          <option value="1">Unspecified</option>
-          <option value="2">Email Address</option>
-          <option value="3">X.509 Subject Name</option>
-          <option value="4">Windows Domain Qualified Name</option>
-          <option value="5">Kerberos Principal Name</option>
-          <option value="6">Entity Identifier</option>
-          <option value="7">Persistent</option>
-          <option value="8">Transient</option>
+          <option [ngValue]="0">Not Configured</option>
+          <option [ngValue]="1">Unspecified</option>
+          <option [ngValue]="2">Email Address</option>
+          <option [ngValue]="3">X.509 Subject Name</option>
+          <option [ngValue]="4">Windows Domain Qualified Name</option>
+          <option [ngValue]="5">Kerberos Principal Name</option>
+          <option [ngValue]="6">Entity Identifier</option>
+          <option [ngValue]="7">Persistent</option>
+          <option [ngValue]="8">Transient</option>
        </select>
      </div>
      <div class="form-group">
@@ -333,9 +337,9 @@
      <div class="form-group">
        <label for="spSigningBehavior">{{ "spSigningBehavior" | i18n }}</label>
        <select class="form-control" formControlName="spSigningBehavior" id="spSigningBehavior">
-          <option value="0">If IdP Wants Authn Requests Signed</option>
-          <option value="1">Always</option>
-          <option value="3">Never</option>
+          <option [ngValue]="0">If IdP Wants Authn Requests Signed</option>
+          <option [ngValue]="1">Always</option>
+          <option [ngValue]="3">Never</option>
        </select>
      </div>
      <div class="form-group">
@@ -389,9 +393,9 @@
      <div class="form-group">
        <label for="idpBindingType">{{ "idpBindingType" | i18n }}</label>
        <select class="form-control" formControlName="idpBindingType" id="idpBindingType">
-          <option value="1">Redirect</option>
-          <option value="2">HTTP POST</option>
-          <option value="4">Artifact</option>
+          <option [ngValue]="1">Redirect</option>
+          <option [ngValue]="2">HTTP POST</option>
+          <option [ngValue]="4">Artifact</option>
        </select>
      </div>
      <div class="form-group">
@@ -439,7 +443,8 @@
          <option *ngFor="let o of samlSigningAlgorithms" [ngValue]="o">{{ o }}</option>
        </select>
      </div>
-      <div class="form-group">
+      <div class="form-group" [hidden]="true">
+        <!--TODO: Unhide once Unsolicited IdP Response is supported-->
        <div class="form-check">
          <input
            class="form-check-input"
@@ -482,7 +487,7 @@
  </div>

  <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span>{{ "save" | i18n }}</span>
  </button>
 </form>
--- a/bitwarden_license/src/app/organizations/manage/sso.component.ts
+++ b/bitwarden_license/src/app/organizations/manage/sso.component.ts
@@ -6,9 +6,7 @@ import { ApiService } from "jslib-common/abstractions/api.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { OrganizationService } from "jslib-common/abstractions/organization.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-
 import { Organization } from "jslib-common/models/domain/organization";
-
 import { OrganizationSsoRequest } from "jslib-common/models/request/organization/organizationSsoRequest";

@Component({
--- a/bitwarden_license/src/app/organizations/organizations-routing.module.ts
+++ b/bitwarden_license/src/app/organizations/organizations-routing.module.ts
@@ -2,7 +2,6 @@ import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";

 import { AuthGuardService } from "jslib-angular/services/auth-guard.service";
-
 import { Permissions } from "jslib-common/enums/permissions";

 import { OrganizationLayoutComponent } from "src/app/layouts/organization-layout.component";
--- a/bitwarden_license/src/app/policies/disable-personal-vault-export.component.ts
+++ b/bitwarden_license/src/app/policies/disable-personal-vault-export.component.ts
@@ -1,12 +1,7 @@
 import { Component } from "@angular/core";
-import { FormBuilder } from "@angular/forms";
-
-import { I18nService } from "jslib-common/abstractions/i18n.service";

 import { PolicyType } from "jslib-common/enums/policyType";

-import { PolicyRequest } from "jslib-common/models/request/policyRequest";
-
 import {
  BasePolicy,
  BasePolicyComponent,
--- a/bitwarden_license/src/app/policies/maximum-vault-timeout.component.ts
+++ b/bitwarden_license/src/app/policies/maximum-vault-timeout.component.ts
@@ -2,9 +2,7 @@ import { Component } from "@angular/core";
 import { FormBuilder } from "@angular/forms";

 import { I18nService } from "jslib-common/abstractions/i18n.service";
-
 import { PolicyType } from "jslib-common/enums/policyType";
-
 import { PolicyRequest } from "jslib-common/models/request/policyRequest";

 import {
--- a/bitwarden_license/src/app/providers/clients/add-organization.component.html
+++ b/bitwarden_license/src/app/providers/clients/add-organization.component.html
@@ -16,7 +16,7 @@
      </div>
      <div class="modal-body">
        <div class="card-body text-center" *ngIf="loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          {{ "loading" | i18n }}
        </div>
        <ng-container *ngIf="!loading">
--- a/bitwarden_license/src/app/providers/clients/add-organization.component.ts
+++ b/bitwarden_license/src/app/providers/clients/add-organization.component.ts
@@ -1,16 +1,14 @@
 import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";

+import { ValidationService } from "jslib-angular/services/validation.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { ProviderService } from "jslib-common/abstractions/provider.service";
-
-import { ValidationService } from "jslib-angular/services/validation.service";
-
-import { WebProviderService } from "../services/webProvider.service";
-
 import { Organization } from "jslib-common/models/domain/organization";
 import { Provider } from "jslib-common/models/domain/provider";

+import { WebProviderService } from "../services/webProvider.service";
+
@Component({
  selector: "provider-add-organization",
  templateUrl: "add-organization.component.html",
--- a/bitwarden_license/src/app/providers/clients/clients.component.html
+++ b/bitwarden_license/src/app/providers/clients/clients.component.html
@@ -13,7 +13,7 @@
      />
    </div>
    <a class="btn btn-sm btn-outline-primary ml-3" routerLink="create" *ngIf="manageOrganizations">
-      <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
+      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
      {{ "newClientOrganization" | i18n }}
    </a>
    <button
@@ -21,14 +21,18 @@
      (click)="addExistingOrganization()"
      *ngIf="manageOrganizations && showAddExisting"
    >
-      <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
+      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
      {{ "addExistingOrganization" | i18n }}
    </button>
  </div>
 </div>

 <ng-container *ngIf="loading">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>

@@ -67,11 +71,11 @@
                aria-expanded="false"
                appA11yTitle="{{ 'options' | i18n }}"
              >
-                <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
+                <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
              </button>
              <div class="dropdown-menu dropdown-menu-right">
                <a class="dropdown-item text-danger" href="#" appStopClick (click)="remove(o)">
-                  <i class="fa fa-fw fa-remove" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
                  {{ "remove" | i18n }}
                </a>
              </div>
--- a/bitwarden_license/src/app/providers/clients/clients.component.ts
+++ b/bitwarden_license/src/app/providers/clients/clients.component.ts
@@ -1,8 +1,9 @@
 import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-
 import { first } from "rxjs/operators";

+import { ModalService } from "jslib-angular/services/modal.service";
+import { ValidationService } from "jslib-angular/services/validation.service";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
@@ -10,13 +11,8 @@ import { OrganizationService } from "jslib-common/abstractions/organization.serv
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { ProviderService } from "jslib-common/abstractions/provider.service";
 import { SearchService } from "jslib-common/abstractions/search.service";
-
-import { ModalService } from "jslib-angular/services/modal.service";
-import { ValidationService } from "jslib-angular/services/validation.service";
-
 import { PlanType } from "jslib-common/enums/planType";
 import { ProviderUserType } from "jslib-common/enums/providerUserType";
-
 import { Organization } from "jslib-common/models/domain/organization";
 import { ProviderOrganizationOrganizationDetailsResponse } from "jslib-common/models/response/provider/providerOrganizationResponse";

--- a/bitwarden_license/src/app/providers/manage/accept-provider.component.html
+++ b/bitwarden_license/src/app/providers/manage/accept-provider.component.html
@@ -3,7 +3,7 @@
    <img class="mb-4 logo logo-themed" alt="Bitwarden" />
    <p class="text-center">
      <i
-        class="fa fa-spinner fa-spin fa-2x text-muted"
+        class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
        title="{{ 'loading' | i18n }}"
        aria-hidden="true"
      ></i>
--- a/bitwarden_license/src/app/providers/manage/accept-provider.component.ts
+++ b/bitwarden_license/src/app/providers/manage/accept-provider.component.ts
@@ -1,15 +1,14 @@
 import { Component } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";

-import { BaseAcceptComponent } from "src/app/common/base.accept.component";
-
 import { ApiService } from "jslib-common/abstractions/api.service";
-
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { StateService } from "jslib-common/abstractions/state.service";
 import { ProviderUserAcceptRequest } from "jslib-common/models/request/provider/providerUserAcceptRequest";

+import { BaseAcceptComponent } from "src/app/common/base.accept.component";
+
@Component({
  selector: "app-accept-provider",
  templateUrl: "accept-provider.component.html",
--- a/bitwarden_license/src/app/providers/manage/bulk/bulk-confirm.component.ts
+++ b/bitwarden_license/src/app/providers/manage/bulk/bulk-confirm.component.ts
@@ -1,10 +1,9 @@
 import { Component, Input } from "@angular/core";

+import { ProviderUserStatusType } from "jslib-common/enums/providerUserStatusType";
 import { ProviderUserBulkConfirmRequest } from "jslib-common/models/request/provider/providerUserBulkConfirmRequest";
 import { ProviderUserBulkRequest } from "jslib-common/models/request/provider/providerUserBulkRequest";

-import { ProviderUserStatusType } from "jslib-common/enums/providerUserStatusType";
-
 import { BulkConfirmComponent as OrganizationBulkConfirmComponent } from "src/app/organizations/manage/bulk/bulk-confirm.component";
 import { BulkUserDetails } from "src/app/organizations/manage/bulk/bulk-status.component";

--- a/bitwarden_license/src/app/providers/manage/events.component.html
+++ b/bitwarden_license/src/app/providers/manage/events.component.html
@@ -32,9 +32,9 @@
        [disabled]="loaded && refreshForm.loading"
      >
        <i
-          class="fa fa-refresh fa-fw"
+          class="bwi bwi-refresh bwi-fw"
          aria-hidden="true"
-          [ngClass]="{ 'fa-spin': loaded && refreshForm.loading }"
+          [ngClass]="{ 'bwi-spin': loaded && refreshForm.loading }"
        ></i>
        {{ "refresh" | i18n }}
      </button>
@@ -47,14 +47,18 @@
        (click)="exportEvents()"
        [disabled]="(loaded && exportForm.loading) || dirtyDates"
      >
-        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
+        <i class="bwi bwi-spinner bwi-spin" aria-hidden="true"></i>
        <span>{{ "export" | i18n }}</span>
      </button>
    </form>
  </div>
 </div>
 <ng-container *ngIf="!loaded">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container *ngIf="loaded">
@@ -75,7 +79,7 @@
        <td>{{ e.date | date: "medium" }}</td>
        <td>
          <i
-            class="text-muted fa fa-lg {{ e.appIcon }}"
+            class="text-muted bwi bwi-lg {{ e.appIcon }}"
            title="{{ e.appName }}, {{ e.ip }}"
            aria-hidden="true"
          ></i>
@@ -97,7 +101,7 @@
    [disabled]="loaded && moreBtn.loading"
    *ngIf="continuationToken"
  >
-    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span>{{ "loadMore" | i18n }}</span>
  </button>
 </ng-container>
--- a/bitwarden_license/src/app/providers/manage/events.component.ts
+++ b/bitwarden_license/src/app/providers/manage/events.component.ts
@@ -1,27 +1,24 @@
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";

+import { UserNamePipe } from "jslib-angular/pipes/user-name.pipe";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { ExportService } from "jslib-common/abstractions/export.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { ProviderService } from "jslib-common/abstractions/provider.service";
-
-import { UserNamePipe } from "jslib-angular/pipes/user-name.pipe";
-
 import { EventResponse } from "jslib-common/models/response/eventResponse";

-import { EventService } from "src/app/services/event.service";
-
 import { BaseEventsComponent } from "src/app/common/base.events.component";
+import { EventService } from "src/app/services/event.service";

@Component({
  selector: "provider-events",
  templateUrl: "events.component.html",
 })
 export class EventsComponent extends BaseEventsComponent implements OnInit {
-  exportFileName: string = "provider-events";
+  exportFileName = "provider-events";
  providerId: string;

  private providerUsersUserIdMap = new Map<string, any>();
--- a/bitwarden_license/src/app/providers/manage/manage.component.ts
+++ b/bitwarden_license/src/app/providers/manage/manage.component.ts
@@ -2,7 +2,6 @@ import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";

 import { ProviderService } from "jslib-common/abstractions/provider.service";
-
 import { Provider } from "jslib-common/models/domain/provider";

@Component({
--- a/bitwarden_license/src/app/providers/manage/people.component.html
+++ b/bitwarden_license/src/app/providers/manage/people.component.html
@@ -52,11 +52,11 @@
        aria-expanded="false"
        appA11yTitle="{{ 'options' | i18n }}"
      >
-        <i class="fa fa-cog" aria-hidden="true"></i>
+        <i class="bwi bwi-cog" aria-hidden="true"></i>
      </button>
      <div class="dropdown-menu dropdown-menu-right" aria-labelledby="bulkActionsButton">
        <button class="dropdown-item" appStopClick (click)="bulkReinvite()">
-          <i class="fa fa-fw fa-envelope-o" aria-hidden="true"></i>
+          <i class="bwi bwi-fw bwi-envelope" aria-hidden="true"></i>
          {{ "reinviteSelected" | i18n }}
        </button>
        <button
@@ -65,32 +65,36 @@
          (click)="bulkConfirm()"
          *ngIf="showBulkConfirmUsers"
        >
-          <i class="fa fa-fw fa-check" aria-hidden="true"></i>
+          <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
          {{ "confirmSelected" | i18n }}
        </button>
        <button class="dropdown-item text-danger" appStopClick (click)="bulkRemove()">
-          <i class="fa fa-fw fa-remove" aria-hidden="true"></i>
+          <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
          {{ "remove" | i18n }}
        </button>
        <div class="dropdown-divider"></div>
        <button class="dropdown-item" appStopClick (click)="selectAll(true)">
-          <i class="fa fa-fw fa-check-square-o" aria-hidden="true"></i>
+          <i class="bwi bwi-fw bwi-check-square" aria-hidden="true"></i>
          {{ "selectAll" | i18n }}
        </button>
        <button class="dropdown-item" appStopClick (click)="selectAll(false)">
-          <i class="fa fa-fw fa-minus-square-o" aria-hidden="true"></i>
+          <i class="bwi bwi-fw bwi-minus-square" aria-hidden="true"></i>
          {{ "unselectAll" | i18n }}
        </button>
      </div>
    </div>
    <button type="button" class="btn btn-sm btn-outline-primary ml-3" (click)="invite()">
-      <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
+      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
      {{ "inviteUser" | i18n }}
    </button>
  </div>
 </div>
 <ng-container *ngIf="loading">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container
@@ -104,7 +108,7 @@
    <app-callout
      type="info"
      title="{{ 'confirmUsers' | i18n }}"
-      icon="fa-check-circle"
+      icon="bwi bwi-check-circle"
      *ngIf="showConfirmUsers"
    >
      {{ "providerUsersNeedConfirmed" | i18n }}
@@ -128,7 +132,8 @@
              size="25"
              [circle]="true"
              [fontSize]="14"
-            ></app-avatar>
+            >
+            </app-avatar>
          </td>
          <td>
            <a href="#" appStopClick (click)="edit(u)">{{ u.email }}</a>
@@ -142,7 +147,11 @@
          </td>
          <td>
            <ng-container *ngIf="u.twoFactorEnabled">
-              <i class="fa fa-lock" title="{{ 'userUsingTwoStep' | i18n }}" aria-hidden="true"></i>
+              <i
+                class="bwi bwi-lock"
+                title="{{ 'userUsingTwoStep' | i18n }}"
+                aria-hidden="true"
+              ></i>
              <span class="sr-only">{{ "userUsingTwoStep" | i18n }}</span>
            </ng-container>
          </td>
@@ -161,7 +170,7 @@
                aria-expanded="false"
                appA11yTitle="{{ 'options' | i18n }}"
              >
-                <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
+                <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
              </button>
              <div class="dropdown-menu dropdown-menu-right">
                <a
@@ -171,7 +180,7 @@
                  (click)="reinvite(u)"
                  *ngIf="u.status === userStatusType.Invited"
                >
-                  <i class="fa fa-fw fa-envelope-o" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-envelope" aria-hidden="true"></i>
                  {{ "resendInvitation" | i18n }}
                </a>
                <a
@@ -181,7 +190,7 @@
                  (click)="confirm(u)"
                  *ngIf="u.status === userStatusType.Accepted"
                >
-                  <i class="fa fa-fw fa-check" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
                  {{ "confirm" | i18n }}
                </a>
                <a
@@ -191,7 +200,7 @@
                  (click)="groups(u)"
                  *ngIf="accessGroups"
                >
-                  <i class="fa fa-fw fa-sitemap" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-sitemap" aria-hidden="true"></i>
                  {{ "groups" | i18n }}
                </a>
                <a
@@ -201,11 +210,11 @@
                  (click)="events(u)"
                  *ngIf="accessEvents && u.status === userStatusType.Confirmed"
                >
-                  <i class="fa fa-fw fa-file-text-o" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-file-text" aria-hidden="true"></i>
                  {{ "eventLogs" | i18n }}
                </a>
                <a class="dropdown-item text-danger" href="#" appStopClick (click)="remove(u)">
-                  <i class="fa fa-fw fa-remove" aria-hidden="true"></i>
+                  <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
                  {{ "remove" | i18n }}
                </a>
              </div>
--- a/bitwarden_license/src/app/providers/manage/people.component.ts
+++ b/bitwarden_license/src/app/providers/manage/people.component.ts
@@ -1,8 +1,11 @@
 import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
-
 import { first } from "rxjs/operators";

+import { SearchPipe } from "jslib-angular/pipes/search.pipe";
+import { UserNamePipe } from "jslib-angular/pipes/user-name.pipe";
+import { ModalService } from "jslib-angular/services/modal.service";
+import { ValidationService } from "jslib-angular/services/validation.service";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { CryptoService } from "jslib-common/abstractions/crypto.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
@@ -11,26 +14,18 @@ import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.se
 import { ProviderService } from "jslib-common/abstractions/provider.service";
 import { SearchService } from "jslib-common/abstractions/search.service";
 import { StateService } from "jslib-common/abstractions/state.service";
-
-import { ModalService } from "jslib-angular/services/modal.service";
-import { ValidationService } from "jslib-angular/services/validation.service";
-
 import { ProviderUserStatusType } from "jslib-common/enums/providerUserStatusType";
 import { ProviderUserType } from "jslib-common/enums/providerUserType";
-
-import { SearchPipe } from "jslib-angular/pipes/search.pipe";
-import { UserNamePipe } from "jslib-angular/pipes/user-name.pipe";
-
-import { ListResponse } from "jslib-common/models/response/listResponse";
-import { ProviderUserUserDetailsResponse } from "jslib-common/models/response/provider/providerUserResponse";
-
 import { ProviderUserBulkRequest } from "jslib-common/models/request/provider/providerUserBulkRequest";
 import { ProviderUserConfirmRequest } from "jslib-common/models/request/provider/providerUserConfirmRequest";
+import { ListResponse } from "jslib-common/models/response/listResponse";
 import { ProviderUserBulkResponse } from "jslib-common/models/response/provider/providerUserBulkResponse";
+import { ProviderUserUserDetailsResponse } from "jslib-common/models/response/provider/providerUserResponse";

 import { BasePeopleComponent } from "src/app/common/base.people.component";
 import { BulkStatusComponent } from "src/app/organizations/manage/bulk/bulk-status.component";
 import { EntityEventsComponent } from "src/app/organizations/manage/entity-events.component";
+
 import { BulkConfirmComponent } from "./bulk/bulk-confirm.component";
 import { BulkRemoveComponent } from "./bulk/bulk-remove.component";
 import { UserAddEditComponent } from "./user-add-edit.component";
@@ -158,17 +153,13 @@ export class PeopleComponent
  }

  async events(user: ProviderUserUserDetailsResponse) {
-    const [modal] = await this.modalService.openViewRef(
-      EntityEventsComponent,
-      this.eventsModalRef,
-      (comp) => {
-        comp.name = this.userNamePipe.transform(user);
-        comp.providerId = this.providerId;
-        comp.entityId = user.id;
-        comp.showUser = false;
-        comp.entity = "user";
-      }
-    );
+    await this.modalService.openViewRef(EntityEventsComponent, this.eventsModalRef, (comp) => {
+      comp.name = this.userNamePipe.transform(user);
+      comp.providerId = this.providerId;
+      comp.entityId = user.id;
+      comp.showUser = false;
+      comp.entity = "user";
+    });
  }

  async bulkRemove() {
@@ -272,13 +263,14 @@ export class PeopleComponent

        childComponent.users = users.map((user) => {
          let message = keyedErrors[user.id] ?? successfullMessage;
+          // eslint-disable-next-line
          if (!keyedFilteredUsers.hasOwnProperty(user.id)) {
            message = this.i18nService.t("bulkFilteredMessage");
          }

          return {
            user: user,
-            error: keyedErrors.hasOwnProperty(user.id),
+            error: keyedErrors.hasOwnProperty(user.id), // eslint-disable-line
            message: message,
          };
        });
--- a/bitwarden_license/src/app/providers/manage/user-add-edit.component.html
+++ b/bitwarden_license/src/app/providers/manage/user-add-edit.component.html
@@ -23,7 +23,7 @@
      </div>
      <div class="modal-body" *ngIf="loading">
        <i
-          class="fa fa-spinner fa-spin text-muted"
+          class="bwi bwi-spinner bwi-spin text-muted"
          title="{{ 'loading' | i18n }}"
          aria-hidden="true"
        ></i>
@@ -52,9 +52,9 @@
            target="_blank"
            rel="noopener"
            appA11yTitle="{{ 'learnMore' | i18n }}"
-            href="https://bitwarden.com/help/article/user-types-access-control/#user-types"
+            href="https://bitwarden.com/help/provider-users/"
          >
-            <i class="fa fa-question-circle-o" aria-hidden="true"></i>
+            <i class="bwi bwi-question-circle" aria-hidden="true"></i>
          </a>
        </h3>
        <div class="form-check mt-2 form-check-block">
@@ -88,7 +88,7 @@
      </div>
      <div class="modal-footer">
        <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          <span>{{ "save" | i18n }}</span>
        </button>
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
@@ -106,12 +106,12 @@
            [appApiAction]="deletePromise"
          >
            <i
-              class="fa fa-trash-o fa-lg fa-fw"
+              class="bwi bwi-trash bwi-lg bwi-fw"
              [hidden]="deleteBtn.loading"
              aria-hidden="true"
            ></i>
            <i
-              class="fa fa-spinner fa-spin fa-lg fa-fw"
+              class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
              [hidden]="!deleteBtn.loading"
              title="{{ 'loading' | i18n }}"
              aria-hidden="true"
--- a/bitwarden_license/src/app/providers/manage/user-add-edit.component.ts
+++ b/bitwarden_license/src/app/providers/manage/user-add-edit.component.ts
@@ -4,12 +4,9 @@ import { ApiService } from "jslib-common/abstractions/api.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-
-import { ProviderUserInviteRequest } from "jslib-common/models/request/provider/providerUserInviteRequest";
-
-import { PermissionsApi } from "jslib-common/models/api/permissionsApi";
-
 import { ProviderUserType } from "jslib-common/enums/providerUserType";
+import { PermissionsApi } from "jslib-common/models/api/permissionsApi";
+import { ProviderUserInviteRequest } from "jslib-common/models/request/provider/providerUserInviteRequest";
 import { ProviderUserUpdateRequest } from "jslib-common/models/request/provider/providerUserUpdateRequest";

@Component({
@@ -24,7 +21,7 @@ export class UserAddEditComponent implements OnInit {
  @Output() onDeletedUser = new EventEmitter();

  loading = true;
-  editMode: boolean = false;
+  editMode = false;
  title: string;
  emails: string;
  type: ProviderUserType = ProviderUserType.ServiceUser;
--- a/bitwarden_license/src/app/providers/providers-layout.component.html
+++ b/bitwarden_license/src/app/providers/providers-layout.component.html
@@ -10,7 +10,7 @@
        </div>
        <div class="ml-3 card border-danger text-danger bg-transparent" *ngIf="!provider.enabled">
          <div class="card-body py-2">
-            <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+            <i class="bwi bwi-exclamation-triangle" aria-hidden="true"></i>
            {{ "providerIsDisabled" | i18n }}
          </div>
        </div>
@@ -18,19 +18,19 @@
      <ul class="nav nav-tabs" *ngIf="showMenuBar">
        <li class="nav-item">
          <a class="nav-link" routerLink="clients" routerLinkActive="active">
-            <i class="fa fa-university" aria-hidden="true"></i>
+            <i class="bwi bwi-bank" aria-hidden="true"></i>
            {{ "clients" | i18n }}
          </a>
        </li>
        <li class="nav-item" *ngIf="showManageTab">
          <a class="nav-link" [routerLink]="manageRoute" routerLinkActive="active">
-            <i class="fa fa-sliders" aria-hidden="true"></i>
+            <i class="bwi bwi-sliders" aria-hidden="true"></i>
            {{ "manage" | i18n }}
          </a>
        </li>
        <li class="nav-item" *ngIf="showSettingsTab">
          <a class="nav-link" routerLink="settings" routerLinkActive="active">
-            <i class="fa fa-cogs" aria-hidden="true"></i>
+            <i class="bwi bwi-cogs" aria-hidden="true"></i>
            {{ "settings" | i18n }}
          </a>
        </li>
--- a/bitwarden_license/src/app/providers/providers-layout.component.ts
+++ b/bitwarden_license/src/app/providers/providers-layout.component.ts
@@ -2,7 +2,6 @@ import { Component } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";

 import { ProviderService } from "jslib-common/abstractions/provider.service";
-
 import { Provider } from "jslib-common/models/domain/provider";

@Component({
--- a/bitwarden_license/src/app/providers/providers-routing.module.ts
+++ b/bitwarden_license/src/app/providers/providers-routing.module.ts
@@ -4,7 +4,9 @@ import { RouterModule, Routes } from "@angular/router";
 import { AuthGuardService } from "jslib-angular/services/auth-guard.service";
 import { Permissions } from "jslib-common/enums/permissions";

-import { AddOrganizationComponent } from "./clients/add-organization.component";
+import { FrontendLayoutComponent } from "src/app/layouts/frontend-layout.component";
+import { ProvidersComponent } from "src/app/providers/providers.component";
+
 import { ClientsComponent } from "./clients/clients.component";
 import { CreateOrganizationComponent } from "./clients/create-organization.component";
 import { AcceptProviderComponent } from "./manage/accept-provider.component";
@@ -12,16 +14,12 @@ import { EventsComponent } from "./manage/events.component";
 import { ManageComponent } from "./manage/manage.component";
 import { PeopleComponent } from "./manage/people.component";
 import { ProvidersLayoutComponent } from "./providers-layout.component";
-import { SettingsComponent } from "./settings/settings.component";
-import { SetupProviderComponent } from "./setup/setup-provider.component";
-import { SetupComponent } from "./setup/setup.component";
-
-import { FrontendLayoutComponent } from "src/app/layouts/frontend-layout.component";
-
-import { ProvidersComponent } from "src/app/providers/providers.component";
 import { ProviderGuardService } from "./services/provider-guard.service";
 import { ProviderTypeGuardService } from "./services/provider-type-guard.service";
 import { AccountComponent } from "./settings/account.component";
+import { SettingsComponent } from "./settings/settings.component";
+import { SetupProviderComponent } from "./setup/setup-provider.component";
+import { SetupComponent } from "./setup/setup.component";

 const routes: Routes = [
  {
--- a/bitwarden_license/src/app/providers/providers.module.ts
+++ b/bitwarden_license/src/app/providers/providers.module.ts
@@ -1,21 +1,14 @@
 import { CommonModule } from "@angular/common";
-import { ComponentFactoryResolver } from "@angular/core";
-import { NgModule } from "@angular/core";
+import { ComponentFactoryResolver, NgModule } from "@angular/core";
 import { FormsModule } from "@angular/forms";

 import { ModalService } from "jslib-angular/services/modal.service";

-import { ProviderGuardService } from "./services/provider-guard.service";
-import { ProviderTypeGuardService } from "./services/provider-type-guard.service";
-import { WebProviderService } from "./services/webProvider.service";
-
-import { ProvidersLayoutComponent } from "./providers-layout.component";
-import { ProvidersRoutingModule } from "./providers-routing.module";
+import { OssModule } from "src/app/oss.module";

 import { AddOrganizationComponent } from "./clients/add-organization.component";
 import { ClientsComponent } from "./clients/clients.component";
 import { CreateOrganizationComponent } from "./clients/create-organization.component";
-
 import { AcceptProviderComponent } from "./manage/accept-provider.component";
 import { BulkConfirmComponent } from "./manage/bulk/bulk-confirm.component";
 import { BulkRemoveComponent } from "./manage/bulk/bulk-remove.component";
@@ -23,15 +16,16 @@ import { EventsComponent } from "./manage/events.component";
 import { ManageComponent } from "./manage/manage.component";
 import { PeopleComponent } from "./manage/people.component";
 import { UserAddEditComponent } from "./manage/user-add-edit.component";
-
+import { ProvidersLayoutComponent } from "./providers-layout.component";
+import { ProvidersRoutingModule } from "./providers-routing.module";
+import { ProviderGuardService } from "./services/provider-guard.service";
+import { ProviderTypeGuardService } from "./services/provider-type-guard.service";
+import { WebProviderService } from "./services/webProvider.service";
 import { AccountComponent } from "./settings/account.component";
 import { SettingsComponent } from "./settings/settings.component";
-
 import { SetupProviderComponent } from "./setup/setup-provider.component";
 import { SetupComponent } from "./setup/setup.component";

-import { OssModule } from "src/app/oss.module";
-
@NgModule({
  imports: [CommonModule, FormsModule, OssModule, ProvidersRoutingModule],
  declarations: [
--- a/bitwarden_license/src/app/providers/services/provider-type-guard.service.ts
+++ b/bitwarden_license/src/app/providers/services/provider-type-guard.service.ts
@@ -2,7 +2,6 @@ import { Injectable } from "@angular/core";
 import { ActivatedRouteSnapshot, CanActivate, Router } from "@angular/router";

 import { ProviderService } from "jslib-common/abstractions/provider.service";
-
 import { Permissions } from "jslib-common/enums/permissions";

@Injectable()
--- a/bitwarden_license/src/app/providers/services/webProvider.service.ts
+++ b/bitwarden_license/src/app/providers/services/webProvider.service.ts
@@ -3,7 +3,6 @@ import { Injectable } from "@angular/core";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { CryptoService } from "jslib-common/abstractions/crypto.service";
 import { SyncService } from "jslib-common/abstractions/sync.service";
-
 import { ProviderAddOrganizationRequest } from "jslib-common/models/request/provider/providerAddOrganizationRequest";

@Injectable()
--- a/bitwarden_license/src/app/providers/settings/account.component.html
+++ b/bitwarden_license/src/app/providers/settings/account.component.html
@@ -2,7 +2,11 @@
  <h1>{{ "myProvider" | i18n }}</h1>
 </div>
 <div *ngIf="loading">
-  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
  <span class="sr-only">{{ "loading" | i18n }}</span>
 </div>
 <form
@@ -42,7 +46,7 @@
    </div>
  </div>
  <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span>{{ "save" | i18n }}</span>
  </button>
 </form>
--- a/bitwarden_license/src/app/providers/settings/account.component.ts
+++ b/bitwarden_license/src/app/providers/settings/account.component.ts
@@ -6,9 +6,7 @@ import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { SyncService } from "jslib-common/abstractions/sync.service";
-
 import { ProviderUpdateRequest } from "jslib-common/models/request/provider/providerUpdateRequest";
-
 import { ProviderResponse } from "jslib-common/models/response/provider/providerResponse";

@Component({
--- a/bitwarden_license/src/app/providers/settings/settings.component.ts
+++ b/bitwarden_license/src/app/providers/settings/settings.component.ts
@@ -1,7 +1,6 @@
 import { Component } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";

-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { ProviderService } from "jslib-common/abstractions/provider.service";

@Component({
@@ -9,15 +8,11 @@ import { ProviderService } from "jslib-common/abstractions/provider.service";
  templateUrl: "settings.component.html",
 })
 export class SettingsComponent {
-  constructor(
-    private route: ActivatedRoute,
-    private providerService: ProviderService,
-    private platformUtilsService: PlatformUtilsService
-  ) {}
+  constructor(private route: ActivatedRoute, private providerService: ProviderService) {}

  ngOnInit() {
    this.route.parent.params.subscribe(async (params) => {
-      const provider = await this.providerService.get(params.providerId);
+      await this.providerService.get(params.providerId);
    });
  }
 }
--- a/bitwarden_license/src/app/providers/setup/setup-provider.component.html
+++ b/bitwarden_license/src/app/providers/setup/setup-provider.component.html
@@ -3,7 +3,7 @@
    <img class="mb-4 logo logo-themed" alt="Bitwarden" />
    <p class="text-center">
      <i
-        class="fa fa-spinner fa-spin fa-2x text-muted"
+        class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
        title="{{ 'loading' | i18n }}"
        aria-hidden="true"
      ></i>
--- a/bitwarden_license/src/app/providers/setup/setup-provider.component.ts
+++ b/bitwarden_license/src/app/providers/setup/setup-provider.component.ts
@@ -16,6 +16,7 @@ export class SetupProviderComponent extends BaseAcceptComponent {
    this.router.navigate(["/providers/setup"], { queryParams: qParams });
  }

-  // tslint:disable-next-line
-  async unauthedHandler(qParams: any) {}
+  async unauthedHandler(qParams: any) {
+    // Empty
+  }
 }
--- a/bitwarden_license/src/app/providers/setup/setup.component.html
+++ b/bitwarden_license/src/app/providers/setup/setup.component.html
@@ -27,7 +27,7 @@

    <div class="mt-4">
      <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-        <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+        <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
        <span>{{ "submit" | i18n }}</span>
      </button>
      <button type="button" class="btn btn-outline-secondary" (click)="cancel()" *ngIf="showCancel">
--- a/bitwarden_license/src/app/providers/setup/setup.component.ts
+++ b/bitwarden_license/src/app/providers/setup/setup.component.ts
@@ -1,12 +1,10 @@
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
-
 import { first } from "rxjs/operators";

+import { ValidationService } from "jslib-angular/services/validation.service";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { CryptoService } from "jslib-common/abstractions/crypto.service";
-
-import { ValidationService } from "jslib-angular/services/validation.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { SyncService } from "jslib-common/abstractions/sync.service";
@@ -48,9 +46,7 @@ export class SetupComponent implements OnInit {
          "error",
          null,
          this.i18nService.t("emergencyInviteAcceptFailed"),
-          {
-            timeout: 10000,
-          }
+          { timeout: 10000 }
        );
        this.router.navigate(["/"]);
        return;
--- a/2
+++ b/2
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "bitwarden-web",
-  "version": "2.25.1",
+  "name": "@bitwarden/web-vault",
+  "version": "2.26.1",
  "license": "GPL-3.0",
  "repository": "https://github.com/bitwarden/web",
  "scripts": {
@@ -29,8 +29,8 @@
    "dist:bit:selfhost": "npm run build:bit:selfhost:prod",
    "deploy": "npm run dist:bit && gh-pages -d build",
    "deploy:dev": "npm run dist:bit && gh-pages -d build -r git@github.com:kspearrin/bitwarden-web-dev.git",
-    "lint": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts' && prettier --check .",
-    "lint:fix": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts' --fix",
+    "lint": "eslint . && prettier --check .",
+    "lint:fix": "eslint . --fix",
    "prettier": "prettier --write .",
    "prepare": "husky install"
  },
@@ -41,11 +41,17 @@
    "@types/node": "^16.11.12",
    "@types/webcrypto": "^0.0.28",
    "@types/webpack": "^5.28.0",
+    "@typescript-eslint/eslint-plugin": "^5.10.1",
+    "@typescript-eslint/parser": "^5.10.1",
    "buffer": "^6.0.3",
    "clean-webpack-plugin": "^4.0.0",
    "copy-webpack-plugin": "^10.0.0",
    "cross-env": "^7.0.3",
    "css-loader": "^6.5.1",
+    "eslint": "^8.7.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-import-resolver-typescript": "^2.5.0",
+    "eslint-plugin-import": "^2.25.4",
    "gh-pages": "^3.1.0",
    "html-loader": "^3.0.1",
    "html-webpack-injector": "1.1.4",
@@ -55,13 +61,12 @@
    "mini-css-extract-plugin": "^2.4.5",
    "prettier": "2.5.1",
    "process": "^0.11.10",
+    "rimraf": "^3.0.2",
    "sass": "^1.32.10",
    "sass-loader": "^12.4.0",
    "style-loader": "^3.3.1",
    "terser-webpack-plugin": "^5.2.5",
    "ts-loader": "^9.2.5",
-    "tslint": "^6.1.3",
-    "tslint-loader": "^3.5.4",
    "typescript": "4.3.5",
    "util": "^0.12.4",
    "webpack": "^5.64.4",
@@ -85,10 +90,10 @@
    "browser-hrtime": "^1.1.8",
    "core-js": "^3.11.0",
    "date-input-polyfill": "^2.14.0",
-    "font-awesome": "4.7.0",
    "jquery": "3.6.0",
    "ngx-infinite-scroll": "^10.0.1",
    "ngx-toastr": "14.1.4",
+    "node-forge": "^1.0.0",
    "popper.js": "1.16.1",
    "qrious": "4.0.2",
    "rxjs": "^7.4.0",
@@ -101,7 +106,8 @@
    "npm": "~8"
  },
  "lint-staged": {
-    "*": "prettier --ignore-unknown --write",
+    "./!(jslib)**": "prettier --ignore-unknown --write",
+    "*.ts": "eslint --fix",
    "*.png": "node scripts/optimize.js"
  }
 }
--- a/src/404.html
+++ b/src/404.html
@@ -9,13 +9,7 @@
      href="/404/bootstrap.min.css"
      rel="stylesheet"
      type="text/css"
-      integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l"
-    />
-    <link
-      href="/404/font-awesome.min.css"
-      rel="stylesheet"
-      type="text/css"
-      integrity="sha512-SfTiTlX6kk+qitfevl/7LibUOeJWlt9rbyDn92a1DqWOw9vWG2MFoays0sgObmWazO5BQPiFucnnEAjpAB+/Sw=="
+      integrity="sha384-hA/ESrxp2b05ywLtD9YwM6m+pNyLRY4+ruk6dWK00SM4k6SQs0bfrITJVSf6uZyH"
    />
    <link href="/404/styles.css" rel="stylesheet" type="text/css" />

@@ -33,7 +27,9 @@
    <div class="banner">
      <div class="container inner banner">
        <div class="row align-items-center">
-          <div class="col brand"><i class="fa fa-shield"></i>&nbsp; <strong>bit</strong>warden</div>
+          <div class="col brand">
+            <i class="bwi bwi-shield"></i>&nbsp; <strong>bit</strong>warden
+          </div>
        </div>
      </div>
    </div>
--- a/src/404/font-awesome.min.css
+++ b/src/404/font-awesome.min.css
--- a/src/404/styles.css
+++ b/src/404/styles.css
@@ -119,3 +119,33 @@ h2 {
  padding: 40px 0 40px 0;
  border-top: 1px solid #dee2e6;
 }
+
+/* Bitwarden icons, manually copied */
+
+@font-face {
+  font-family: "bwi-font";
+  src: url(../images/bwi-font.svg) format("svg"), url(../fonts/bwi-font.ttf) format("truetype"),
+    url(../fonts/bwi-font.woff) format("woff"), url(../fonts/bwi-font.woff2) format("woff2");
+  font-weight: normal;
+  font-style: normal;
+  font-display: block;
+}
+
+.bwi {
+  /* use !important to prevent issues with browser extensions that change fonts */
+  font-family: "bwi-font" !important;
+  speak: never;
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-transform: none;
+  line-height: 1;
+  display: inline-block;
+  /* Better Font Rendering */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.bwi-shield:before {
+  content: "\e932";
+}
--- a/src/abstractions/state.service.ts
+++ b/src/abstractions/state.service.ts
@@ -0,0 +1,9 @@
+import { StateService as BaseStateService } from "jslib-common/abstractions/state.service";
+import { StorageOptions } from "jslib-common/models/domain/storageOptions";
+
+import { Account } from "src/models/account";
+
+export abstract class StateService extends BaseStateService<Account> {
+  getRememberEmail: (options?: StorageOptions) => Promise<boolean>;
+  setRememberEmail: (value: boolean, options?: StorageOptions) => Promise<void>;
+}
--- a/src/app/accounts/accept-emergency.component.html
+++ b/src/app/accounts/accept-emergency.component.html
@@ -3,7 +3,7 @@
    <img class="mb-4 logo logo-themed" alt="Bitwarden" />
    <p class="text-center">
      <i
-        class="fa fa-spinner fa-spin fa-2x text-muted"
+        class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
        title="{{ 'loading' | i18n }}"
        aria-hidden="true"
      ></i>
--- a/src/app/accounts/accept-emergency.component.ts
+++ b/src/app/accounts/accept-emergency.component.ts
@@ -6,6 +6,7 @@ import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { StateService } from "jslib-common/abstractions/state.service";
 import { EmergencyAccessAcceptRequest } from "jslib-common/models/request/emergencyAccessAcceptRequest";
+
 import { BaseAcceptComponent } from "../common/base.accept.component";

@Component({
--- a/src/app/accounts/accept-organization.component.html
+++ b/src/app/accounts/accept-organization.component.html
@@ -3,7 +3,7 @@
    <img src="../../images/logo-dark@2x.png" class="mb-4 logo" alt="Bitwarden" />
    <p class="text-center">
      <i
-        class="fa fa-spinner fa-spin fa-2x text-muted"
+        class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
        title="{{ 'loading' | i18n }}"
        aria-hidden="true"
      ></i>
--- a/src/app/accounts/accept-organization.component.ts
+++ b/src/app/accounts/accept-organization.component.ts
@@ -8,12 +8,11 @@ import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { PolicyService } from "jslib-common/abstractions/policy.service";
 import { StateService } from "jslib-common/abstractions/state.service";
-
+import { Utils } from "jslib-common/misc/utils";
+import { Policy } from "jslib-common/models/domain/policy";
 import { OrganizationUserAcceptRequest } from "jslib-common/models/request/organizationUserAcceptRequest";
 import { OrganizationUserResetPasswordEnrollmentRequest } from "jslib-common/models/request/organizationUserResetPasswordEnrollmentRequest";

-import { Utils } from "jslib-common/misc/utils";
-import { Policy } from "jslib-common/models/domain/policy";
 import { BaseAcceptComponent } from "../common/base.accept.component";

@Component({
--- a/src/app/accounts/hint.component.html
+++ b/src/app/accounts/hint.component.html
@@ -28,7 +28,7 @@
            >
              <span [hidden]="form.loading">{{ "submit" | i18n }}</span>
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/accounts/hint.component.ts
+++ b/src/app/accounts/hint.component.ts
@@ -1,13 +1,12 @@
 import { Component } from "@angular/core";
 import { Router } from "@angular/router";

+import { HintComponent as BaseHintComponent } from "jslib-angular/components/hint.component";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";

-import { HintComponent as BaseHintComponent } from "jslib-angular/components/hint.component";
-
@Component({
  selector: "app-hint",
  templateUrl: "hint.component.html",
--- a/src/app/accounts/lock.component.html
+++ b/src/app/accounts/lock.component.html
@@ -2,7 +2,7 @@
  <div class="row justify-content-md-center mt-5">
    <div class="col-5">
      <p class="text-center mb-4">
-        <i class="fa fa-lock fa-4x text-muted" aria-hidden="true"></i>
+        <i class="bwi bwi-lock bwi-4x text-muted" aria-hidden="true"></i>
      </p>
      <p class="lead text-center mx-4 mb-4">{{ "yourVaultIsLocked" | i18n }}</p>
      <div class="card d-block">
@@ -27,9 +27,9 @@
                (click)="togglePassword()"
              >
                <i
-                  class="fa fa-lg"
+                  class="bwi bwi-lg"
                  aria-hidden="true"
-                  [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
+                  [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
                ></i>
              </button>
            </div>
@@ -44,11 +44,9 @@
              class="btn btn-primary btn-block btn-submit"
              [disabled]="form.loading"
            >
-              <span>
-                <i class="fa fa-unlock-alt" aria-hidden="true"></i> {{ "unlock" | i18n }}
-              </span>
+              <span> <i class="bwi bwi-unlock" aria-hidden="true"></i> {{ "unlock" | i18n }} </span>
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/accounts/lock.component.ts
+++ b/src/app/accounts/lock.component.ts
@@ -1,6 +1,7 @@
 import { Component, NgZone } from "@angular/core";
 import { Router } from "@angular/router";

+import { LockComponent as BaseLockComponent } from "jslib-angular/components/lock.component";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { CryptoService } from "jslib-common/abstractions/crypto.service";
 import { EnvironmentService } from "jslib-common/abstractions/environment.service";
@@ -14,8 +15,6 @@ import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.serv

 import { RouterService } from "../services/router.service";

-import { LockComponent as BaseLockComponent } from "jslib-angular/components/lock.component";
-
@Component({
  selector: "app-lock",
  templateUrl: "lock.component.html",
--- a/src/app/accounts/login.component.html
+++ b/src/app/accounts/login.component.html
@@ -44,9 +44,9 @@
                (click)="togglePassword()"
              >
                <i
-                  class="fa fa-lg"
+                  class="bwi bwi-lg"
                  aria-hidden="true"
-                  [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
+                  [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
                ></i>
              </button>
            </div>
@@ -74,9 +74,9 @@
              class="btn btn-primary btn-block btn-submit"
              [disabled]="form.loading"
            >
-              <span> <i class="fa fa-sign-in" aria-hidden="true"></i> {{ "logIn" | i18n }} </span>
+              <span> <i class="bwi bwi-sign-in" aria-hidden="true"></i> {{ "logIn" | i18n }} </span>
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
@@ -86,12 +86,13 @@
              [queryParams]="{ email: email }"
              class="btn btn-outline-secondary btn-block ml-2 mt-0"
            >
-              <i class="fa fa-pencil-square-o" aria-hidden="true"></i> {{ "createAccount" | i18n }}
+              <i class="bwi bwi-pencil-square" aria-hidden="true"></i>
+              {{ "createAccount" | i18n }}
            </a>
          </div>
          <div class="d-flex">
            <a routerLink="/sso" class="btn btn-outline-secondary btn-block mt-2">
-              <i class="fa fa-bank" aria-hidden="true"></i> {{ "enterpriseSingleSignOn" | i18n }}
+              <i class="bwi bwi-bank" aria-hidden="true"></i> {{ "enterpriseSingleSignOn" | i18n }}
            </a>
          </div>
        </div>
--- a/src/app/accounts/login.component.ts
+++ b/src/app/accounts/login.component.ts
@@ -1,8 +1,8 @@
 import { Component, NgZone } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
-
 import { first } from "rxjs/operators";

+import { LoginComponent as BaseLoginComponent } from "jslib-angular/components/login.component";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { AuthService } from "jslib-common/abstractions/auth.service";
 import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service";
@@ -12,11 +12,13 @@ import { LogService } from "jslib-common/abstractions/log.service";
 import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { PolicyService } from "jslib-common/abstractions/policy.service";
-import { StateService } from "jslib-common/abstractions/state.service";
-
-import { LoginComponent as BaseLoginComponent } from "jslib-angular/components/login.component";
-
+import { PolicyData } from "jslib-common/models/data/policyData";
+import { MasterPasswordPolicyOptions } from "jslib-common/models/domain/masterPasswordPolicyOptions";
 import { Policy } from "jslib-common/models/domain/policy";
+import { ListResponse } from "jslib-common/models/response/listResponse";
+import { PolicyResponse } from "jslib-common/models/response/policyResponse";
+
+import { StateService } from "../../abstractions/state.service";

@Component({
  selector: "app-login",
@@ -24,13 +26,14 @@ import { Policy } from "jslib-common/models/domain/policy";
 })
 export class LoginComponent extends BaseLoginComponent {
  showResetPasswordAutoEnrollWarning = false;
+  enforcedPasswordPolicyOptions: MasterPasswordPolicyOptions;
+  policies: ListResponse<PolicyResponse>;

  constructor(
    authService: AuthService,
    router: Router,
    i18nService: I18nService,
    private route: ActivatedRoute,
-    stateService: StateService,
    platformUtilsService: PlatformUtilsService,
    environmentService: EnvironmentService,
    passwordGenerationService: PasswordGenerationService,
@@ -38,7 +41,8 @@ export class LoginComponent extends BaseLoginComponent {
    private apiService: ApiService,
    private policyService: PolicyService,
    logService: LogService,
-    ngZone: NgZone
+    ngZone: NgZone,
+    protected stateService: StateService
  ) {
    super(
      authService,
@@ -78,35 +82,64 @@ export class LoginComponent extends BaseLoginComponent {
        });
      }
      await super.ngOnInit();
+      this.rememberEmail = await this.stateService.getRememberEmail();
    });

    const invite = await this.stateService.getOrganizationInvitation();
    if (invite != null) {
      let policyList: Policy[] = null;
      try {
-        const policies = await this.apiService.getPoliciesByToken(
+        this.policies = await this.apiService.getPoliciesByToken(
          invite.organizationId,
          invite.token,
          invite.email,
          invite.organizationUserId
        );
-        policyList = this.policyService.mapPoliciesFromToken(policies);
+        policyList = this.policyService.mapPoliciesFromToken(this.policies);
      } catch (e) {
        this.logService.error(e);
      }

      if (policyList != null) {
-        const result = this.policyService.getResetPasswordPolicyOptions(
+        const resetPasswordPolicy = this.policyService.getResetPasswordPolicyOptions(
          policyList,
          invite.organizationId
        );
        // Set to true if policy enabled and auto-enroll enabled
-        this.showResetPasswordAutoEnrollWarning = result[1] && result[0].autoEnrollEnabled;
+        this.showResetPasswordAutoEnrollWarning =
+          resetPasswordPolicy[1] && resetPasswordPolicy[0].autoEnrollEnabled;
+
+        this.enforcedPasswordPolicyOptions =
+          await this.policyService.getMasterPasswordPolicyOptions(policyList);
      }
    }
  }

  async goAfterLogIn() {
+    // Check master password against policy
+    if (this.enforcedPasswordPolicyOptions != null) {
+      const strengthResult = this.passwordGenerationService.passwordStrength(
+        this.masterPassword,
+        this.getPasswordStrengthUserInput()
+      );
+      const masterPasswordScore = strengthResult == null ? null : strengthResult.score;
+
+      // If invalid, save policies and require update
+      if (
+        !this.policyService.evaluateMasterPassword(
+          masterPasswordScore,
+          this.masterPassword,
+          this.enforcedPasswordPolicyOptions
+        )
+      ) {
+        const policiesData: { [id: string]: PolicyData } = {};
+        this.policies.data.map((p) => (policiesData[p.id] = new PolicyData(p)));
+        await this.policyService.replace(policiesData);
+        this.router.navigate(["update-password"]);
+        return;
+      }
+    }
+
    const loginRedirect = await this.stateService.getLoginRedirect();
    if (loginRedirect != null) {
      this.router.navigate([loginRedirect.route], { queryParams: loginRedirect.qParams });
@@ -115,4 +148,27 @@ export class LoginComponent extends BaseLoginComponent {
      this.router.navigate([this.successRoute]);
    }
  }
+
+  async submit() {
+    await this.stateService.setRememberEmail(this.rememberEmail);
+    if (!this.rememberEmail) {
+      await this.stateService.setRememberedEmail(null);
+    }
+    await super.submit();
+  }
+
+  private getPasswordStrengthUserInput() {
+    let userInput: string[] = [];
+    const atPosition = this.email.indexOf("@");
+    if (atPosition > -1) {
+      userInput = userInput.concat(
+        this.email
+          .substr(0, atPosition)
+          .trim()
+          .toLowerCase()
+          .split(/[^A-Za-z0-9]/)
+      );
+    }
+    return userInput;
+  }
 }
--- a/src/app/accounts/recover-delete.component.html
+++ b/src/app/accounts/recover-delete.component.html
@@ -28,7 +28,7 @@
            >
              <span>{{ "submit" | i18n }}</span>
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/accounts/recover-delete.component.ts
+++ b/src/app/accounts/recover-delete.component.ts
@@ -5,7 +5,6 @@ import { ApiService } from "jslib-common/abstractions/api.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-
 import { DeleteRecoverRequest } from "jslib-common/models/request/deleteRecoverRequest";

@Component({
--- a/src/app/accounts/recover-two-factor.component.html
+++ b/src/app/accounts/recover-two-factor.component.html
@@ -7,7 +7,7 @@
          <p>
            {{ "recoverAccountTwoStepDesc" | i18n }}
            <a
-              href="https://help.bitwarden.com/article/lost-two-step-device/"
+              href="https://bitwarden.com/help/lost-two-step-device/"
              target="_blank"
              rel="noopener"
              >{{ "learnMore" | i18n }}</a
@@ -60,7 +60,7 @@
            >
              <span>{{ "submit" | i18n }}</span>
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/accounts/recover-two-factor.component.ts
+++ b/src/app/accounts/recover-two-factor.component.ts
@@ -7,7 +7,6 @@ import { CryptoService } from "jslib-common/abstractions/crypto.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-
 import { TwoFactorRecoveryRequest } from "jslib-common/models/request/twoFactorRecoveryRequest";

@Component({
--- a/src/app/accounts/register.component.html
+++ b/src/app/accounts/register.component.html
@@ -1,44 +1,100 @@
 <div class="layout" [ngClass]="['layout', layout]">
-  <header class="header" *ngIf="layout === 'enterprise2'">
+  <!-- TEAMS 1 Header -->
+  <header
+    class="header"
+    *ngIf="
+      layout === 'default' ||
+      layout === 'teams' ||
+      layout === 'teams1' ||
+      layout === 'teams2' ||
+      layout === 'enterprise' ||
+      layout === 'enterprise1' ||
+      layout === 'enterprise2' ||
+      layout === 'cnetcmpgnent' ||
+      layout === 'cnetcmpgnteams' ||
+      layout === 'cnetcmpgnind'
+    "
+  >
    <div class="container">
      <div class="row">
        <div class="col-7">
          <img
            alt="Bitwarden"
            class="logo mb-2"
-            src="../../images/register-layout/logo-horizontal-white.png"
+            src="../../images/register-layout/logo-horizontal-white.svg"
          />
        </div>
      </div>
    </div>
  </header>
+
  <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container" ngNativeValidate>
    <div class="row">
      <div class="col-7" *ngIf="layout">
        <div class="mt-5">
-          <div *ngIf="layout === 'enterprise2'">
-            <h2>Companies globally trust Bitwarden for password management.</h2>
-            <p>Start your 7-day free trial!</p>
-            <p class="highlight">Quickly deploy your <b>organization</b></p>
-            <p>Use Bitwarden across all platforms</p>
+          <!-- Default Body -->
+          <div
+            *ngIf="
+              layout === 'teams' ||
+              layout === 'enterprise' ||
+              layout === 'enterprise1' ||
+              layout === 'default'
+            "
+          >
+            <h1>The Bitwarden Password Manager</h1>
+            <h2>
+              Trusted by millions of individuals, teams, and organizations worldwide for secure
+              password storage and sharing.
+            </h2>
+            <p>Store logins, secure notes, and more</p>
            <p>Collaborate and share securely</p>
-            <figure>
-              <figcaption>
-                <cite>
-                  <img src="../../images/register-layout/wired-logo.png" alt="Wired" />
-                </cite>
-              </figcaption>
-              <blockquote>
-                "Bitwarden has become a popular choice among open-source software advocates. After
-                using it for a few months, I can see why." - February 2020
-              </blockquote>
-            </figure>
+            <p>Access anywhere on any device</p>
+            <p>Create your account to get started</p>
          </div>
-          <div *ngIf="layout === 'enterprise3'">
-            <p>Enterprise 3 layout</p>
+
+          <!-- Teams & Enterprise Body -->
+          <div *ngIf="layout === 'teams1' || layout === 'teams2' || layout === 'enterprise2'">
+            <h1>
+              Start Your <span *ngIf="layout === 'teams1' || layout === 'teams1'">Teams<br /></span
+              ><span *ngIf="layout === 'enterprise2'">Enterprise</span> Free Trial Now
+            </h1>
+            <h2>
+              Millions of individuals, teams, and organizations worldwide trust Bitwarden for secure
+              password storage and sharing.
+            </h2>
+            <p>Collaborate and share securely</p>
+            <p>Deploy and manage quickly and easily</p>
+            <p>Access anywhere on any device</p>
+            <p>Create your account to get started</p>
          </div>
-          <div *ngIf="layout === 'enterprise4'">
-            <p>Enterprise 4 layout</p>
+
+          <!-- CNET Campaign Teams & Enterprise Body -->
+          <div *ngIf="layout === 'cnetcmpgnteams' || layout === 'cnetcmpgnent'">
+            <h1>
+              Start Your <span *ngIf="layout === 'cnetcmpgnteams'">Teams<br /></span
+              ><span *ngIf="layout === 'cnetcmpgnent'">Enterprise</span> Free Trial Now
+            </h1>
+            <h2>
+              Millions of individuals, teams, and organizations worldwide trust Bitwarden for secure
+              password storage and sharing.
+            </h2>
+            <p>Collaborate and share securely</p>
+            <p>Deploy and manage quickly and easily</p>
+            <p>Access anywhere on any device</p>
+            <p>Create your account to get started</p>
+          </div>
+
+          <!-- CNET Campaign Premium Body -->
+          <div *ngIf="layout === 'cnetcmpgnind'">
+            <h1>Start Your Premium Account Now</h1>
+            <h2>
+              Millions of individuals, teams, and organizations worldwide trust Bitwarden for secure
+              password storage and sharing.
+            </h2>
+            <p>Store logins, secure notes, and more</p>
+            <p>Secure your account with advanced two-step login</p>
+            <p>Access anywhere on any device</p>
+            <p>Create your account to get started</p>
          </div>
        </div>
      </div>
@@ -51,7 +107,7 @@
                <app-callout
                  title="{{ 'createOrganizationStep1' | i18n }}"
                  type="info"
-                  icon="fa-thumb-tack"
+                  icon="bwi bwi-thumb-tack"
                  *ngIf="showCreateOrgMessage"
                >
                  {{ "createOrganizationCreatePersonalAccount" | i18n }}
@@ -114,11 +170,11 @@
                        (click)="togglePassword(false)"
                      >
                        <i
-                          class="fa fa-lg"
+                          class="bwi bwi-lg"
                          aria-hidden="true"
                          [ngClass]="{
-                            'fa-eye': !showPassword,
-                            'fa-eye-slash': showPassword
+                            'bwi-eye': !showPassword,
+                            'bwi-eye-slash': showPassword
                          }"
                        ></i>
                      </button>
@@ -146,9 +202,9 @@
                      (click)="togglePassword(true)"
                    >
                      <i
-                        class="fa fa-lg"
+                        class="bwi bwi-lg"
                        aria-hidden="true"
-                        [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
+                        [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
                      ></i>
                    </button>
                  </div>
@@ -197,7 +253,7 @@
                  >
                    <span>{{ "submit" | i18n }}</span>
                    <i
-                      class="fa fa-spinner fa-spin"
+                      class="bwi bwi-spinner bwi-spin"
                      title="{{ 'loading' | i18n }}"
                      aria-hidden="true"
                    ></i>
@@ -212,5 +268,88 @@
        </div>
      </div>
    </div>
+    <div class="row">
+      <div class="col-7 d-flex align-items-center">
+        <div
+          *ngIf="
+            layout === 'cnetcmpgnent' || layout === 'cnetcmpgnteams' || layout === 'cnetcmpgnind'
+          "
+        >
+          <figure>
+            <figcaption>
+              <cite>
+                <img
+                  src="../../images/register-layout/cnet-logo.svg"
+                  class="w-25 d-block mx-auto"
+                  alt="cnet logo"
+                />
+              </cite>
+            </figcaption>
+            <blockquote class="mx-auto text-center px-4">
+              "No more excuses; start using Bitwarden today. The identity you save could be your
+              own. The money definitely will be."
+            </blockquote>
+          </figure>
+        </div>
+
+        <div
+          *ngIf="
+            layout === 'teams' ||
+            layout === 'teams1' ||
+            layout === 'teams2' ||
+            layout === 'enterprise' ||
+            layout === 'enterprise1' ||
+            layout === 'enterprise2' ||
+            layout === 'default'
+          "
+        >
+          <figure>
+            <figcaption>
+              <cite>
+                <img
+                  src="../../images/register-layout/forbes-logo.svg"
+                  class="w-25 d-block mx-auto"
+                  alt="Forbes Logo"
+                />
+              </cite>
+            </figcaption>
+            <blockquote class="mx-auto text-center px-4">
+              “Bitwarden boasts the backing of some of the world's best security experts and an
+              attractive, easy-to-use interface”
+            </blockquote>
+          </figure>
+        </div>
+      </div>
+      <div
+        *ngIf="
+          layout === 'cnetcmpgnent' || layout === 'cnetcmpgnteams' || layout === 'cnetcmpgnind'
+        "
+        class="col-5 d-flex align-items-center justify-content-center"
+      >
+        <img
+          src="../../images/register-layout/usnews-360-badge.svg"
+          class="w-50 d-block"
+          alt="US News 360 Reviews Best Password Manager"
+        />
+      </div>
+      <div
+        *ngIf="
+          layout === 'teams' ||
+          layout === 'teams1' ||
+          layout === 'teams2' ||
+          layout === 'enterprise' ||
+          layout === 'enterprise1' ||
+          layout === 'enterprise2' ||
+          layout === 'default'
+        "
+        class="col-5 d-flex align-items-center justify-content-center"
+      >
+        <img
+          src="../../images/register-layout/usnews-360-badge.svg"
+          class="w-50 d-block"
+          alt="US News 360 Reviews Best Password Manager"
+        />
+      </div>
+    </div>
  </form>
 </div>
--- a/src/app/accounts/register.component.ts
+++ b/src/app/accounts/register.component.ts
@@ -1,8 +1,8 @@
 import { Component } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
-
 import { first } from "rxjs/operators";

+import { RegisterComponent as BaseRegisterComponent } from "jslib-angular/components/register.component";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { AuthService } from "jslib-common/abstractions/auth.service";
 import { CryptoService } from "jslib-common/abstractions/crypto.service";
@@ -13,13 +13,9 @@ import { PasswordGenerationService } from "jslib-common/abstractions/passwordGen
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { PolicyService } from "jslib-common/abstractions/policy.service";
 import { StateService } from "jslib-common/abstractions/state.service";
-
-import { RegisterComponent as BaseRegisterComponent } from "jslib-angular/components/register.component";
-
+import { PolicyData } from "jslib-common/models/data/policyData";
 import { MasterPasswordPolicyOptions } from "jslib-common/models/domain/masterPasswordPolicyOptions";
 import { Policy } from "jslib-common/models/domain/policy";
-
-import { PolicyData } from "jslib-common/models/data/policyData";
 import { ReferenceEventRequest } from "jslib-common/models/request/referenceEventRequest";

@Component({
--- a/src/app/accounts/remove-password.component.html
+++ b/src/app/accounts/remove-password.component.html
@@ -3,7 +3,7 @@
    <img class="mb-4 logo logo-themed" alt="Bitwarden" />
    <p class="text-center">
      <i
-        class="fa fa-spinner fa-spin fa-2x text-muted"
+        class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
        title="{{ 'loading' | i18n }}"
        aria-hidden="true"
      ></i>
@@ -27,7 +27,7 @@
            [disabled]="actionPromise"
          >
            <i
-              class="fa fa-spinner fa-spin"
+              class="bwi bwi-spinner bwi-spin"
              title="{{ 'loading' | i18n }}"
              aria-hidden="true"
              *ngIf="continuing"
@@ -41,7 +41,7 @@
            [disabled]="actionPromise"
          >
            <i
-              class="fa fa-spinner fa-spin"
+              class="bwi bwi-spinner bwi-spin"
              title="{{ 'loading' | i18n }}"
              aria-hidden="true"
              *ngIf="leaving"
--- a/src/app/accounts/set-password.component.html
+++ b/src/app/accounts/set-password.component.html
@@ -4,7 +4,7 @@
      <p class="lead text-center mb-4">{{ "setMasterPassword" | i18n }}</p>
      <div class="card d-block">
        <div class="card-body text-center" *ngIf="syncLoading">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          {{ "loading" | i18n }}
        </div>
        <div class="card-body" *ngIf="!syncLoading">
@@ -47,9 +47,9 @@
                  (click)="togglePassword(false)"
                >
                  <i
-                    class="fa fa-lg"
+                    class="bwi bwi-lg"
                    aria-hidden="true"
-                    [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
+                    [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
                  ></i>
                </button>
                <div class="progress-bar invisible"></div>
@@ -76,9 +76,9 @@
                (click)="togglePassword(true)"
              >
                <i
-                  class="fa fa-lg"
+                  class="bwi bwi-lg"
                  aria-hidden="true"
-                  [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
+                  [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
                ></i>
              </button>
            </div>
@@ -96,7 +96,7 @@
              [disabled]="form.loading"
            >
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/accounts/set-password.component.ts
+++ b/src/app/accounts/set-password.component.ts
@@ -1,6 +1,7 @@
 import { Component } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";

+import { SetPasswordComponent as BaseSetPasswordComponent } from "jslib-angular/components/set-password.component";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { CryptoService } from "jslib-common/abstractions/crypto.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
@@ -11,8 +12,6 @@ import { PolicyService } from "jslib-common/abstractions/policy.service";
 import { StateService } from "jslib-common/abstractions/state.service";
 import { SyncService } from "jslib-common/abstractions/sync.service";

-import { SetPasswordComponent as BaseSetPasswordComponent } from "jslib-angular/components/set-password.component";
-
@Component({
  selector: "app-set-password",
  templateUrl: "set-password.component.html",
--- a/src/app/accounts/sso.component.html
+++ b/src/app/accounts/sso.component.html
@@ -10,7 +10,7 @@
      <img class="logo mb-2 logo-themed" alt="Bitwarden" />
      <div class="card d-block mt-4">
        <div class="card-body" *ngIf="loggingIn">
-          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
          {{ "loading" | i18n }}
        </div>
        <div class="card-body" *ngIf="!loggingIn">
@@ -34,9 +34,9 @@
              class="btn btn-primary btn-block btn-submit"
              [disabled]="form.loading"
            >
-              <span> <i class="fa fa-sign-in" aria-hidden="true"></i> {{ "logIn" | i18n }} </span>
+              <span> <i class="bwi bwi-sign-in" aria-hidden="true"></i> {{ "logIn" | i18n }} </span>
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/accounts/sso.component.ts
+++ b/src/app/accounts/sso.component.ts
@@ -1,8 +1,8 @@
 import { Component } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
-
 import { first } from "rxjs/operators";

+import { SsoComponent as BaseSsoComponent } from "jslib-angular/components/sso.component";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { AuthService } from "jslib-common/abstractions/auth.service";
 import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service";
@@ -13,8 +13,6 @@ import { PasswordGenerationService } from "jslib-common/abstractions/passwordGen
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { StateService } from "jslib-common/abstractions/state.service";

-import { SsoComponent as BaseSsoComponent } from "jslib-angular/components/sso.component";
-
@Component({
  selector: "app-sso",
  templateUrl: "sso.component.html",
--- a/src/app/accounts/two-factor-options.component.ts
+++ b/src/app/accounts/two-factor-options.component.ts
@@ -1,11 +1,10 @@
 import { Component } from "@angular/core";
 import { Router } from "@angular/router";

-import { AuthService } from "jslib-common/abstractions/auth.service";
+import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "jslib-angular/components/two-factor-options.component";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-
-import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "jslib-angular/components/two-factor-options.component";
+import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service";

@Component({
  selector: "app-two-factor-options",
@@ -13,11 +12,11 @@ import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "jsli
 })
 export class TwoFactorOptionsComponent extends BaseTwoFactorOptionsComponent {
  constructor(
-    authService: AuthService,
+    twoFactorService: TwoFactorService,
    router: Router,
    i18nService: I18nService,
    platformUtilsService: PlatformUtilsService
  ) {
-    super(authService, router, i18nService, platformUtilsService, window);
+    super(twoFactorService, router, i18nService, platformUtilsService, window);
  }
 }
--- a/src/app/accounts/two-factor.component.html
+++ b/src/app/accounts/two-factor.component.html
@@ -94,7 +94,7 @@
            </div>
          </ng-container>
          <i
-            class="fa fa-spinner text-muted fa-spin pull-right"
+            class="bwi bwi-spinner text-muted bwi-spin pull-right"
            title="{{ 'loading' | i18n }}"
            *ngIf="form.loading && selectedProviderType === providerType.WebAuthn"
            aria-hidden="true"
@@ -127,10 +127,10 @@
              "
            >
              <span>
-                <i class="fa fa-sign-in" aria-hidden="true"></i> {{ "continue" | i18n }}
+                <i class="bwi bwi-sign-in" aria-hidden="true"></i> {{ "continue" | i18n }}
              </span>
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/accounts/two-factor.component.ts
+++ b/src/app/accounts/two-factor.component.ts
@@ -1,7 +1,8 @@
 import { Component, ViewChild, ViewContainerRef } from "@angular/core";
-
 import { ActivatedRoute, Router } from "@angular/router";

+import { TwoFactorComponent as BaseTwoFactorComponent } from "jslib-angular/components/two-factor.component";
+import { ModalService } from "jslib-angular/services/modal.service";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { AuthService } from "jslib-common/abstractions/auth.service";
 import { EnvironmentService } from "jslib-common/abstractions/environment.service";
@@ -9,13 +10,9 @@ import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { StateService } from "jslib-common/abstractions/state.service";
-
-import { ModalService } from "jslib-angular/services/modal.service";
-
+import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service";
 import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType";

-import { TwoFactorComponent as BaseTwoFactorComponent } from "jslib-angular/components/two-factor.component";
-
 import { TwoFactorOptionsComponent } from "./two-factor-options.component";

@Component({
@@ -36,7 +33,8 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
    environmentService: EnvironmentService,
    private modalService: ModalService,
    route: ActivatedRoute,
-    logService: LogService
+    logService: LogService,
+    twoFactorService: TwoFactorService
  ) {
    super(
      authService,
@@ -48,7 +46,8 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
      environmentService,
      stateService,
      route,
-      logService
+      logService,
+      twoFactorService
    );
    this.onSuccessfulLoginNavigate = this.goAfterLogIn;
  }
--- a/src/app/accounts/update-password.component.html
+++ b/src/app/accounts/update-password.component.html
@@ -0,0 +1,90 @@
+<form #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate autocomplete="off">
+  <div class="row justify-content-md-center mt-5">
+    <div class="col-4">
+      <p class="lead text-center mb-4">{{ "updateMasterPassword" | i18n }}</p>
+      <div class="card d-block">
+        <div class="card-body">
+          <app-callout type="warning">{{ "masterPasswordInvalidWarning" | i18n }} </app-callout>
+          <app-callout
+            type="info"
+            [enforcedPolicyOptions]="enforcedPolicyOptions"
+            *ngIf="enforcedPolicyOptions"
+          ></app-callout>
+
+          <form
+            #form
+            (ngSubmit)="submit()"
+            [appApiAction]="formPromise"
+            ngNativeValidate
+            autocomplete="off"
+          >
+            <div class="row">
+              <div class="col-6">
+                <div class="form-group">
+                  <label for="currentMasterPassword">{{ "currentMasterPass" | i18n }}</label>
+                  <input
+                    id="currentMasterPassword"
+                    type="password"
+                    name="MasterPasswordHash"
+                    class="form-control"
+                    [(ngModel)]="currentMasterPassword"
+                    required
+                    appInputVerbatim
+                  />
+                </div>
+              </div>
+            </div>
+            <div class="row">
+              <div class="col-6">
+                <div class="form-group">
+                  <label for="newMasterPassword">{{ "newMasterPass" | i18n }}</label>
+                  <input
+                    id="newMasterPassword"
+                    type="password"
+                    name="NewMasterPasswordHash"
+                    class="form-control mb-1"
+                    [(ngModel)]="masterPassword"
+                    (input)="updatePasswordStrength()"
+                    required
+                    appInputVerbatim
+                    autocomplete="new-password"
+                  />
+                  <app-password-strength
+                    [score]="masterPasswordScore"
+                    [showText]="true"
+                  ></app-password-strength>
+                </div>
+              </div>
+              <div class="col-6">
+                <div class="form-group">
+                  <label for="masterPasswordRetype">{{ "confirmNewMasterPass" | i18n }}</label>
+                  <input
+                    id="masterPasswordRetype"
+                    type="password"
+                    name="MasterPasswordRetype"
+                    class="form-control"
+                    [(ngModel)]="masterPasswordRetype"
+                    required
+                    appInputVerbatim
+                    autocomplete="new-password"
+                  />
+                </div>
+              </div>
+            </div>
+            <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+              <i
+                class="fa fa-spinner fa-spin"
+                title="{{ 'loading' | i18n }}"
+                aria-hidden="true"
+              ></i>
+              <span>{{ "changeMasterPassword" | i18n }}</span>
+            </button>
+            <button (click)="cancel()" type="button" class="btn btn-outline-secondary">
+              <span>{{ "cancel" | i18n }}</span>
+            </button>
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
+</form>
--- a/src/app/accounts/update-password.component.ts
+++ b/src/app/accounts/update-password.component.ts
@@ -0,0 +1,48 @@
+import { Component } from "@angular/core";
+import { Router } from "@angular/router";
+
+import { UpdatePasswordComponent as BaseUpdatePasswordComponent } from "jslib-angular/components/update-password.component";
+import { ApiService } from "jslib-common/abstractions/api.service";
+import { CryptoService } from "jslib-common/abstractions/crypto.service";
+import { I18nService } from "jslib-common/abstractions/i18n.service";
+import { LogService } from "jslib-common/abstractions/log.service";
+import { MessagingService } from "jslib-common/abstractions/messaging.service";
+import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service";
+import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
+import { PolicyService } from "jslib-common/abstractions/policy.service";
+import { StateService } from "jslib-common/abstractions/state.service";
+import { UserVerificationService } from "jslib-common/abstractions/userVerification.service";
+
+@Component({
+  selector: "app-update-password",
+  templateUrl: "update-password.component.html",
+})
+export class UpdatePasswordComponent extends BaseUpdatePasswordComponent {
+  constructor(
+    router: Router,
+    i18nService: I18nService,
+    platformUtilsService: PlatformUtilsService,
+    passwordGenerationService: PasswordGenerationService,
+    policyService: PolicyService,
+    cryptoService: CryptoService,
+    messagingService: MessagingService,
+    apiService: ApiService,
+    logService: LogService,
+    stateService: StateService,
+    userVerificationService: UserVerificationService
+  ) {
+    super(
+      router,
+      i18nService,
+      platformUtilsService,
+      passwordGenerationService,
+      policyService,
+      cryptoService,
+      messagingService,
+      apiService,
+      stateService,
+      userVerificationService,
+      logService
+    );
+  }
+}
--- a/src/app/accounts/update-temp-password.component.html
+++ b/src/app/accounts/update-temp-password.component.html
@@ -36,9 +36,9 @@
                  (click)="togglePassword(false)"
                >
                  <i
-                    class="fa fa-lg"
+                    class="bwi bwi-lg"
                    aria-hidden="true"
-                    [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
+                    [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
                  ></i>
                </button>
                <div class="progress-bar invisible"></div>
@@ -64,9 +64,9 @@
                (click)="togglePassword(true)"
              >
                <i
-                  class="fa fa-lg"
+                  class="bwi bwi-lg"
                  aria-hidden="true"
-                  [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
+                  [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
                ></i>
              </button>
            </div>
@@ -84,7 +84,7 @@
              [disabled]="form.loading"
            >
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/accounts/update-temp-password.component.ts
+++ b/src/app/accounts/update-temp-password.component.ts
@@ -1,5 +1,6 @@
 import { Component } from "@angular/core";

+import { UpdateTempPasswordComponent as BaseUpdateTempPasswordComponent } from "jslib-angular/components/update-temp-password.component";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { CryptoService } from "jslib-common/abstractions/crypto.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
@@ -8,10 +9,8 @@ import { MessagingService } from "jslib-common/abstractions/messaging.service";
 import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { PolicyService } from "jslib-common/abstractions/policy.service";
-import { SyncService } from "jslib-common/abstractions/sync.service";
-
-import { UpdateTempPasswordComponent as BaseUpdateTempPasswordComponent } from "jslib-angular/components/update-temp-password.component";
 import { StateService } from "jslib-common/abstractions/state.service";
+import { SyncService } from "jslib-common/abstractions/sync.service";

@Component({
  selector: "app-update-temp-password",
--- a/src/app/accounts/verify-email-token.component.html
+++ b/src/app/accounts/verify-email-token.component.html
@@ -3,7 +3,7 @@
    <img class="mb-4 logo logo-themed" alt="Bitwarden" />
    <p class="text-center">
      <i
-        class="fa fa-spinner fa-spin fa-2x text-muted"
+        class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
        title="{{ 'loading' | i18n }}"
        aria-hidden="true"
      ></i>
--- a/src/app/accounts/verify-email-token.component.ts
+++ b/src/app/accounts/verify-email-token.component.ts
@@ -1,6 +1,5 @@
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
-
 import { first } from "rxjs/operators";

 import { ApiService } from "jslib-common/abstractions/api.service";
@@ -8,7 +7,6 @@ import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { StateService } from "jslib-common/abstractions/state.service";
-
 import { VerifyEmailRequest } from "jslib-common/models/request/verifyEmailRequest";

@Component({
--- a/src/app/accounts/verify-recover-delete.component.html
+++ b/src/app/accounts/verify-recover-delete.component.html
@@ -18,7 +18,7 @@
            >
              <span>{{ "deleteAccount" | i18n }}</span>
              <i
-                class="fa fa-spinner fa-spin"
+                class="bwi bwi-spinner bwi-spin"
                title="{{ 'loading' | i18n }}"
                aria-hidden="true"
              ></i>
--- a/src/app/accounts/verify-recover-delete.component.ts
+++ b/src/app/accounts/verify-recover-delete.component.ts
@@ -1,13 +1,11 @@
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
-
 import { first } from "rxjs/operators";

 import { ApiService } from "jslib-common/abstractions/api.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-
 import { VerifyDeleteRecoverRequest } from "jslib-common/models/request/verifyDeleteRecoverRequest";

@Component({
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -21,14 +21,10 @@ import { PolicyService } from "jslib-common/abstractions/policy.service";
 import { SearchService } from "jslib-common/abstractions/search.service";
 import { SettingsService } from "jslib-common/abstractions/settings.service";
 import { StateService } from "jslib-common/abstractions/state.service";
-import { StorageService } from "jslib-common/abstractions/storage.service";
 import { SyncService } from "jslib-common/abstractions/sync.service";
 import { TokenService } from "jslib-common/abstractions/token.service";
 import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service";

-import { PolicyListService } from "./services/policy-list.service";
-import { RouterService } from "./services/router.service";
-
 import { DisableSendPolicy } from "./organizations/policies/disable-send.component";
 import { MasterPasswordPolicy } from "./organizations/policies/master-password.component";
 import { PasswordGeneratorPolicy } from "./organizations/policies/password-generator.component";
@@ -38,6 +34,8 @@ import { ResetPasswordPolicy } from "./organizations/policies/reset-password.com
 import { SendOptionsPolicy } from "./organizations/policies/send-options.component";
 import { SingleOrgPolicy } from "./organizations/policies/single-org.component";
 import { TwoFactorAuthenticationPolicy } from "./organizations/policies/two-factor-authentication.component";
+import { PolicyListService } from "./services/policy-list.service";
+import { RouterService } from "./services/router.service";

 const BroadcasterSubscriptionId = "AppComponent";
 const IdleTimeout = 60000 * 10; // 10 minutes
@@ -117,7 +115,7 @@ export class AppComponent implements OnDestroy, OnInit {
            break;
          case "syncCompleted":
            break;
-          case "upgradeOrganization":
+          case "upgradeOrganization": {
            const upgradeConfirmed = await this.platformUtilsService.showDialog(
              this.i18nService.t("upgradeOrganizationDesc"),
              this.i18nService.t("upgradeOrganization"),
@@ -133,7 +131,8 @@ export class AppComponent implements OnDestroy, OnInit {
              ]);
            }
            break;
-          case "premiumRequired":
+          }
+          case "premiumRequired": {
            const premiumConfirmed = await this.platformUtilsService.showDialog(
              this.i18nService.t("premiumRequiredDesc"),
              this.i18nService.t("premiumRequired"),
@@ -144,7 +143,8 @@ export class AppComponent implements OnDestroy, OnInit {
              this.router.navigate(["settings/premium"]);
            }
            break;
-          case "emailVerificationRequired":
+          }
+          case "emailVerificationRequired": {
            const emailVerificationConfirmed = await this.platformUtilsService.showDialog(
              this.i18nService.t("emailVerificationRequiredDesc"),
              this.i18nService.t("emailVerificationRequired"),
@@ -153,10 +153,11 @@ export class AppComponent implements OnDestroy, OnInit {
            );
            if (emailVerificationConfirmed) {
              this.platformUtilsService.launchUri(
-                "https://bitwarden.com/help/article/create-bitwarden-account/"
+                "https://bitwarden.com/help/create-bitwarden-account/"
              );
            }
            break;
+          }
          case "showToast":
            this.showToast(message);
            break;
@@ -164,7 +165,6 @@ export class AppComponent implements OnDestroy, OnInit {
            this.setFullWidth();
            break;
          case "convertAccountToKeyConnector":
-            this.keyConnectorService.setConvertAccountRequired(true);
            this.router.navigate(["/remove-password"]);
            break;
          default:
@@ -211,7 +211,6 @@ export class AppComponent implements OnDestroy, OnInit {
    await Promise.all([
      this.eventService.clearEvents(),
      this.syncService.setLastSync(new Date(0)),
-      this.tokenService.clearToken(),
      this.cryptoService.clearKeys(),
      this.settingsService.clear(userId),
      this.cipherService.clear(userId),
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,9 +1,8 @@
-import { InfiniteScrollModule } from "ngx-infinite-scroll";
-
 import { DragDropModule } from "@angular/cdk/drag-drop";
 import { NgModule } from "@angular/core";
 import { FormsModule } from "@angular/forms";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
+import { InfiniteScrollModule } from "ngx-infinite-scroll";

 import { BitwardenToastModule } from "jslib-angular/components/toastr.component";

--- a/src/app/common/base.accept.component.ts
+++ b/src/app/common/base.accept.component.ts
@@ -1,6 +1,5 @@
 import { Directive, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
-
 import { first } from "rxjs/operators";

 import { I18nService } from "jslib-common/abstractions/i18n.service";
@@ -60,9 +59,7 @@ export abstract class BaseAcceptComponent implements OnInit {
          errorMessage != null
            ? this.i18nService.t(this.failedShortMessage, errorMessage)
            : this.i18nService.t(this.failedMessage);
-        this.platformUtilService.showToast("error", null, message, {
-          timeout: 10000,
-        });
+        this.platformUtilService.showToast("error", null, message, { timeout: 10000 });
        this.router.navigate(["/"]);
      }

--- a/src/app/common/base.events.component.ts
+++ b/src/app/common/base.events.component.ts
@@ -4,11 +4,9 @@ import { ExportService } from "jslib-common/abstractions/export.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-
-import { EventView } from "jslib-common/models/view/eventView";
-
 import { EventResponse } from "jslib-common/models/response/eventResponse";
 import { ListResponse } from "jslib-common/models/response/listResponse";
+import { EventView } from "jslib-common/models/view/eventView";

 import { EventService } from "src/app/services/event.service";

@@ -19,7 +17,7 @@ export abstract class BaseEventsComponent {
  events: EventView[];
  start: string;
  end: string;
-  dirtyDates: boolean = true;
+  dirtyDates = true;
  continuationToken: string;
  refreshPromise: Promise<any>;
  exportPromise: Promise<any>;
@@ -110,13 +108,7 @@ export abstract class BaseEventsComponent {
    endDate: string,
    continuationToken: string
  ): Promise<ListResponse<EventResponse>>;
-  protected abstract getUserName(
-    r: EventResponse,
-    userId: string
-  ): {
-    name: string;
-    email: string;
-  };
+  protected abstract getUserName(r: EventResponse, userId: string): { name: string; email: string };

  protected async loadAndParseEvents(
    startDate: string,
@@ -144,10 +136,7 @@ export abstract class BaseEventsComponent {
        });
      })
    );
-    return {
-      continuationToken: response.continuationToken,
-      events: events,
-    };
+    return { continuationToken: response.continuationToken, events: events };
  }

  protected parseDates() {
@@ -181,13 +170,6 @@ export abstract class BaseEventsComponent {

    const data = await this.exportService.getEventExport(events);
    const fileName = this.exportService.getFileName(this.exportFileName, "csv");
-    this.platformUtilsService.saveFile(
-      window,
-      data,
-      {
-        type: "text/plain",
-      },
-      fileName
-    );
+    this.platformUtilsService.saveFile(window, data, { type: "text/plain" }, fileName);
  }
 }
--- a/src/app/common/base.people.component.ts
+++ b/src/app/common/base.people.component.ts
@@ -1,5 +1,9 @@
 import { Directive, ViewChild, ViewContainerRef } from "@angular/core";

+import { SearchPipe } from "jslib-angular/pipes/search.pipe";
+import { UserNamePipe } from "jslib-angular/pipes/user-name.pipe";
+import { ModalService } from "jslib-angular/services/modal.service";
+import { ValidationService } from "jslib-angular/services/validation.service";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { CryptoService } from "jslib-common/abstractions/crypto.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
@@ -7,24 +11,15 @@ import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { SearchService } from "jslib-common/abstractions/search.service";
 import { StateService } from "jslib-common/abstractions/state.service";
-
-import { ModalService } from "jslib-angular/services/modal.service";
-import { ValidationService } from "jslib-angular/services/validation.service";
-
-import { SearchPipe } from "jslib-angular/pipes/search.pipe";
-import { UserNamePipe } from "jslib-angular/pipes/user-name.pipe";
-
 import { OrganizationUserStatusType } from "jslib-common/enums/organizationUserStatusType";
 import { OrganizationUserType } from "jslib-common/enums/organizationUserType";
 import { ProviderUserStatusType } from "jslib-common/enums/providerUserStatusType";
 import { ProviderUserType } from "jslib-common/enums/providerUserType";
-
+import { Utils } from "jslib-common/misc/utils";
 import { ListResponse } from "jslib-common/models/response/listResponse";
 import { OrganizationUserUserDetailsResponse } from "jslib-common/models/response/organizationUserResponse";
 import { ProviderUserUserDetailsResponse } from "jslib-common/models/response/provider/providerUserResponse";

-import { Utils } from "jslib-common/misc/utils";
-
 import { UserConfirmComponent } from "../organizations/manage/user-confirm.component";

 type StatusType = OrganizationUserStatusType | ProviderUserStatusType;
@@ -35,10 +30,7 @@ const MaxCheckedCount = 500;
 export abstract class BasePeopleComponent<
  UserType extends ProviderUserUserDetailsResponse | OrganizationUserUserDetailsResponse
 > {
-  @ViewChild("confirmTemplate", {
-    read: ViewContainerRef,
-    static: true,
-  })
+  @ViewChild("confirmTemplate", { read: ViewContainerRef, static: true })
  confirmModalRef: ViewContainerRef;

  get allCount() {
--- a/src/app/components/nested-checkbox.component.ts
+++ b/src/app/components/nested-checkbox.component.ts
@@ -1,4 +1,5 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
+
 import { Utils } from "jslib-common/misc/utils";

@Component({
@@ -6,18 +7,10 @@ import { Utils } from "jslib-common/misc/utils";
  templateUrl: "nested-checkbox.component.html",
 })
 export class NestedCheckboxComponent {
-  @Input()
-  parentId: string;
-  @Input()
-  checkboxes: {
-    id: string;
-    get: () => boolean;
-    set: (v: boolean) => void;
-  }[];
-  @Output()
-  onSavedUser = new EventEmitter();
-  @Output()
-  onDeletedUser = new EventEmitter();
+  @Input() parentId: string;
+  @Input() checkboxes: { id: string; get: () => boolean; set: (v: boolean) => void }[];
+  @Output() onSavedUser = new EventEmitter();
+  @Output() onDeletedUser = new EventEmitter();

  get parentIndeterminate() {
    return !this.parentChecked && this.checkboxes.some((c) => c.get());
--- a/src/app/components/password-reprompt.component.html
+++ b/src/app/components/password-reprompt.component.html
@@ -32,12 +32,9 @@
              (click)="togglePassword()"
            >
              <i
-                class="fa fa-lg"
+                class="bwi bwi-lg"
                aria-hidden="true"
-                [ngClass]="{
-                  'fa-eye': !showPassword,
-                  'fa-eye-slash': showPassword
-                }"
+                [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
              ></i>
            </button>
          </div>
--- a/src/app/components/password-strength.component.html
+++ b/src/app/components/password-strength.component.html
@@ -2,9 +2,7 @@
  <div
    class="progress-bar {{ color }}"
    role="progressbar"
-    [ngStyle]="{
-      width: scoreWidth + '%'
-    }"
+    [ngStyle]="{ width: scoreWidth + '%' }"
    attr.aria-valuenow="{{ scoreWidth }}"
    aria-valuemin="0"
    aria-valuemax="100"
--- a/src/app/components/password-strength.component.ts
+++ b/src/app/components/password-strength.component.ts
@@ -7,10 +7,8 @@ import { I18nService } from "jslib-common/abstractions/i18n.service";
  templateUrl: "password-strength.component.html",
 })
 export class PasswordStrengthComponent implements OnChanges {
-  @Input()
-  score?: number;
-  @Input()
-  showText = false;
+  @Input() score?: number;
+  @Input() showText = false;

  scoreWidth = 0;
  color = "bg-danger";
--- a/src/app/layouts/footer.component.html
+++ b/src/app/layouts/footer.component.html
@@ -1,9 +1,6 @@
 <div class="container footer text-muted">
  <div class="row">
-    <div class="col">
-      &copy;
-      {{ year }}, Bitwarden Inc.
-    </div>
+    <div class="col">&copy; {{ year }}, Bitwarden Inc.</div>
    <div class="col text-center"></div>
    <div class="col text-right">
      {{ "versionNumber" | i18n: version }}
--- a/src/app/layouts/footer.component.ts
+++ b/src/app/layouts/footer.component.ts
@@ -8,7 +8,7 @@ import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.se
 })
 export class FooterComponent implements OnInit {
  version: string;
-  year: string = "2015";
+  year = "2015";

  constructor(private platformUtilsService: PlatformUtilsService) {}

--- a/src/app/layouts/frontend-layout.component.html
+++ b/src/app/layouts/frontend-layout.component.html
@@ -1,7 +1,5 @@
 <router-outlet></router-outlet>
 <div class="container my-5 text-muted text-center">
-  &copy;
-  {{ year }}, Bitwarden Inc.
-  <br />
+  &copy; {{ year }}, Bitwarden Inc. <br />
  {{ "versionNumber" | i18n: version }}
 </div>
--- a/src/app/layouts/frontend-layout.component.ts
+++ b/src/app/layouts/frontend-layout.component.ts
@@ -8,7 +8,7 @@ import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.se
 })
 export class FrontendLayoutComponent implements OnInit, OnDestroy {
  version: string;
-  year: string = "2015";
+  year = "2015";

  constructor(private platformUtilsService: PlatformUtilsService) {}

--- a/src/app/layouts/navbar.component.html
+++ b/src/app/layouts/navbar.component.html
@@ -1,12 +1,7 @@
-<nav
-  class="navbar navbar-expand navbar-dark"
-  [ngClass]="{
-    'nav-background-alt': selfHosted
-  }"
->
+<nav class="navbar navbar-expand navbar-dark" [ngClass]="{ 'nav-background-alt': selfHosted }">
  <div class="container">
    <a class="navbar-brand" routerLink="/" appA11yTitle="{{ 'pageTitle' | i18n: 'Bitwarden' }}">
-      <i class="fa fa-shield" aria-hidden="true"></i>
+      <i class="bwi bwi-shield" aria-hidden="true"></i>
    </a>
    <div class="collapse navbar-collapse">
      <ul class="navbar-nav">
@@ -44,7 +39,7 @@
          aria-haspopup="true"
          aria-expanded="false"
        >
-          <i class="fa fa-user-circle fa-lg" aria-hidden="true"></i>
+          <i class="bwi bwi-user-circle bwi-lg" aria-hidden="true"></i>
        </a>
        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="nav-profile">
          <div class="dropdown-item-text d-flex align-items-center" *ngIf="name" appStopProp>
@@ -62,11 +57,16 @@
          </div>
          <div class="dropdown-divider"></div>
          <a class="dropdown-item" href="#" routerLink="/settings/account">
-            <i class="fa fa-fw fa-user" aria-hidden="true"></i>
+            <i class="bwi bwi-fw bwi-user" aria-hidden="true"></i>
            {{ "myAccount" | i18n }}
          </a>
-          <a class="dropdown-item" href="https://help.bitwarden.com" target="_blank" rel="noopener">
-            <i class="fa fa-fw fa-question-circle" aria-hidden="true"></i>
+          <a
+            class="dropdown-item"
+            href="https://bitwarden.com/help/"
+            target="_blank"
+            rel="noopener"
+          >
+            <i class="bwi bwi-fw bwi-question-circle" aria-hidden="true"></i>
            {{ "getHelp" | i18n }}
          </a>
          <a
@@ -75,16 +75,16 @@
            target="_blank"
            rel="noopener"
          >
-            <i class="fa fa-fw fa-download" aria-hidden="true"></i>
+            <i class="bwi bwi-fw bwi-download" aria-hidden="true"></i>
            {{ "getApps" | i18n }}
          </a>
          <div class="dropdown-divider"></div>
          <button type="button" class="dropdown-item" (click)="lock()">
-            <i class="fa fa-fw fa-lock" aria-hidden="true"></i>
+            <i class="bwi bwi-fw bwi-lock" aria-hidden="true"></i>
            {{ "lockNow" | i18n }}
          </button>
          <button type="button" class="dropdown-item" (click)="logOut()">
-            <i class="fa fa-fw fa-sign-out" aria-hidden="true"></i>
+            <i class="bwi bwi-fw bwi-sign-out" aria-hidden="true"></i>
            {{ "logOut" | i18n }}
          </button>
        </div>
--- a/src/app/layouts/navbar.component.ts
+++ b/src/app/layouts/navbar.component.ts
@@ -5,7 +5,6 @@ import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.se
 import { ProviderService } from "jslib-common/abstractions/provider.service";
 import { SyncService } from "jslib-common/abstractions/sync.service";
 import { TokenService } from "jslib-common/abstractions/token.service";
-
 import { Provider } from "jslib-common/models/domain/provider";

@Component({
--- a/src/app/layouts/organization-layout.component.html
+++ b/src/app/layouts/organization-layout.component.html
@@ -13,7 +13,7 @@
          *ngIf="!organization.enabled"
        >
          <div class="card-body py-2">
-            <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+            <i class="bwi bwi-exclamation-triangle" aria-hidden="true"></i>
            {{ "organizationIsDisabled" | i18n }}
          </div>
        </div>
@@ -22,7 +22,7 @@
          *ngIf="organization.isProviderUser"
        >
          <div class="card-body py-2">
-            <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+            <i class="bwi bwi-exclamation-triangle" aria-hidden="true"></i>
            {{ "accessingUsingProvider" | i18n: organization.providerName }}
          </div>
        </div>
@@ -30,25 +30,25 @@
      <ul class="nav nav-tabs" *ngIf="showMenuBar">
        <li class="nav-item">
          <a class="nav-link" routerLink="vault" routerLinkActive="active">
-            <i class="fa fa-lock" aria-hidden="true"></i>
+            <i class="bwi bwi-lock" aria-hidden="true"></i>
            {{ "vault" | i18n }}
          </a>
        </li>
        <li class="nav-item" *ngIf="showManageTab">
          <a class="nav-link" [routerLink]="manageRoute" routerLinkActive="active">
-            <i class="fa fa-sliders" aria-hidden="true"></i>
+            <i class="bwi bwi-sliders" aria-hidden="true"></i>
            {{ "manage" | i18n }}
          </a>
        </li>
        <li class="nav-item" *ngIf="showToolsTab">
          <a class="nav-link" [routerLink]="toolsRoute" routerLinkActive="active">
-            <i class="fa fa-wrench" aria-hidden="true"></i>
+            <i class="bwi bwi-wrench" aria-hidden="true"></i>
            {{ "tools" | i18n }}
          </a>
        </li>
        <li class="nav-item" *ngIf="organization.isOwner">
          <a class="nav-link" routerLink="settings" routerLinkActive="active">
-            <i class="fa fa-cogs" aria-hidden="true"></i>
+            <i class="bwi bwi-cogs" aria-hidden="true"></i>
            {{ "settings" | i18n }}
          </a>
        </li>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snyk-bot	09e537ccde	fix: package.json & package-lock.json to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-NODEFORGE-2330875 - https://snyk.io/vuln/SNYK-JS-NODEFORGE-2331908	2022-02-24 11:10:17 +00:00
Oscar Hinton	1c495e87c9	Add eslint (#1437 )	2022-02-24 12:10:07 +01:00
Oscar Hinton	01f128a4a9	Remove dotnet restore (#1493 )	2022-02-22 16:22:45 +01:00
Oscar Hinton	a4d5b145ac	Exclude connectors from CSP rules (#1489 )	2022-02-22 15:46:59 +01:00
Chad Scharf	d944e0e25c	We're Hiring (#1492 ) Added link to README.md for Bitwarden Careers page.	2022-02-22 14:04:06 +01:00
Vincent Salucci	d141ccca52	[Icons Bug] fa-remove -> bwi-close (#1487 )	2022-02-20 17:03:58 -06:00
Micaiah Martin	9e872bed2c	Create initial workflow (#1482 )	2022-02-18 13:28:53 -06:00
github-actions[bot]	c071b692f2	Autosync the updated translations (#1486 ) Co-authored-by: github-actions <>	2022-02-18 10:24:33 +01:00
Matt Gibson	041bb1bf0a	Enforce Hold label (#1478 ) * Enforce Hold label * Linting Co-authored-by: Micaiah Martin <77340197+mimartin12@users.noreply.github.com>	2022-02-16 08:43:56 -06:00
Thomas Rittson	0b5e1eb256	Exclude jslib from prettier hook (#1458 ) * Exclude jslib from prettier hook	2022-02-16 07:41:41 +10:00
Addison Beck	8c39fdb21e	[lib] Update jslib (#1479 )	2022-02-15 15:05:49 -05:00
Addison Beck	ca3efc8fee	[bug] Disable state cache (#1477 )	2022-02-14 12:26:22 -05:00
github-actions[bot]	c323f38f16	Autosync the updated translations (#1461 ) Co-authored-by: github-actions <>	2022-02-11 22:48:28 +01:00
Addison Beck	9df4eb4c0d	[bug] Store last sync in memory (#1471 )	2022-02-11 03:39:48 -05:00
Addison Beck	1712ed53be	[bug] Store vault data in memory (#1470 )	2022-02-11 09:21:51 +01:00
github-actions[bot]	45a39f6200	Bumped version to 2.26.1 (#1468 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2022-02-10 21:51:45 -08:00
Thomas Rittson	a2d241263b	Update jslib (#1466 )	2022-02-11 00:30:37 -05:00
Thomas Rittson	5987d3deda	Update jslib (#1465 )	2022-02-11 14:58:33 +10:00
Thomas Rittson	080a3c655e	Update jslib (#1464 )	2022-02-11 14:30:07 +10:00
Justin Baur	dac48242b7	Update jslib (#1462 )	2022-02-10 22:16:44 -05:00
Robyn MacCallum	e4d9ab52a0	update jslib (#1460 ) * update jslib * Remove call to tokenService.clear() from logout	2022-02-10 19:51:36 -05:00
Thomas Rittson	aee8a2661e	Fix Copy Verification Code not showing after first log in (#1459 ) * Move init logic to load()	2022-02-11 09:48:54 +10:00
Robyn MacCallum	ff6bb236c0	Update jslib (#1457 )	2022-02-10 14:22:44 -05:00
Vincent Salucci	f79b20294a	[Help] Update links to new pattern (#1454 ) * [Help] Update links to new pattern * Close help * Update jslib	2022-02-08 17:44:47 -06:00
github-actions[bot]	3a0c34b934	Bump version to 2.26.0 (#1452 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2022-02-08 15:54:35 -07:00
github-actions[bot]	e09df347f4	Bump version to 1.26.0 (#1450 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2022-02-08 14:46:12 -07:00
Oscar Hinton	e68ab0031d	Client & Version headers (#1434 )	2022-02-08 13:22:31 +01:00
Justin Baur	64416c9406	Send in error message (#1449 )	2022-02-07 16:15:49 -05:00
Matt Gibson	6779adb064	Handle password protected import export (#1448 ) This updates requirements without implementing any way for the UI to interact with the new feature	2022-02-07 14:15:22 -06:00
Thomas Rittson	1b28a4b954	Update client for authService refactor (#1387 ) Co-authored-by: Hinton <oscar@oscarhinton.com>	2022-02-07 20:24:49 +01:00
Addison Beck	6320498fb3	[chore] Update jslib (#1447 )	2022-02-07 12:04:51 -05:00
Oscar Hinton	bfd5f3e564	Fix register button using wrong icon (#1446 )	2022-02-07 12:28:28 +01:00
Thomas Rittson	c755443735	Make husky pre-commit hook executable (#1432 )	2022-02-07 12:18:33 +10:00
Justin Baur	0e5f2530a9	Switch option values to be a number (#1444 )	2022-02-04 16:59:20 -05:00
Vincent Salucci	5105633fa4	[Icons] Fix button icon/text margins (#1443 )	2022-02-04 13:49:44 -06:00
github-actions[bot]	e975056c21	Autosync the updated translations (#1441 ) Co-authored-by: github-actions <>	2022-02-04 12:48:56 +01:00
Daniel James Smith	be21167ef8	Pull jslib for https://github.com/bitwarden/jslib/pull/654 (#1439 )	2022-02-03 23:44:28 +01:00
Addison Beck	e09898e4d8	Update jslib (#1436 )	2022-02-03 13:54:15 -05:00
Vincent Salucci	868d235faa	[Icons] FF - requested icon changes (#1435 ) * [Icons] Removed FA * Icon changes // Webpack correction // Padding updates	2022-02-03 10:20:31 -06:00
Oscar Hinton	5c764a95f4	Add CSP for development (#1431 )	2022-02-03 10:17:33 +01:00
Jake Fink	596c3e86e9	Master password policy is not checked when accepting invite from an existing account (#1371 ) * validate password against org policy and create update-password component * linting and prettier * [bug] Default rememberEmail to true (#1429) * switching the dashes to underscores for the branch name (#1433) (cherry picked from commit `8910430dfb`) * fix merge conflicts * Update src/app/accounts/update-password.component.html Co-authored-by: Justin Baur <admin@justinbaur.com> * Update src/locales/en/messages.json Co-authored-by: Justin Baur <admin@justinbaur.com> * update jslib * prettier Co-authored-by: Addison Beck <abeck@bitwarden.com> Co-authored-by: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Co-authored-by: Justin Baur <admin@justinbaur.com>	2022-02-03 00:00:57 -05:00
Addison Beck	8030da2ed5	[bug] Default rememberEmail to true (#1429 )	2022-02-02 11:20:15 -05:00
Joseph Flinn	8910430dfb	switching the dashes to underscores for the branch name (#1433 )	2022-02-02 07:30:19 -08:00
Joseph Flinn	6bf6d4b47f	Reverting tis change for next release (#1430 )	2022-02-02 06:22:25 -08:00
Oscar Hinton	ca199a398e	Fix captcha and webauthn-fallback not using theme_light (#1427 )	2022-02-01 15:46:16 +01:00
Chad Scharf	61ab2fbda3	Hide unsolicited SSO option in config (#1425 )	2022-01-31 17:43:56 -05:00
Addison Beck	d79f074825	[bug] Extend GlobalState to supply correct default theme (#1422 ) * [bug] Extend GlobalState to supply correct default theme The default theme for most clients is System, but web uses Light. We need to extend GlobalState in web to reflect this. * [chore] Update jslib	2022-01-31 14:53:55 -05:00
Oscar Hinton	e3b962a779	Apply prettier on help pr (#1423 )	2022-01-31 20:31:50 +01:00
DanHillesheim	cc657eb853	Update help site URLs (#1409 )	2022-01-31 20:11:27 +01:00
DanHillesheim	e14a266ee0	Registration page updates (#1390 ) Co-authored-by: Hinton <oscar@oscarhinton.com>	2022-01-31 20:10:35 +01:00
Thomas Rittson	e1732cfa10	Fix various bugs in Options page (#1418 ) * Remove duplicate message in toast * Set starting variables properly	2022-01-31 09:11:25 -05:00
Addison Beck	ce1ae208d1	[bug] Update theme.js to refelect new storage structure (#1416 ) * [bug] Update theme.js to refelect new storage structure * [bug] Remove unecassary defaults	2022-01-28 11:30:45 -05:00
Addison Beck	6996b06fa2	[chore] Update jslib (#1415 )	2022-01-28 09:07:33 -05:00
github-actions[bot]	dc503d3461	Autosync the updated translations (#1414 ) Co-authored-by: github-actions <>	2022-01-28 11:06:25 +01:00
Daniel James Smith	d95db8fb74	BEEEP: Add importer for Keeper in json format (#1392 ) * Updated instructions to export a csv file from Keeper * Add instructions to export a json file from Keeper * Bump jslib to include Keeper json importer * Revert change to README.md * Pull in jslib	2022-01-27 21:51:56 +01:00
Justin Baur	1a219daa12	Remove F4E vault card (#1413 ) * Remove F4E card from vault page * Remove unneeded property	2022-01-27 15:47:56 -05:00
Vincent Salucci	2ae98887b7	[Icons] Update Font Sheet (#1343 ) * [Icons] Update to new font sheet * Rebased - updated all icon remaining icon references * Temporarily Updating gitmodules branch * Fixed class reference * Revert temporary gitmodule branch * Icon updates/changes * Pull jslib m-icon-updates latest * Prettier * Update jslib to master * Reset jslib to master * Removed obsolete variable reference, replaced bolt references * Removed all instances of base class - maps create automatically * Updated toast icon references * Imported styles to reference variable/map * Reverted to using base class * Update jslib * Rename eye-2 to eye and eye-slash-2 to eye-slash * Bump jslib * Remove duplicate scss * Remove old fa * Update fallback image * Bump jslib * Rename eye-2 to eye, and eye-slash-2 to eye-slash * Fix 404 * Fix integrity of bootstrap.min.css * Fix callout missing bwi * Add bwi to change-kdf * Remove bwi from callout again * Bump jslib Co-authored-by: Hinton <oscar@oscarhinton.com>	2022-01-27 11:25:58 -06:00
Joseph Flinn	f0c47252e4	Updating the base Docker image for testing purposes (#1411 )	2022-01-27 07:25:13 -08:00
Danny Murphy	2ffe3bd6ad	Cleanup of the SCSS Variables (#1255 ) * Clean up variable names and comments * Fix Option Colour - issue #1338 * Update old scss variable name Co-authored-by: Thomas Rittson <trittson@bitwarden.com>	2022-01-26 14:54:15 +10:00
Oscar Hinton	f387a4d469	Remove old u2f connector (#1406 )	2022-01-21 15:00:53 +01:00
github-actions[bot]	a0f1b4dd0d	Autosync the updated translations (#1404 ) Co-authored-by: github-actions <>	2022-01-21 11:53:09 +01:00
Thomas Rittson	84a65edc08	Move keyConnectorService call to syncService (#1405 )	2022-01-21 19:33:09 +10:00
Addison Beck	caad11c571	[chore] Update jslib (#1403 )	2022-01-20 09:38:34 -05:00
Daniel James Smith	b73449159d	Update copy on fingerprint phrase prompt (#1399 )	2022-01-20 10:07:47 +01:00
Oscar Hinton	bf48434d0f	Rename package to @bitwarden/web-vault (#1396 )	2022-01-17 17:23:14 +01:00
Oscar Hinton	b6d2d5bf71	[BEEEP] Use shared tsconfig (#1393 )	2022-01-17 15:53:19 +01:00
Oscar Hinton	dfd62c7c3a	Fix webpack assets using wrong name (#1391 )	2022-01-14 13:35:44 +01:00
github-actions[bot]	41d3bd8cf2	Autosync the updated translations (#1389 ) Co-authored-by: github-actions <>	2022-01-14 11:21:40 +01:00
Vince Grassia	3292d119fe	Update Version Bump action (#1388 )	2022-01-12 16:06:50 -05:00
Christian Oliff	b8de92435b	Add Inputmode for tel and email (identities) (#1384 )	2022-01-12 10:07:56 +01:00