Removing errand console.log

.eslintignore

@@ -1,8 +0,0 @@
-**/dist
-**/build
-jslib
-webpack.config.js
-scripts/optimize.js
-config.js
-
-**/node_modules

.eslintrc.json

@@ -1,31 +0,0 @@
-{
-  "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"]
-      }
-    ]
-  }
-}

.github/workflows/build.yml

@@ -11,8 +11,6 @@ on:
     branches-ignore:
       - "l10n_master"
       - "gh-pages"
-    paths-ignore:
-      - '.github/workflows/**'
 
 jobs:
   cloc:
@@ -30,26 +28,6 @@ jobs:
       - name: Print lines of code
         run: cloc --include-lang TypeScript,JavaScript,HTML,Sass,CSS --vcs git
 
-  lint:
-    name: Lint
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
-
-      - name: Cache npm
-        id: npm-cache
-        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353  # v2.1.6
-        with:
-          path: "~/.npm"
-          key: ${{ runner.os }}-npm-lint-${{ hashFiles('**/package-lock.json') }}
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Run linter
-        run: npm run lint
-
   setup:
     name: Setup
     runs-on: ubuntu-20.04
@@ -66,9 +44,7 @@ jobs:
   build-oss-selfhost:
     name: Build OSS zip
     runs-on: ubuntu-20.04
-    needs:
-      - setup
-      - lint
+    needs: setup
     env:
       _VERSION: ${{ needs.setup.outputs.version }}
     steps:
@@ -115,9 +91,7 @@ jobs:
   build-cloud:
     name: Build Cloud zip
     runs-on: ubuntu-20.04
-    needs:
-      - setup
-      - lint
+    needs: setup
     env:
       _VERSION: ${{ needs.setup.outputs.version }}
     steps:
@@ -164,9 +138,7 @@ jobs:
   build-commercial-selfhost:
     name: Build SelfHost Docker image
     runs-on: ubuntu-20.04
-    needs:
-      - setup
-      - lint
+    needs: setup
     env:
       _VERSION: ${{ needs.setup.outputs.version }}
     steps:
@@ -193,7 +165,7 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Setup DCT
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix'
         id: setup-dct
         uses: bitwarden/gh-actions/setup-docker-trust@a8c384a05a974c05c48374c818b004be221d43ff
         with:
@@ -203,6 +175,9 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
+      - name: Restore
+        run: dotnet tool restore
+
       - name: Install dependencies
         run: npm ci
 
@@ -237,11 +212,11 @@ jobs:
         run: docker tag bitwarden/web bitwarden/web:dev
 
       - name: Tag hotfix branch
-        if: github.ref == 'refs/heads/hotfix-rc'
-        run: docker tag bitwarden/web bitwarden/web:hotfix-rc
+        if: github.ref == 'refs/heads/hotfix'
+        run: docker tag bitwarden/web bitwarden/web:hotfix
 
       - name: List Docker images
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix'
         run: docker images
 
       - name: Push rc image
@@ -259,22 +234,19 @@ jobs:
           DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.setup-dct.outputs.dct-delegate-repo-passphrase }}
 
       - name: Push hotfix image
-        if: github.ref == 'refs/heads/hotfix-rc'
-        run: docker push bitwarden/web:hotfix-rc
+        if: github.ref == 'refs/heads/hotfix'
+        run: docker push bitwarden/web:hotfix
         env:
           DOCKER_CONTENT_TRUST: 1
           DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.setup-dct.outputs.dct-delegate-repo-passphrase }}
 
       - name: Log out of Docker
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix'
         run: docker logout
 
   build-qa:
     name: Build Docker images for QA environment
     runs-on: ubuntu-20.04
-    needs:
-      - setup
-      - lint
     steps:
       - name: Set up Node
         uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
@@ -309,6 +281,9 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
+      - name: Restore
+        run: dotnet tool restore
+
       - name: Install dependencies
         run: npm ci
 
@@ -392,6 +367,7 @@ jobs:
         run: |
           nuget help | grep Version
           msbuild -version
+          dotnet --info
           node --version
           npm --version
           echo "GitHub ref: $GITHUB_REF"
@@ -406,6 +382,9 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
+      - name: Run linter
+        run: npm run lint
+
       - name: NPM build
         run: npm run build:bit:cloud
 
@@ -454,7 +433,6 @@ jobs:
     needs:
       - cloc
       - setup
-      - lint
       - build-oss-selfhost
       - build-cloud
       - build-commercial-selfhost
@@ -466,7 +444,6 @@ jobs:
         if: ${{ (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/rc') }}
         env:
           CLOC_STATUS: ${{ needs.cloc.result }}
-          LINT_STATUS: ${{ needs.lint.result }}
           SETUP_STATUS: ${{ needs.setup.result }}
           BUILD_OSS_SELFHOST_STATUS: ${{ needs.build-oss-selfhost.result }}
           BUILD_CLOUD_STATUS: ${{ needs.build-cloud.result }}
@@ -477,8 +454,6 @@ jobs:
         run: |
           if [ "$CLOC_STATUS" = "failure" ]; then
               exit 1
-          elif [ "$LINT_STATUS" = "failure" ]; then
-              exit 1
           elif [ "$SETUP_STATUS" = "failure" ]; then
               exit 1
           elif [ "$BUILD_OSS_SELFHOST_STATUS" = "failure" ]; then

.github/workflows/enforce-labels.yml

@@ -1,16 +0,0 @@
----
-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"

.github/workflows/release.yml

@@ -12,7 +12,6 @@ on:
         options:
           - Initial Release
           - Redeploy
-          - Dry Run
 
 jobs:
   setup:
@@ -21,20 +20,19 @@ 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
-        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         run: |
-          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix-rc" ]]; then
+          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix" ]]; then
             echo "==================================="
-            echo "[!] Can only release from the 'rc' or 'hotfix-rc' branches"
+            echo "[!] Can only release from the 'rc' or 'hotfix' branches"
             echo "==================================="
             exit 1
           fi
 
       - name: Checkout repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # 2.4.0
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # 2.3.4
 
       - name: Check Release Version
         id: version
@@ -57,17 +55,15 @@ 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 }}
-      _RELEASE_OPTION: ${{ github.event.inputs.release_type }}
     steps:
       - name: Print environment
         run: |
@@ -75,12 +71,7 @@ jobs:
           docker --version
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
-          echo "Github Release Option: $_RELEASE_OPTION"
 
-      - name: Checkout repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
-
-      ########## DockerHub ##########
       - name: Setup DCT
         id: setup-dct
         uses: bitwarden/gh-actions/setup-docker-trust@a8c384a05a974c05c48374c818b004be221d43ff
@@ -88,25 +79,21 @@ jobs:
           azure-creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
           azure-keyvault-name: "bitwarden-prod-kv"
 
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
       - name: Pull latest selfhost image
-        run: |
-          if [[ "${{ github.event.inputs.release_type }}" == "Dry Run" ]]; then
-            docker pull bitwarden/web:latest
-          else
-            docker pull bitwarden/web:$_BRANCH_NAME
-          fi
+        run: docker pull bitwarden/web:$_BRANCH_NAME
 
       - name: Tag version and latest
         run: |
-          if [[ "${{ github.event.inputs.release_type }}" == "Dry Run" ]]; then
-            docker tag bitwarden/web:latest bitwarden/web:dryrun
-          else
-            docker tag bitwarden/web:$_BRANCH_NAME bitwarden/web:$_RELEASE_VERSION
-            docker tag bitwarden/web:$_BRANCH_NAME bitwarden/web:latest
-          fi
+          docker tag bitwarden/web:$_BRANCH_NAME bitwarden/web:$_RELEASE_VERSION
+          docker tag bitwarden/web:$_BRANCH_NAME bitwarden/web:latest
+
+      - name: List Docker images
+        run: docker images
 
       - name: Push version and latest image
-        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         env:
           DOCKER_CONTENT_TRUST: 1
           DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.setup-dct.outputs.dct-delegate-repo-passphrase }}
@@ -114,43 +101,9 @@ jobs:
           docker push bitwarden/web:$_RELEASE_VERSION
           docker push bitwarden/web:latest
 
-      - name: Log out of Docker and disable Docker Notary
-        run: |
-          docker logout
-          echo "DOCKER_CONTENT_TRUST=0" >> $GITHUB_ENV
-
-      ########## ACR ##########
-      - name: Login to Azure - QA Subscription
-        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
-        with:
-          creds: ${{ secrets.AZURE_QA_KV_CREDENTIALS }}
-
-      - name: Login to Azure ACR
-        run: az acr login -n bitwardenqa
-
-      - name: Tag version and latest
-        env:
-          REGISTRY: bitwardenqa.azurecr.io
-        run: |
-          if [[ "${{ github.event.inputs.release_type }}" == "Dry Run" ]]; then
-            docker tag bitwarden/web:latest $REGISTRY/web:dryrun
-          else
-            docker tag bitwarden/web:$_BRANCH_NAME $REGISTRY/web:$_RELEASE_VERSION
-            docker tag bitwarden/web:$_BRANCH_NAME $REGISTRY/web:latest
-          fi
-
-      - name: Push version and latest image
-        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        env:
-          REGISTRY: bitwardenqa.azurecr.io
-        run: |
-          docker push $REGISTRY/web:$_RELEASE_VERSION
-          docker push $REGISTRY/web:latest
-
       - name: Log out of Docker
         run: docker logout
 
-
   ghpages-deploy:
     name: Deploy Web Vault
     runs-on: ubuntu-20.04
@@ -162,7 +115,7 @@ jobs:
       _TAG_VERSION: ${{ needs.setup.outputs.tag_version }}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
         with:
           ref: gh-pages
 
@@ -172,7 +125,7 @@ jobs:
           git push -u origin deploy-$_TAG_VERSION
 
       - name: Checkout Repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
       - name: Setup git config
         run: |
@@ -186,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
@@ -194,7 +147,7 @@ jobs:
         run: unzip web-*-cloud-COMMERCIAL.zip
 
       - name: Deploy GitHub Pages
-        uses: crazy-max/ghaction-github-pages@a117e4aa1fb4854d021546d2abdfac95be568a3a  # v2.6.0
+        uses: crazy-max/ghaction-github-pages@db4476a01402e1a7ce05f41832040eef16d14925  # v2.5.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -202,10 +155,8 @@ jobs:
           build_dir: build
           keep_history: true
           commit_message: "Staging deploy ${{ needs.setup.outputs.release_version }}"
-          dry_run: ${{ github.event.inputs.release_type == 'Dry Run' }}
 
       - name: Create Deploy PR
-        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         env:
           PR_BRANCH: deploy-${{ env._TAG_VERSION }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -215,7 +166,6 @@ jobs:
             --base gh-pages \
             --head "$PR_BRANCH"
 
-
   release:
     name: Create GitHub Release
     runs-on: ubuntu-20.04
@@ -229,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"
 
@@ -239,8 +189,7 @@ jobs:
           mv web-*-selfhosted-open-source.zip web-${{ needs.setup.outputs.release_version }}-selfhosted-open-source.zip
 
       - name: Create release
-        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: ncipollo/release-action@40bb172bd05f266cf9ba4ff965cb61e9ee5f6d01
+        uses: ncipollo/release-action@95215a3cb6e6a1908b3c44e00b4fdb15548b1e09
         with:
           name: "Version ${{ needs.setup.outputs.release_version }}"
           commit: ${{ github.sha }}
@@ -250,20 +199,3 @@ jobs:
             web-${{ needs.setup.outputs.release_version }}-selfhosted-open-source.zip"
           token: ${{ secrets.GITHUB_TOKEN }}
           draft: true
-
-
-  dry-run:
-    name: Dry Run Cleanup
-    runs-on: ubuntu-20.04
-    if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-    env:
-      _TAG_VERSION: ${{ needs.setup.outputs.tag_version }}
-    needs:
-      - setup
-      - release
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # 2.4.0
-
-      - name: Remove deploy branch
-        run: git push origin --delete deploy-$_TAG_VERSION

.github/workflows/workflow-linter.yml

@@ -1,11 +0,0 @@
----
-name: Workflow Linter
-
-on:
-  pull_request:
-    paths:
-      - .github/workflows/**
-
-jobs:
-  call-workflow:
-    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@master

.prettierignore

@@ -7,6 +7,7 @@ jslib
 # External libraries / auto synced locales
 src/locales
 src/404/*.min.css
+src/scripts/u2f.js
 
 # Github Workflows
-.github/workflows
+.github/workflows

README.md

@@ -61,10 +61,6 @@ 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.

bitwarden_license/src/app/app.component.ts

@@ -1,7 +1,6 @@
 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";
 

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,

bitwarden_license/src/app/main.ts

@@ -5,6 +5,7 @@ import "bootstrap";
 import "jquery";
 import "popper.js";
 
+// tslint:disable-next-line
 require("src/scss/styles.scss");
 
 import { AppModule } from "./app.module";

bitwarden_license/src/app/organizations/components/base-cva.component.ts

@@ -1,68 +0,0 @@
-import { Directive, Input, OnInit, Self } from "@angular/core";
-import { ControlValueAccessor, FormControl, NgControl, Validators } from "@angular/forms";
-
-import { dirtyRequired } from "jslib-angular/validators/dirty.validator";
-
-/** For use in the SSO Config Form only - will be deprecated by the Component Library */
-@Directive()
-export abstract class BaseCvaComponent implements ControlValueAccessor, OnInit {
-  get describedById() {
-    return this.showDescribedBy ? this.controlId + "Desc" : null;
-  }
-
-  get showDescribedBy() {
-    return this.helperText != null || this.controlDir.control.hasError("required");
-  }
-
-  get isRequired() {
-    return (
-      this.controlDir.control.hasValidator(Validators.required) ||
-      this.controlDir.control.hasValidator(dirtyRequired)
-    );
-  }
-
-  @Input() label: string;
-  @Input() controlId: string;
-  @Input() helperText: string;
-
-  internalControl = new FormControl("");
-
-  protected onChange: any;
-  protected onTouched: any;
-
-  constructor(@Self() public controlDir: NgControl) {
-    this.controlDir.valueAccessor = this;
-  }
-
-  ngOnInit() {
-    this.internalControl.valueChanges.subscribe(this.onValueChangesInternal);
-  }
-
-  onBlurInternal() {
-    this.onTouched();
-  }
-
-  // CVA interfaces
-  writeValue(value: string) {
-    this.internalControl.setValue(value);
-  }
-
-  registerOnChange(fn: any) {
-    this.onChange = fn;
-  }
-
-  registerOnTouched(fn: any) {
-    this.onTouched = fn;
-  }
-
-  setDisabledState(isDisabled: boolean) {
-    if (isDisabled) {
-      this.internalControl.disable();
-    } else {
-      this.internalControl.enable();
-    }
-  }
-
-  protected onValueChangesInternal: any = (value: string) => this.onChange(value);
-  // End CVA interfaces
-}

bitwarden_license/src/app/organizations/components/input-checkbox.component.html

@@ -1,16 +0,0 @@
-<div class="form-group">
-  <div class="form-check">
-    <input
-      class="form-check-input"
-      type="checkbox"
-      [attr.id]="controlId"
-      [attr.aria-describedby]="describedById"
-      [formControl]="internalControl"
-      (blur)="onBlurInternal()"
-    />
-    <label class="form-check-label" [attr.for]="controlId">{{ label }}</label>
-  </div>
-  <small *ngIf="showDescribedBy" [attr.id]="describedById" class="form-text text-muted">{{
-    helperText
-  }}</small>
-</div>

bitwarden_license/src/app/organizations/components/input-checkbox.component.ts

@@ -1,10 +0,0 @@
-import { Component } from "@angular/core";
-
-import { BaseCvaComponent } from "./base-cva.component";
-
-/** For use in the SSO Config Form only - will be deprecated by the Component Library */
-@Component({
-  selector: "app-input-checkbox",
-  templateUrl: "input-checkbox.component.html",
-})
-export class InputCheckboxComponent extends BaseCvaComponent {}

bitwarden_license/src/app/organizations/components/input-text-readonly.component.html

@@ -1,26 +0,0 @@
-<div class="form-group">
-  <label>{{ label }}</label>
-  <div class="input-group">
-    <input class="form-control" readonly [value]="controlValue" />
-    <div class="input-group-append" *ngIf="showLaunch">
-      <button
-        type="button"
-        class="btn btn-outline-secondary"
-        appA11yTitle="{{ 'launch' | i18n }}"
-        (click)="launchUri(controlValue)"
-      >
-        <i class="bwi bwi-lg bwi-external-link" aria-hidden="true"></i>
-      </button>
-    </div>
-    <div class="input-group-append" *ngIf="showCopy">
-      <button
-        type="button"
-        class="btn btn-outline-secondary"
-        appA11yTitle="{{ 'copyValue' | i18n }}"
-        (click)="copy(controlValue)"
-      >
-        <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-      </button>
-    </div>
-  </div>
-</div>

bitwarden_license/src/app/organizations/components/input-text-readonly.component.ts

@@ -1,25 +0,0 @@
-import { Component, Input } from "@angular/core";
-
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-
-/** For use in the SSO Config Form only - will be deprecated by the Component Library */
-@Component({
-  selector: "app-input-text-readonly",
-  templateUrl: "input-text-readonly.component.html",
-})
-export class InputTextReadOnlyComponent {
-  @Input() controlValue: string;
-  @Input() label: string;
-  @Input() showCopy = true;
-  @Input() showLaunch = false;
-
-  constructor(private platformUtilsService: PlatformUtilsService) {}
-
-  copy(value: string) {
-    this.platformUtilsService.copyToClipboard(value);
-  }
-
-  launchUri(url: string) {
-    this.platformUtilsService.launchUri(url);
-  }
-}

bitwarden_license/src/app/organizations/components/input-text.component.html

@@ -1,33 +0,0 @@
-<div class="form-group">
-  <label [attr.for]="controlId">
-    {{ label }}
-    <small *ngIf="isRequired" class="text-muted form-text d-inline"
-      >({{ "required" | i18n }})</small
-    >
-  </label>
-  <input
-    [formControl]="internalControl"
-    class="form-control"
-    [attr.id]="controlId"
-    [attr.aria-describedby]="describedById"
-    [attr.aria-invalid]="controlDir.control.invalid"
-    (blur)="onBlurInternal()"
-  />
-  <div *ngIf="showDescribedBy" [attr.id]="describedById">
-    <small
-      *ngIf="helperText != null && !controlDir.control.hasError(helperTextSameAsError)"
-      class="form-text text-muted"
-    >
-      {{ helperText }}
-    </small>
-    <small class="error-inline" *ngIf="controlDir.control.hasError('required')" role="alert">
-      <i class="bwi bwi-exclamation-circle" aria-hidden="true"></i>
-      <span class="sr-only">{{ "error" | i18n }}:</span>
-      {{
-        controlDir.control.hasError(helperTextSameAsError)
-          ? helperText
-          : ("fieldRequiredError" | i18n: label)
-      }}
-    </small>
-  </div>
-</div>

bitwarden_license/src/app/organizations/components/input-text.component.ts

@@ -1,48 +0,0 @@
-import { Component, Input, OnInit } from "@angular/core";
-
-import { BaseCvaComponent } from "./base-cva.component";
-
-/** For use in the SSO Config Form only - will be deprecated by the Component Library */
-@Component({
-  selector: "app-input-text[label][controlId]",
-  templateUrl: "input-text.component.html",
-})
-export class InputTextComponent extends BaseCvaComponent implements OnInit {
-  @Input() helperTextSameAsError: string;
-  @Input() requiredErrorMessage: string;
-  @Input() stripSpaces = false;
-
-  transformValue: (value: string) => string = null;
-
-  ngOnInit() {
-    super.ngOnInit();
-    if (this.stripSpaces) {
-      this.transformValue = this.doStripSpaces;
-    }
-  }
-
-  writeValue(value: string) {
-    this.internalControl.setValue(value == null ? "" : value);
-  }
-
-  protected onValueChangesInternal: any = (value: string) => {
-    let newValue = value;
-    if (this.transformValue != null) {
-      newValue = this.transformValue(value);
-      this.internalControl.setValue(newValue, { emitEvent: false });
-    }
-    this.onChange(newValue);
-  };
-
-  protected onValueChangeInternal(value: string) {
-    let newValue = value;
-    if (this.transformValue != null) {
-      newValue = this.transformValue(value);
-      this.internalControl.setValue(newValue, { emitEvent: false });
-    }
-  }
-
-  private doStripSpaces(value: string) {
-    return value.replace(/ /g, "");
-  }
-}

bitwarden_license/src/app/organizations/components/select.component.html

@@ -1,19 +0,0 @@
-<div class="form-group">
-  <label [attr.for]="controlId">
-    {{ label }}
-    <small *ngIf="isRequired" class="text-muted form-text d-inline"
-      >({{ "required" | i18n }})</small
-    >
-  </label>
-  <select
-    class="form-control"
-    [attr.id]="controlId"
-    [attr.aria-invalid]="controlDir.control.invalid"
-    [formControl]="internalControl"
-    (blur)="onBlurInternal()"
-  >
-    <option *ngFor="let o of selectOptions" [ngValue]="o.value" disabled="{{ o.disabled }}">
-      {{ o.name }}
-    </option>
-  </select>
-</div>

bitwarden_license/src/app/organizations/components/select.component.ts

@@ -1,14 +0,0 @@
-import { Component, Input } from "@angular/core";
-
-import { SelectOptions } from "jslib-angular/interfaces/selectOptions";
-
-import { BaseCvaComponent } from "./base-cva.component";
-
-/** For use in the SSO Config Form only - will be deprecated by the Component Library */
-@Component({
-  selector: "app-select",
-  templateUrl: "select.component.html",
-})
-export class SelectComponent extends BaseCvaComponent {
-  @Input() selectOptions: SelectOptions[];
-}

bitwarden_license/src/app/organizations/manage/sso.component.html

@@ -3,20 +3,17 @@
 </div>
 
 <ng-container *ngIf="loading">
-  <i
-    class="bwi bwi-spinner bwi-spin text-muted"
-    title="{{ 'loading' | i18n }}"
-    aria-hidden="true"
-  ></i>
+  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
   <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 
 <form
   #form
   (ngSubmit)="submit()"
-  [formGroup]="ssoConfigForm"
+  [formGroup]="data"
   [appApiAction]="formPromise"
   *ngIf="!loading"
+  ngNativeValidate
 >
   <p>
     {{ "ssoPolicyHelpStart" | i18n }}
@@ -26,423 +23,466 @@
     {{ "ssoPolicyHelpKeyConnector" | i18n }}
   </p>
 
-  <!-- Root form -->
-  <ng-container>
-    <app-input-checkbox
-      controlId="enabled"
-      [formControl]="enabled"
-      [label]="'allowSso' | i18n"
-      [helperText]="'allowSsoDesc' | i18n"
-    ></app-input-checkbox>
+  <div class="form-group">
+    <div class="form-check">
+      <input
+        class="form-check-input"
+        type="checkbox"
+        id="enabled"
+        [formControl]="enabled"
+        name="Enabled"
+      />
+      <label class="form-check-label" for="enabled">{{ "allowSso" | i18n }}</label>
+    </div>
+    <small class="form-text text-muted">{{ "allowSsoDesc" | i18n }}</small>
+  </div>
+
+  <div class="form-group">
+    <label>{{ "memberDecryptionOption" | i18n }}</label>
+    <div class="form-check form-check-block">
+      <input
+        class="form-check-input"
+        type="radio"
+        id="memberDecryptionPass"
+        [value]="false"
+        formControlName="keyConnectorEnabled"
+      />
+      <label class="form-check-label" for="memberDecryptionPass">
+        {{ "masterPass" | i18n }}
+        <small>{{ "memberDecryptionPassDesc" | i18n }}</small>
+      </label>
+    </div>
+    <div class="form-check mt-2 form-check-block">
+      <input
+        class="form-check-input"
+        type="radio"
+        id="memberDecryptionKey"
+        [value]="true"
+        formControlName="keyConnectorEnabled"
+        [attr.disabled]="!organization.useKeyConnector || null"
+      />
+      <label class="form-check-label" for="memberDecryptionKey">
+        {{ "keyConnector" | i18n }}
+        <a
+          target="_blank"
+          rel="noopener"
+          appA11yTitle="{{ 'learnMore' | i18n }}"
+          href="https://bitwarden.com/help/article/about-key-connector/"
+        >
+          <i class="fa fa-question-circle-o" aria-hidden="true"></i>
+        </a>
+        <small>{{ "memberDecryptionKeyConnectorDesc" | i18n }}</small>
+      </label>
+    </div>
+  </div>
+
+  <ng-container *ngIf="data.value.keyConnectorEnabled">
+    <app-callout type="warning" [useAlertRole]="true">
+      {{ "keyConnectorWarning" | i18n }}
+    </app-callout>
 
     <div class="form-group">
-      <label>{{ "memberDecryptionOption" | i18n }}</label>
-      <div class="form-check form-check-block">
+      <label for="keyConnectorUrl">{{ "keyConnectorUrl" | i18n }}</label>
+      <div class="input-group">
         <input
-          class="form-check-input"
-          type="radio"
-          id="memberDecryptionPass"
-          [value]="false"
-          formControlName="keyConnectorEnabled"
+          class="form-control"
+          formControlName="keyConnectorUrl"
+          id="keyConnectorUrl"
+          required
         />
-        <label class="form-check-label" for="memberDecryptionPass">
-          {{ "masterPass" | i18n }}
-          <small>{{ "memberDecryptionPassDesc" | i18n }}</small>
-        </label>
-      </div>
-      <div class="form-check mt-2 form-check-block">
-        <input
-          class="form-check-input"
-          type="radio"
-          id="memberDecryptionKey"
-          [value]="true"
-          formControlName="keyConnectorEnabled"
-          [attr.disabled]="!organization.useKeyConnector || null"
-        />
-        <label class="form-check-label" for="memberDecryptionKey">
-          {{ "keyConnector" | i18n }}
-          <a
-            target="_blank"
-            rel="noopener"
-            appA11yTitle="{{ 'learnMore' | i18n }}"
-            href="https://bitwarden.com/help/about-key-connector/"
+        <div class="input-group-append">
+          <button
+            type="button"
+            class="btn btn-outline-secondary"
+            (click)="validateKeyConnectorUrl()"
+            [disabled]="!enableTestKeyConnector"
           >
-            <i class="bwi bwi-question-circle" aria-hidden="true"></i>
-          </a>
-          <small>{{ "memberDecryptionKeyConnectorDesc" | i18n }}</small>
-        </label>
+            <i
+              class="fa fa-spinner fa-spin"
+              title="{{ 'loading' | i18n }}"
+              aria-hidden="true"
+              *ngIf="keyConnectorUrl.pending"
+            ></i>
+            <span *ngIf="!keyConnectorUrl.pending">
+              {{ "keyConnectorTest" | i18n }}
+            </span>
+          </button>
+        </div>
       </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>
+          {{ "keyConnectorTestFail" | i18n }}
+        </div>
+        <div class="text-success" *ngIf="!keyConnectorUrl.hasError('invalidUrl')" role="alert">
+          <i class="fa fa-check-circle-o" aria-hidden="true"></i>
+          {{ "keyConnectorTestSuccess" | i18n }}
+        </div>
+      </ng-container>
     </div>
+  </ng-container>
 
-    <!-- Key Connector -->
-    <ng-container *ngIf="ssoConfigForm.get('keyConnectorEnabled').value">
-      <app-callout type="warning" [useAlertRole]="true">
-        {{ "keyConnectorWarning" | i18n }}
-      </app-callout>
+  <div class="form-group">
+    <label for="type">{{ "type" | i18n }}</label>
+    <select class="form-control" id="type" formControlName="configType">
+      <option [ngValue]="0" disabled>{{ "selectType" | i18n }}</option>
+      <option [ngValue]="1">OpenID Connect</option>
+      <option [ngValue]="2">SAML 2.0</option>
+    </select>
+  </div>
 
+  <!-- OIDC -->
+  <div *ngIf="data.value.configType == 1">
+    <div class="config-section">
+      <h2>{{ "openIdConnectConfig" | i18n }}</h2>
       <div class="form-group">
-        <label for="keyConnectorUrl">
-          {{ "keyConnectorUrl" | i18n }}
-          <small class="text-muted form-text d-inline">({{ "required" | i18n }})</small>
-        </label>
+        <label>{{ "callbackPath" | i18n }}</label>
         <div class="input-group">
-          <input
-            class="form-control"
-            formControlName="keyConnectorUrl"
-            id="keyConnectorUrl"
-            aria-describedby="keyConnectorUrlDesc"
-            (change)="haveTestedKeyConnector = false"
-            appInputStripSpaces
-            appA11yInvalid
-          />
+          <input class="form-control" readonly [value]="callbackPath" />
           <div class="input-group-append">
             <button
               type="button"
               class="btn btn-outline-secondary"
-              (click)="validateKeyConnectorUrl()"
-              [disabled]="!enableTestKeyConnector"
+              appA11yTitle="{{ 'copyValue' | i18n }}"
+              (click)="copy(callbackPath)"
             >
-              <i
-                class="bwi bwi-spinner bwi-spin"
-                title="{{ 'loading' | i18n }}"
-                aria-hidden="true"
-                *ngIf="keyConnectorUrl.pending"
-              ></i>
-              <span *ngIf="!keyConnectorUrl.pending">
-                {{ "keyConnectorTest" | i18n }}
-              </span>
+              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
             </button>
           </div>
         </div>
-        <div *ngIf="haveTestedKeyConnector" id="keyConnectorUrlDesc" aria-live="polite">
-          <small
-            class="error-inline"
-            *ngIf="keyConnectorUrl.hasError('invalidUrl'); else keyConnectorSuccess"
-          >
-            <i class="bwi bwi-exclamation-circle" aria-hidden="true"></i>
-            <span class="sr-only">{{ "error" | i18n }}:</span>
-            {{ "keyConnectorTestFail" | i18n }}
-          </small>
-          <ng-template #keyConnectorSuccess>
-            <small class="text-success">
-              <i class="bwi bwi-check-circle" aria-hidden="true"></i>
-              {{ "keyConnectorTestSuccess" | i18n }}
-            </small>
-          </ng-template>
+      </div>
+      <div class="form-group">
+        <label>{{ "signedOutCallbackPath" | i18n }}</label>
+        <div class="input-group">
+          <input class="form-control" readonly [value]="signedOutCallbackPath" />
+          <div class="input-group-append">
+            <button
+              type="button"
+              class="btn btn-outline-secondary"
+              appA11yTitle="{{ 'copyValue' | i18n }}"
+              (click)="copy(signedOutCallbackPath)"
+            >
+              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
+            </button>
+          </div>
         </div>
       </div>
-    </ng-container>
-
-    <app-select
-      controlId="type"
-      [label]="'type' | i18n"
-      [selectOptions]="ssoTypeOptions"
-      formControlName="configType"
-    >
-    </app-select>
-  </ng-container>
-
-  <!-- OIDC -->
-  <div
-    *ngIf="ssoConfigForm.get('configType').value === ssoType.OpenIdConnect"
-    [formGroup]="openIdForm"
-  >
-    <div class="config-section">
-      <h2 class="secondary-header">{{ "openIdConnectConfig" | i18n }}</h2>
-
-      <app-input-text-readonly
-        [label]="'callbackPath' | i18n"
-        [controlValue]="callbackPath"
-      ></app-input-text-readonly>
-
-      <app-input-text-readonly
-        [label]="'signedOutCallbackPath' | i18n"
-        [controlValue]="signedOutCallbackPath"
-      ></app-input-text-readonly>
-
-      <app-input-text
-        [label]="'authority' | i18n"
-        controlId="authority"
-        [stripSpaces]="true"
-        formControlName="authority"
-      ></app-input-text>
-
-      <app-input-text
-        [label]="'clientId' | i18n"
-        controlId="clientId"
-        [stripSpaces]="true"
-        formControlName="clientId"
-      ></app-input-text>
-
-      <app-input-text
-        [label]="'clientSecret' | i18n"
-        controlId="clientSecret"
-        [stripSpaces]="true"
-        formControlName="clientSecret"
-      ></app-input-text>
-
-      <app-input-text
-        [label]="'metadataAddress' | i18n"
-        controlId="metadataAddress"
-        [stripSpaces]="true"
-        [helperText]="'openIdAuthorityRequired' | i18n"
-        formControlName="metadataAddress"
-      ></app-input-text>
-
-      <app-select
-        controlId="redirectBehavior"
-        [label]="'oidcRedirectBehavior' | i18n"
-        [selectOptions]="connectRedirectOptions"
-        formControlName="redirectBehavior"
-      >
-      </app-select>
-
-      <app-input-checkbox
-        controlId="getClaimsFromUserInfoEndpoint"
-        formControlName="getClaimsFromUserInfoEndpoint"
-        [label]="'getClaimsFromUserInfoEndpoint' | i18n"
-      ></app-input-checkbox>
-
-      <!-- Optional customizations -->
-      <div
-        class="section-header d-flex flex-row align-items-center mt-3 mb-3"
-        (click)="toggleOpenIdCustomizations()"
-      >
-        <h3 class="mb-0 mr-2" id="customizations-header">
-          {{ "openIdOptionalCustomizations" | i18n }}
-        </h3>
-        <button
-          class="mb-1 btn btn-link"
-          type="button"
-          appStopClick
-          role="button"
-          aria-controls="customizations"
-          [attr.aria-expanded]="showOpenIdCustomizations"
-          aria-labelledby="customizations-header"
-        >
-          <i
-            class="bwi"
-            aria-hidden="true"
-            [ngClass]="{
-              'bwi-angle-down': !showOpenIdCustomizations,
-              'bwi-chevron-up': showOpenIdCustomizations
-            }"
-          ></i>
-        </button>
+      <div class="form-group">
+        <label for="authority">{{ "authority" | i18n }}</label>
+        <input class="form-control" formControlName="authority" id="authority" />
       </div>
-      <div id="customizations" [hidden]="!showOpenIdCustomizations">
-        <app-input-text
-          [label]="'additionalScopes' | i18n"
-          controlId="additionalScopes"
-          [helperText]="'separateMultipleWithComma' | i18n"
-          formControlName="additionalScopes"
-        ></app-input-text>
-
-        <app-input-text
-          [label]="'additionalUserIdClaimTypes' | i18n"
-          controlId="additionalUserIdClaimTypes"
-          [helperText]="'separateMultipleWithComma' | i18n"
+      <div class="form-group">
+        <label for="clientId">{{ "clientId" | i18n }}</label>
+        <input class="form-control" formControlName="clientId" id="clientId" />
+      </div>
+      <div class="form-group">
+        <label for="clientSecret">{{ "clientSecret" | i18n }}</label>
+        <input class="form-control" formControlName="clientSecret" id="clientSecret" />
+      </div>
+      <div class="form-group">
+        <label for="metadataAddress">{{ "metadataAddress" | i18n }}</label>
+        <input class="form-control" formControlName="metadataAddress" id="metadataAddress" />
+      </div>
+      <div class="form-group">
+        <label for="redirectBehavior">{{ "oidcRedirectBehavior" | i18n }}</label>
+        <select class="form-control" formControlName="redirectBehavior" id="redirectBehavior">
+          <option [ngValue]="0">Redirect GET</option>
+          <option [ngValue]="1">Form POST</option>
+        </select>
+      </div>
+      <div class="form-group">
+        <div class="form-check">
+          <input
+            class="form-check-input"
+            type="checkbox"
+            id="getClaimsFromUserInfoEndpoint"
+            formControlName="getClaimsFromUserInfoEndpoint"
+          />
+          <label class="form-check-label" for="getClaimsFromUserInfoEndpoint">
+            {{ "getClaimsFromUserInfoEndpoint" | i18n }}
+          </label>
+        </div>
+      </div>
+      <div class="form-group">
+        <label for="additionalScopes">{{ "additionalScopes" | i18n }}</label>
+        <input class="form-control" formControlName="additionalScopes" id="additionalScopes" />
+      </div>
+      <div class="form-group">
+        <label for="additionalUserIdClaimTypes">{{ "additionalUserIdClaimTypes" | i18n }}</label>
+        <input
+          class="form-control"
           formControlName="additionalUserIdClaimTypes"
-        ></app-input-text>
-
-        <app-input-text
-          [label]="'additionalEmailClaimTypes' | i18n"
-          controlId="additionalEmailClaimTypes"
-          [helperText]="'separateMultipleWithComma' | i18n"
+          id="additionalUserIdClaimTypes"
+        />
+      </div>
+      <div class="form-group">
+        <label for="additionalEmailClaimTypes">{{ "additionalEmailClaimTypes" | i18n }}</label>
+        <input
+          class="form-control"
           formControlName="additionalEmailClaimTypes"
-        ></app-input-text>
-
-        <app-input-text
-          [label]="'additionalNameClaimTypes' | i18n"
-          controlId="additionalNameClaimTypes"
-          [helperText]="'separateMultipleWithComma' | i18n"
+          id="additionalEmailClaimTypes"
+        />
+      </div>
+      <div class="form-group">
+        <label for="additionalNameClaimTypes">{{ "additionalNameClaimTypes" | i18n }}</label>
+        <input
+          class="form-control"
           formControlName="additionalNameClaimTypes"
-        ></app-input-text>
-
-        <app-input-text
-          [label]="'acrValues' | i18n"
-          controlId="acrValues"
-          helperText="acr_values"
-          formControlName="acrValues"
-        ></app-input-text>
-
-        <app-input-text
-          [label]="'expectedReturnAcrValue' | i18n"
-          controlId="expectedReturnAcrValue"
-          helperText="acr_validation"
+          id="additionalNameClaimTypes"
+        />
+      </div>
+      <div class="form-group">
+        <label for="acrValues">{{ "acrValues" | i18n }}</label>
+        <input class="form-control" formControlName="acrValues" id="acrValues" />
+      </div>
+      <div class="form-group">
+        <label for="expectedReturnAcrValue">{{ "expectedReturnAcrValue" | i18n }}</label>
+        <input
+          class="form-control"
           formControlName="expectedReturnAcrValue"
-        ></app-input-text>
+          id="expectedReturnAcrValue"
+        />
       </div>
     </div>
   </div>
 
-  <!-- SAML2 SP -->
-  <div *ngIf="ssoConfigForm.get('configType').value === ssoType.Saml2" [formGroup]="samlForm">
+  <div *ngIf="data.value.configType == 2">
     <!-- SAML2 SP -->
     <div class="config-section">
-      <h2 class="secondary-header">{{ "samlSpConfig" | i18n }}</h2>
-
-      <app-input-text-readonly
-        [label]="'spEntityId' | i18n"
-        [controlValue]="spEntityId"
-      ></app-input-text-readonly>
-
-      <app-input-text-readonly
-        [label]="'spMetadataUrl' | i18n"
-        [controlValue]="spMetadataUrl"
-        [showLaunch]="true"
-      ></app-input-text-readonly>
-
-      <app-input-text-readonly
-        [label]="'spAcsUrl' | i18n"
-        [controlValue]="spAcsUrl"
-      ></app-input-text-readonly>
-
-      <app-select
-        controlId="spNameIdFormat"
-        [label]="'spNameIdFormat' | i18n"
-        [selectOptions]="saml2NameIdFormatOptions"
-        formControlName="spNameIdFormat"
-      >
-      </app-select>
-
-      <app-select
-        controlId="spOutboundSigningAlgorithm"
-        [label]="'spOutboundSigningAlgorithm' | i18n"
-        [selectOptions]="samlSigningAlgorithmOptions"
-        formControlName="spOutboundSigningAlgorithm"
-      >
-      </app-select>
-
-      <app-select
-        controlId="spSigningBehavior"
-        [label]="'spSigningBehavior' | i18n"
-        [selectOptions]="saml2SigningBehaviourOptions"
-        formControlName="spSigningBehavior"
-      >
-      </app-select>
-
-      <app-select
-        controlId="spMinIncomingSigningAlgorithm"
-        [label]="'spMinIncomingSigningAlgorithm' | i18n"
-        [selectOptions]="samlSigningAlgorithmOptions"
-        formControlName="spMinIncomingSigningAlgorithm"
-      >
-      </app-select>
-
-      <app-input-checkbox
-        controlId="spWantAssertionsSigned"
-        formControlName="spWantAssertionsSigned"
-        [label]="'spWantAssertionsSigned' | i18n"
-      ></app-input-checkbox>
-
-      <app-input-checkbox
-        controlId="spValidateCertificates"
-        formControlName="spValidateCertificates"
-        [label]="'spValidateCertificates' | i18n"
-      ></app-input-checkbox>
+      <h2>{{ "samlSpConfig" | i18n }}</h2>
+      <div class="form-group">
+        <label>{{ "spEntityId" | i18n }}</label>
+        <div class="input-group">
+          <input class="form-control" readonly [value]="spEntityId" />
+          <div class="input-group-append">
+            <button
+              type="button"
+              class="btn btn-outline-secondary"
+              appA11yTitle="{{ 'copyValue' | i18n }}"
+              (click)="copy(spEntityId)"
+            >
+              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
+            </button>
+          </div>
+        </div>
+      </div>
+      <div class="form-group">
+        <label>{{ "spMetadataUrl" | i18n }}</label>
+        <div class="input-group">
+          <input class="form-control" readonly [value]="spMetadataUrl" />
+          <div class="input-group-append">
+            <button
+              type="button"
+              class="btn btn-outline-secondary"
+              appA11yTitle="{{ 'launch' | i18n }}"
+              (click)="launchUri(spMetadataUrl)"
+            >
+              <i class="fa fa-lg fa-external-link" aria-hidden="true"></i>
+            </button>
+            <button
+              type="button"
+              class="btn btn-outline-secondary"
+              appA11yTitle="{{ 'copyValue' | i18n }}"
+              (click)="copy(spMetadataUrl)"
+            >
+              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
+            </button>
+          </div>
+        </div>
+      </div>
+      <div class="form-group">
+        <label>{{ "spAcsUrl" | i18n }}</label>
+        <div class="input-group">
+          <input class="form-control" readonly [value]="spAcsUrl" />
+          <div class="input-group-append">
+            <button
+              type="button"
+              class="btn btn-outline-secondary"
+              appA11yTitle="{{ 'copyValue' | i18n }}"
+              (click)="copy(spAcsUrl)"
+            >
+              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
+            </button>
+          </div>
+        </div>
+      </div>
+      <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>
+        </select>
+      </div>
+      <div class="form-group">
+        <label for="spOutboundSigningAlgorithm">{{ "spOutboundSigningAlgorithm" | i18n }}</label>
+        <select
+          class="form-control"
+          formControlName="spOutboundSigningAlgorithm"
+          id="spOutboundSigningAlgorithm"
+        >
+          <option *ngFor="let o of samlSigningAlgorithms" [ngValue]="o">{{ o }}</option>
+        </select>
+      </div>
+      <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>
+        </select>
+      </div>
+      <div class="form-group">
+        <label for="spMinIncomingSigningAlgorithm">{{
+          "spMinIncomingSigningAlgorithm" | i18n
+        }}</label>
+        <select
+          class="form-control"
+          formControlName="spMinIncomingSigningAlgorithm"
+          id="spMinIncomingSigningAlgorithm"
+        >
+          <option *ngFor="let o of samlSigningAlgorithms" [ngValue]="o">{{ o }}</option>
+        </select>
+      </div>
+      <div class="form-group">
+        <div class="form-check">
+          <input
+            class="form-check-input"
+            type="checkbox"
+            id="spWantAssertionsSigned"
+            formControlName="spWantAssertionsSigned"
+          />
+          <label class="form-check-label" for="spWantAssertionsSigned">
+            {{ "spWantAssertionsSigned" | i18n }}
+          </label>
+        </div>
+      </div>
+      <div class="form-group">
+        <div class="form-check">
+          <input
+            class="form-check-input"
+            type="checkbox"
+            id="spValidateCertificates"
+            formControlName="spValidateCertificates"
+          />
+          <label class="form-check-label" for="spValidateCertificates">
+            {{ "spValidateCertificates" | i18n }}
+          </label>
+        </div>
+      </div>
     </div>
 
     <!-- SAML2 IDP -->
     <div class="config-section">
-      <h2 class="secondary-header">{{ "samlIdpConfig" | i18n }}</h2>
-
-      <app-input-text
-        [label]="'idpEntityId' | i18n"
-        controlId="idpEntityId"
-        formControlName="idpEntityId"
-      ></app-input-text>
-
-      <app-select
-        controlId="idpBindingType"
-        [label]="'idpBindingType' | i18n"
-        [selectOptions]="saml2BindingTypeOptions"
-        formControlName="idpBindingType"
-      >
-      </app-select>
-
-      <app-input-text
-        [label]="'idpSingleSignOnServiceUrl' | i18n"
-        controlId="idpSingleSignOnServiceUrl"
-        [helperText]="'idpSingleSignOnServiceUrlRequired' | i18n"
-        [stripSpaces]="true"
-        formControlName="idpSingleSignOnServiceUrl"
-      ></app-input-text>
-
-      <app-input-text
-        [label]="'idpSingleLogoutServiceUrl' | i18n"
-        controlId="idpSingleLogoutServiceUrl"
-        [stripSpaces]="true"
-        formControlName="idpSingleLogoutServiceUrl"
-      ></app-input-text>
+      <h2>{{ "samlIdpConfig" | i18n }}</h2>
 
       <div class="form-group">
-        <label for="idpX509PublicCert">
-          {{ "idpX509PublicCert" | i18n }}
-          <small class="text-muted form-text d-inline">({{ "required" | i18n }})</small>
-        </label>
+        <label for="idpEntityId">{{ "idpEntityId" | i18n }}</label>
+        <input class="form-control" formControlName="idpEntityId" id="idpEntityId" />
+      </div>
+      <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>
+        </select>
+      </div>
+      <div class="form-group">
+        <label for="idpSingleSignOnServiceUrl">{{ "idpSingleSignOnServiceUrl" | i18n }}</label>
+        <input
+          class="form-control"
+          formControlName="idpSingleSignOnServiceUrl"
+          id="idpSingleSignOnServiceUrl"
+        />
+      </div>
+      <div class="form-group">
+        <label for="idpSingleLogoutServiceUrl">{{ "idpSingleLogoutServiceUrl" | i18n }}</label>
+        <input
+          class="form-control"
+          formControlName="idpSingleLogoutServiceUrl"
+          id="idpSingleLogoutServiceUrl"
+        />
+      </div>
+      <div class="form-group">
+        <label for="idpArtifactResolutionServiceUrl">{{
+          "idpArtifactResolutionServiceUrl" | i18n
+        }}</label>
+        <input
+          class="form-control"
+          formControlName="idpArtifactResolutionServiceUrl"
+          id="idpArtifactResolutionServiceUrl"
+        />
+      </div>
+      <div class="form-group">
+        <label for="idpX509PublicCert">{{ "idpX509PublicCert" | i18n }}</label>
         <textarea
           formControlName="idpX509PublicCert"
           class="form-control form-control-sm text-monospace"
           rows="6"
           id="idpX509PublicCert"
-          appA11yInvalid
-          aria-describedby="idpX509PublicCertDesc"
         ></textarea>
-        <small
-          id="idpX509PublicCertDesc"
-          class="error-inline"
-          role="alert"
-          *ngIf="samlForm.get('idpX509PublicCert').hasError('required')"
-        >
-          <i class="bwi bwi-exclamation-circle" aria-hidden="true"></i>
-          <span class="sr-only">{{ "error" | i18n }}:</span>
-          {{ "fieldRequiredError" | i18n: ("idpX509PublicCert" | i18n) }}
-        </small>
       </div>
-
-      <app-select
-        controlId="idpOutboundSigningAlgorithm"
-        [label]="'idpOutboundSigningAlgorithm' | i18n"
-        [selectOptions]="samlSigningAlgorithmOptions"
-        formControlName="idpOutboundSigningAlgorithm"
-      >
-      </app-select>
-
-      <!--TODO: Uncomment once Unsolicited IdP Response is supported-->
-      <!-- <app-input-checkbox
-        controlId="idpAllowUnsolicitedAuthnResponse"
-        formControlName="idpAllowUnsolicitedAuthnResponse"
-        [label]="'idpAllowUnsolicitedAuthnResponse' | i18n"
-      ></app-input-checkbox> -->
-
-      <app-input-checkbox
-        controlId="idpAllowOutboundLogoutRequests"
-        formControlName="idpAllowOutboundLogoutRequests"
-        [label]="'idpAllowOutboundLogoutRequests' | i18n"
-      ></app-input-checkbox>
-
-      <app-input-checkbox
-        controlId="idpWantAuthnRequestsSigned"
-        formControlName="idpWantAuthnRequestsSigned"
-        [label]="'idpSignAuthenticationRequests' | i18n"
-      ></app-input-checkbox>
+      <div class="form-group">
+        <label for="idpOutboundSigningAlgorithm">{{ "idpOutboundSigningAlgorithm" | i18n }}</label>
+        <select
+          class="form-control"
+          formControlName="idpOutboundSigningAlgorithm"
+          id="idpOutboundSigningAlgorithm"
+        >
+          <option *ngFor="let o of samlSigningAlgorithms" [ngValue]="o">{{ o }}</option>
+        </select>
+      </div>
+      <div class="form-group">
+        <div class="form-check">
+          <input
+            class="form-check-input"
+            type="checkbox"
+            id="idpAllowUnsolicitedAuthnResponse"
+            formControlName="idpAllowUnsolicitedAuthnResponse"
+          />
+          <label class="form-check-label" for="idpAllowUnsolicitedAuthnResponse">
+            {{ "idpAllowUnsolicitedAuthnResponse" | i18n }}
+          </label>
+        </div>
+      </div>
+      <div class="form-group">
+        <div class="form-check">
+          <input
+            class="form-check-input"
+            type="checkbox"
+            id="idpDisableOutboundLogoutRequests"
+            formControlName="idpDisableOutboundLogoutRequests"
+          />
+          <label class="form-check-label" for="idpDisableOutboundLogoutRequests">
+            {{ "idpDisableOutboundLogoutRequests" | i18n }}
+          </label>
+        </div>
+      </div>
+      <div class="form-group">
+        <div class="form-check">
+          <input
+            class="form-check-input"
+            type="checkbox"
+            id="idpWantAuthnRequestsSigned"
+            formControlName="idpWantAuthnRequestsSigned"
+          />
+          <label class="form-check-label" for="idpWantAuthnRequestsSigned">
+            {{ "idpWantAuthnRequestsSigned" | i18n }}
+          </label>
+        </div>
+      </div>
     </div>
   </div>
 
   <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
     <span>{{ "save" | i18n }}</span>
   </button>
-  <div
-    id="errorSummary"
-    class="error-summary text-danger"
-    *ngIf="this.getErrorCount(ssoConfigForm) as errorCount"
-  >
-    <i class="bwi bwi-exclamation-circle" aria-hidden="true"></i>
-    <span class="sr-only">{{ "error" | i18n }}:</span>
-    {{
-      (errorCount === 1 ? "formErrorSummarySingle" : "formErrorSummaryPlural") | i18n: errorCount
-    }}
-  </div>
 </form>

bitwarden_license/src/app/organizations/manage/sso.component.ts

@@ -1,82 +1,29 @@
 import { Component, OnInit } from "@angular/core";
-import { AbstractControl, FormBuilder, FormGroup } from "@angular/forms";
+import { FormBuilder } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
 
-import { SelectOptions } from "jslib-angular/interfaces/selectOptions";
-import { dirtyRequired } from "jslib-angular/validators/dirty.validator";
 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 {
-  OpenIdConnectRedirectBehavior,
-  Saml2BindingType,
-  Saml2NameIdFormat,
-  Saml2SigningBehavior,
-  SsoType,
-} from "jslib-common/enums/ssoEnums";
-import { Utils } from "jslib-common/misc/utils";
-import { SsoConfigApi } from "jslib-common/models/api/ssoConfigApi";
-import { Organization } from "jslib-common/models/domain/organization";
-import { OrganizationSsoRequest } from "jslib-common/models/request/organization/organizationSsoRequest";
-import { OrganizationSsoResponse } from "jslib-common/models/response/organization/organizationSsoResponse";
-import { SsoConfigView } from "jslib-common/models/view/ssoConfigView";
 
-const defaultSigningAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";
+import { Organization } from "jslib-common/models/domain/organization";
+
+import { OrganizationSsoRequest } from "jslib-common/models/request/organization/organizationSsoRequest";
 
 @Component({
   selector: "app-org-manage-sso",
   templateUrl: "sso.component.html",
 })
 export class SsoComponent implements OnInit {
-  readonly ssoType = SsoType;
-
-  readonly ssoTypeOptions: SelectOptions[] = [
-    { name: this.i18nService.t("selectType"), value: SsoType.None, disabled: true },
-    { name: "OpenID Connect", value: SsoType.OpenIdConnect },
-    { name: "SAML 2.0", value: SsoType.Saml2 },
-  ];
-
-  readonly samlSigningAlgorithms = [
+  samlSigningAlgorithms = [
     "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256",
     "http://www.w3.org/2000/09/xmldsig#rsa-sha384",
     "http://www.w3.org/2000/09/xmldsig#rsa-sha512",
     "http://www.w3.org/2000/09/xmldsig#rsa-sha1",
   ];
 
-  readonly saml2SigningBehaviourOptions: SelectOptions[] = [
-    {
-      name: "If IdP Wants Authn Requests Signed",
-      value: Saml2SigningBehavior.IfIdpWantAuthnRequestsSigned,
-    },
-    { name: "Always", value: Saml2SigningBehavior.Always },
-    { name: "Never", value: Saml2SigningBehavior.Never },
-  ];
-  readonly saml2BindingTypeOptions: SelectOptions[] = [
-    { name: "Redirect", value: Saml2BindingType.HttpRedirect },
-    { name: "HTTP POST", value: Saml2BindingType.HttpPost },
-  ];
-  readonly saml2NameIdFormatOptions: SelectOptions[] = [
-    { name: "Not Configured", value: Saml2NameIdFormat.NotConfigured },
-    { name: "Unspecified", value: Saml2NameIdFormat.Unspecified },
-    { name: "Email Address", value: Saml2NameIdFormat.EmailAddress },
-    { name: "X.509 Subject Name", value: Saml2NameIdFormat.X509SubjectName },
-    { name: "Windows Domain Qualified Name", value: Saml2NameIdFormat.WindowsDomainQualifiedName },
-    { name: "Kerberos Principal Name", value: Saml2NameIdFormat.KerberosPrincipalName },
-    { name: "Entity Identifier", value: Saml2NameIdFormat.EntityIdentifier },
-    { name: "Persistent", value: Saml2NameIdFormat.Persistent },
-    { name: "Transient", value: Saml2NameIdFormat.Transient },
-  ];
-
-  readonly connectRedirectOptions: SelectOptions[] = [
-    { name: "Redirect GET", value: OpenIdConnectRedirectBehavior.RedirectGet },
-    { name: "Form POST", value: OpenIdConnectRedirectBehavior.FormPost },
-  ];
-
-  showOpenIdCustomizations = false;
-
   loading = true;
-  haveTestedKeyConnector = false;
   organizationId: string;
   organization: Organization;
   formPromise: Promise<any>;
@@ -88,57 +35,44 @@ export class SsoComponent implements OnInit {
   spAcsUrl: string;
 
   enabled = this.formBuilder.control(false);
+  data = this.formBuilder.group({
+    configType: [],
 
-  openIdForm = this.formBuilder.group(
-    {
-      authority: ["", dirtyRequired],
-      clientId: ["", dirtyRequired],
-      clientSecret: ["", dirtyRequired],
-      metadataAddress: [],
-      redirectBehavior: [OpenIdConnectRedirectBehavior.RedirectGet, dirtyRequired],
-      getClaimsFromUserInfoEndpoint: [],
-      additionalScopes: [],
-      additionalUserIdClaimTypes: [],
-      additionalEmailClaimTypes: [],
-      additionalNameClaimTypes: [],
-      acrValues: [],
-      expectedReturnAcrValue: [],
-    },
-    {
-      updateOn: "blur",
-    }
-  );
+    keyConnectorEnabled: [],
+    keyConnectorUrl: [],
 
-  samlForm = this.formBuilder.group(
-    {
-      spNameIdFormat: [Saml2NameIdFormat.NotConfigured],
-      spOutboundSigningAlgorithm: [defaultSigningAlgorithm],
-      spSigningBehavior: [Saml2SigningBehavior.IfIdpWantAuthnRequestsSigned],
-      spMinIncomingSigningAlgorithm: [defaultSigningAlgorithm],
-      spWantAssertionsSigned: [],
-      spValidateCertificates: [],
+    // OpenId
+    authority: [],
+    clientId: [],
+    clientSecret: [],
+    metadataAddress: [],
+    redirectBehavior: [],
+    getClaimsFromUserInfoEndpoint: [],
+    additionalScopes: [],
+    additionalUserIdClaimTypes: [],
+    additionalEmailClaimTypes: [],
+    additionalNameClaimTypes: [],
+    acrValues: [],
+    expectedReturnAcrValue: [],
 
-      idpEntityId: ["", dirtyRequired],
-      idpBindingType: [Saml2BindingType.HttpRedirect],
-      idpSingleSignOnServiceUrl: [],
-      idpSingleLogoutServiceUrl: [],
-      idpX509PublicCert: ["", dirtyRequired],
-      idpOutboundSigningAlgorithm: [defaultSigningAlgorithm],
-      idpAllowUnsolicitedAuthnResponse: [],
-      idpAllowOutboundLogoutRequests: [true],
-      idpWantAuthnRequestsSigned: [],
-    },
-    {
-      updateOn: "blur",
-    }
-  );
+    // SAML
+    spNameIdFormat: [],
+    spOutboundSigningAlgorithm: [],
+    spSigningBehavior: [],
+    spMinIncomingSigningAlgorithm: [],
+    spWantAssertionsSigned: [],
+    spValidateCertificates: [],
 
-  ssoConfigForm = this.formBuilder.group({
-    configType: [SsoType.None],
-    keyConnectorEnabled: [false],
-    keyConnectorUrl: [""],
-    openId: this.openIdForm,
-    saml: this.samlForm,
+    idpEntityId: [],
+    idpBindingType: [],
+    idpSingleSignOnServiceUrl: [],
+    idpSingleLogoutServiceUrl: [],
+    idpArtifactResolutionServiceUrl: [],
+    idpX509PublicCert: [],
+    idpOutboundSigningAlgorithm: [],
+    idpAllowUnsolicitedAuthnResponse: [],
+    idpDisableOutboundLogoutRequests: [],
+    idpWantAuthnRequestsSigned: [],
   });
 
   constructor(
@@ -151,25 +85,6 @@ export class SsoComponent implements OnInit {
   ) {}
 
   async ngOnInit() {
-    this.ssoConfigForm.get("configType").valueChanges.subscribe((newType: SsoType) => {
-      if (newType === SsoType.OpenIdConnect) {
-        this.openIdForm.enable();
-        this.samlForm.disable();
-      } else if (newType === SsoType.Saml2) {
-        this.openIdForm.disable();
-        this.samlForm.enable();
-      } else {
-        this.openIdForm.disable();
-        this.samlForm.disable();
-      }
-    });
-
-    this.samlForm
-      .get("spSigningBehavior")
-      .valueChanges.subscribe(() =>
-        this.samlForm.get("idpX509PublicCert").updateValueAndValidity()
-      );
-
     this.route.parent.parent.params.subscribe(async (params) => {
       this.organizationId = params.organizationId;
       await this.load();
@@ -179,7 +94,9 @@ export class SsoComponent implements OnInit {
   async load() {
     this.organization = await this.organizationService.get(this.organizationId);
     const ssoSettings = await this.apiService.getOrganizationSso(this.organizationId);
-    this.populateForm(ssoSettings);
+
+    this.data.patchValue(ssoSettings.data);
+    this.enabled.setValue(ssoSettings.enabled);
 
     this.callbackPath = ssoSettings.urls.callbackPath;
     this.signedOutCallbackPath = ssoSettings.urls.signedOutCallbackPath;
@@ -187,30 +104,28 @@ export class SsoComponent implements OnInit {
     this.spMetadataUrl = ssoSettings.urls.spMetadataUrl;
     this.spAcsUrl = ssoSettings.urls.spAcsUrl;
 
+    this.keyConnectorUrl.markAsDirty();
+
     this.loading = false;
   }
 
+  copy(value: string) {
+    this.platformUtilsService.copyToClipboard(value);
+  }
+
+  launchUri(url: string) {
+    this.platformUtilsService.launchUri(url);
+  }
+
   async submit() {
-    this.validateForm(this.ssoConfigForm);
-
-    if (this.ssoConfigForm.get("keyConnectorEnabled").value) {
-      await this.validateKeyConnectorUrl();
-    }
-
-    if (!this.ssoConfigForm.valid) {
-      this.readOutErrors();
-      return;
-    }
-
-    const request = new OrganizationSsoRequest();
-    request.enabled = this.enabled.value;
-    request.data = SsoConfigApi.fromView(this.ssoConfigForm.value as SsoConfigView);
-
-    this.formPromise = this.apiService.postOrganizationSso(this.organizationId, request);
+    this.formPromise = this.postData();
 
     try {
       const response = await this.formPromise;
-      this.populateForm(response);
+
+      this.data.patchValue(response.data);
+      this.enabled.setValue(response.enabled);
+
       this.platformUtilsService.showToast("success", null, this.i18nService.t("ssoSettingsSaved"));
     } catch {
       // Logged by appApiAction, do nothing
@@ -219,8 +134,24 @@ export class SsoComponent implements OnInit {
     this.formPromise = null;
   }
 
+  async postData() {
+    if (this.data.get("keyConnectorEnabled").value) {
+      await this.validateKeyConnectorUrl();
+
+      if (this.keyConnectorUrl.hasError("invalidUrl")) {
+        throw new Error(this.i18nService.t("keyConnectorTestFail"));
+      }
+    }
+
+    const request = new OrganizationSsoRequest();
+    request.enabled = this.enabled.value;
+    request.data = this.data.value;
+
+    return this.apiService.postOrganizationSso(this.organizationId, request);
+  }
+
   async validateKeyConnectorUrl() {
-    if (this.haveTestedKeyConnector) {
+    if (this.keyConnectorUrl.pristine) {
       return;
     }
 
@@ -235,84 +166,18 @@ export class SsoComponent implements OnInit {
       });
     }
 
-    this.haveTestedKeyConnector = true;
-  }
-
-  toggleOpenIdCustomizations() {
-    this.showOpenIdCustomizations = !this.showOpenIdCustomizations;
-  }
-
-  getErrorCount(form: FormGroup): number {
-    return Object.values(form.controls).reduce((acc: number, control: AbstractControl) => {
-      if (control instanceof FormGroup) {
-        return acc + this.getErrorCount(control);
-      }
-
-      if (control.errors == null) {
-        return acc;
-      }
-      return acc + Object.keys(control.errors).length;
-    }, 0);
+    this.keyConnectorUrl.markAsPristine();
   }
 
   get enableTestKeyConnector() {
     return (
-      this.ssoConfigForm.get("keyConnectorEnabled").value &&
-      !Utils.isNullOrWhitespace(this.keyConnectorUrl?.value)
+      this.data.get("keyConnectorEnabled").value &&
+      this.keyConnectorUrl != null &&
+      this.keyConnectorUrl.value !== ""
     );
   }
 
   get keyConnectorUrl() {
-    return this.ssoConfigForm.get("keyConnectorUrl");
-  }
-
-  get samlSigningAlgorithmOptions(): SelectOptions[] {
-    return this.samlSigningAlgorithms.map((algorithm) => ({ name: algorithm, value: algorithm }));
-  }
-
-  private validateForm(form: FormGroup) {
-    Object.values(form.controls).forEach((control: AbstractControl) => {
-      if (control.disabled) {
-        return;
-      }
-
-      if (control instanceof FormGroup) {
-        this.validateForm(control);
-      } else {
-        control.markAsDirty();
-        control.markAsTouched();
-        control.updateValueAndValidity();
-      }
-    });
-  }
-
-  private populateForm(ssoSettings: OrganizationSsoResponse) {
-    this.enabled.setValue(ssoSettings.enabled);
-    if (ssoSettings.data != null) {
-      const ssoConfigView = new SsoConfigView(ssoSettings.data);
-      this.ssoConfigForm.patchValue(ssoConfigView);
-    }
-  }
-
-  private readOutErrors() {
-    const errorText = this.i18nService.t("error");
-    const errorCount = this.getErrorCount(this.ssoConfigForm);
-    const errorCountText = this.i18nService.t(
-      errorCount === 1 ? "formErrorSummarySingle" : "formErrorSummaryPlural",
-      errorCount.toString()
-    );
-
-    const div = document.createElement("div");
-    div.className = "sr-only";
-    div.id = "srErrorCount";
-    div.setAttribute("aria-live", "polite");
-    div.innerText = errorText + ": " + errorCountText;
-
-    const existing = document.getElementById("srErrorCount");
-    if (existing != null) {
-      existing.remove();
-    }
-
-    document.body.append(div);
+    return this.data.get("keyConnectorUrl");
   }
 }

bitwarden_license/src/app/organizations/organizations-routing.module.ts

@@ -2,6 +2,7 @@ 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";

bitwarden_license/src/app/organizations/organizations.module.ts

@@ -4,23 +4,11 @@ import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 
 import { OssModule } from "src/app/oss.module";
 
-import { InputCheckboxComponent } from "./components/input-checkbox.component";
-import { InputTextReadOnlyComponent } from "./components/input-text-readonly.component";
-import { InputTextComponent } from "./components/input-text.component";
-import { SelectComponent } from "./components/select.component";
 import { SsoComponent } from "./manage/sso.component";
 import { OrganizationsRoutingModule } from "./organizations-routing.module";
 
-// Form components are for use in the SSO Configuration Form only and should not be exported for use elsewhere.
-// They will be deprecated by the Component Library.
 @NgModule({
   imports: [CommonModule, FormsModule, ReactiveFormsModule, OssModule, OrganizationsRoutingModule],
-  declarations: [
-    InputCheckboxComponent,
-    InputTextComponent,
-    InputTextReadOnlyComponent,
-    SelectComponent,
-    SsoComponent,
-  ],
+  declarations: [SsoComponent],
 })
 export class OrganizationsModule {}

bitwarden_license/src/app/policies/disable-personal-vault-export.component.ts

@@ -1,7 +1,12 @@
 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,

bitwarden_license/src/app/policies/maximum-vault-timeout.component.ts

@@ -2,7 +2,9 @@ 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 {

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="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
           {{ "loading" | i18n }}
         </div>
         <ng-container *ngIf="!loading">

bitwarden_license/src/app/providers/clients/add-organization.component.ts

@@ -1,14 +1,16 @@
 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 { Organization } from "jslib-common/models/domain/organization";
-import { Provider } from "jslib-common/models/domain/provider";
+
+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";
+
 @Component({
   selector: "provider-add-organization",
   templateUrl: "add-organization.component.html",

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="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
+      <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
       {{ "newClientOrganization" | i18n }}
     </a>
     <button
@@ -21,18 +21,14 @@
       (click)="addExistingOrganization()"
       *ngIf="manageOrganizations && showAddExisting"
     >
-      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
+      <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
       {{ "addExistingOrganization" | i18n }}
     </button>
   </div>
 </div>
 
 <ng-container *ngIf="loading">
-  <i
-    class="bwi bwi-spinner bwi-spin text-muted"
-    title="{{ 'loading' | i18n }}"
-    aria-hidden="true"
-  ></i>
+  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
   <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 
@@ -71,11 +67,11 @@
                 aria-expanded="false"
                 appA11yTitle="{{ 'options' | i18n }}"
               >
-                <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
+                <i class="fa fa-cog fa-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="bwi bwi-fw bwi-close" aria-hidden="true"></i>
+                  <i class="fa fa-fw fa-remove" aria-hidden="true"></i>
                   {{ "remove" | i18n }}
                 </a>
               </div>

bitwarden_license/src/app/providers/clients/clients.component.ts

@@ -1,9 +1,8 @@
 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";
@@ -11,8 +10,13 @@ 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";
 

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="bwi bwi-spinner bwi-spin bwi-2x text-muted"
+        class="fa fa-spinner fa-spin fa-2x text-muted"
         title="{{ 'loading' | i18n }}"
         aria-hidden="true"
       ></i>

bitwarden_license/src/app/providers/manage/accept-provider.component.ts

@@ -1,14 +1,15 @@
 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",

bitwarden_license/src/app/providers/manage/bulk/bulk-confirm.component.ts

@@ -1,9 +1,10 @@
 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";
 

bitwarden_license/src/app/providers/manage/events.component.html

@@ -32,9 +32,9 @@
         [disabled]="loaded && refreshForm.loading"
       >
         <i
-          class="bwi bwi-refresh bwi-fw"
+          class="fa fa-refresh fa-fw"
           aria-hidden="true"
-          [ngClass]="{ 'bwi-spin': loaded && refreshForm.loading }"
+          [ngClass]="{ 'fa-spin': loaded && refreshForm.loading }"
         ></i>
         {{ "refresh" | i18n }}
       </button>
@@ -47,18 +47,14 @@
         (click)="exportEvents()"
         [disabled]="(loaded && exportForm.loading) || dirtyDates"
       >
-        <i class="bwi bwi-spinner bwi-spin" aria-hidden="true"></i>
+        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
         <span>{{ "export" | i18n }}</span>
       </button>
     </form>
   </div>
 </div>
 <ng-container *ngIf="!loaded">
-  <i
-    class="bwi bwi-spinner bwi-spin text-muted"
-    title="{{ 'loading' | i18n }}"
-    aria-hidden="true"
-  ></i>
+  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
   <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container *ngIf="loaded">
@@ -79,7 +75,7 @@
         <td>{{ e.date | date: "medium" }}</td>
         <td>
           <i
-            class="text-muted bwi bwi-lg {{ e.appIcon }}"
+            class="text-muted fa fa-lg {{ e.appIcon }}"
             title="{{ e.appName }}, {{ e.ip }}"
             aria-hidden="true"
           ></i>
@@ -101,7 +97,7 @@
     [disabled]="loaded && moreBtn.loading"
     *ngIf="continuationToken"
   >
-    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
     <span>{{ "loadMore" | i18n }}</span>
   </button>
 </ng-container>

bitwarden_license/src/app/providers/manage/events.component.ts

@@ -1,24 +1,27 @@
 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 { BaseEventsComponent } from "src/app/common/base.events.component";
 import { EventService } from "src/app/services/event.service";
 
+import { BaseEventsComponent } from "src/app/common/base.events.component";
+
 @Component({
   selector: "provider-events",
   templateUrl: "events.component.html",
 })
 export class EventsComponent extends BaseEventsComponent implements OnInit {
-  exportFileName = "provider-events";
+  exportFileName: string = "provider-events";
   providerId: string;
 
   private providerUsersUserIdMap = new Map<string, any>();

bitwarden_license/src/app/providers/manage/manage.component.ts

@@ -2,6 +2,7 @@ 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({

bitwarden_license/src/app/providers/manage/people.component.html

@@ -52,11 +52,11 @@
         aria-expanded="false"
         appA11yTitle="{{ 'options' | i18n }}"
       >
-        <i class="bwi bwi-cog" aria-hidden="true"></i>
+        <i class="fa fa-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="bwi bwi-fw bwi-envelope" aria-hidden="true"></i>
+          <i class="fa fa-fw fa-envelope-o" aria-hidden="true"></i>
           {{ "reinviteSelected" | i18n }}
         </button>
         <button
@@ -65,36 +65,32 @@
           (click)="bulkConfirm()"
           *ngIf="showBulkConfirmUsers"
         >
-          <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
+          <i class="fa fa-fw fa-check" aria-hidden="true"></i>
           {{ "confirmSelected" | i18n }}
         </button>
         <button class="dropdown-item text-danger" appStopClick (click)="bulkRemove()">
-          <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
+          <i class="fa fa-fw fa-remove" aria-hidden="true"></i>
           {{ "remove" | i18n }}
         </button>
         <div class="dropdown-divider"></div>
         <button class="dropdown-item" appStopClick (click)="selectAll(true)">
-          <i class="bwi bwi-fw bwi-check-square" aria-hidden="true"></i>
+          <i class="fa fa-fw fa-check-square-o" aria-hidden="true"></i>
           {{ "selectAll" | i18n }}
         </button>
         <button class="dropdown-item" appStopClick (click)="selectAll(false)">
-          <i class="bwi bwi-fw bwi-minus-square" aria-hidden="true"></i>
+          <i class="fa fa-fw fa-minus-square-o" 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="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
+      <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
       {{ "inviteUser" | i18n }}
     </button>
   </div>
 </div>
 <ng-container *ngIf="loading">
-  <i
-    class="bwi bwi-spinner bwi-spin text-muted"
-    title="{{ 'loading' | i18n }}"
-    aria-hidden="true"
-  ></i>
+  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
   <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container
@@ -108,7 +104,7 @@
     <app-callout
       type="info"
       title="{{ 'confirmUsers' | i18n }}"
-      icon="bwi bwi-check-circle"
+      icon="fa-check-circle"
       *ngIf="showConfirmUsers"
     >
       {{ "providerUsersNeedConfirmed" | i18n }}
@@ -132,8 +128,7 @@
               size="25"
               [circle]="true"
               [fontSize]="14"
-            >
-            </app-avatar>
+            ></app-avatar>
           </td>
           <td>
             <a href="#" appStopClick (click)="edit(u)">{{ u.email }}</a>
@@ -147,11 +142,7 @@
           </td>
           <td>
             <ng-container *ngIf="u.twoFactorEnabled">
-              <i
-                class="bwi bwi-lock"
-                title="{{ 'userUsingTwoStep' | i18n }}"
-                aria-hidden="true"
-              ></i>
+              <i class="fa fa-lock" title="{{ 'userUsingTwoStep' | i18n }}" aria-hidden="true"></i>
               <span class="sr-only">{{ "userUsingTwoStep" | i18n }}</span>
             </ng-container>
           </td>
@@ -170,7 +161,7 @@
                 aria-expanded="false"
                 appA11yTitle="{{ 'options' | i18n }}"
               >
-                <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
+                <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
               </button>
               <div class="dropdown-menu dropdown-menu-right">
                 <a
@@ -180,7 +171,7 @@
                   (click)="reinvite(u)"
                   *ngIf="u.status === userStatusType.Invited"
                 >
-                  <i class="bwi bwi-fw bwi-envelope" aria-hidden="true"></i>
+                  <i class="fa fa-fw fa-envelope-o" aria-hidden="true"></i>
                   {{ "resendInvitation" | i18n }}
                 </a>
                 <a
@@ -190,7 +181,7 @@
                   (click)="confirm(u)"
                   *ngIf="u.status === userStatusType.Accepted"
                 >
-                  <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
+                  <i class="fa fa-fw fa-check" aria-hidden="true"></i>
                   {{ "confirm" | i18n }}
                 </a>
                 <a
@@ -200,7 +191,7 @@
                   (click)="groups(u)"
                   *ngIf="accessGroups"
                 >
-                  <i class="bwi bwi-fw bwi-sitemap" aria-hidden="true"></i>
+                  <i class="fa fa-fw fa-sitemap" aria-hidden="true"></i>
                   {{ "groups" | i18n }}
                 </a>
                 <a
@@ -210,11 +201,11 @@
                   (click)="events(u)"
                   *ngIf="accessEvents && u.status === userStatusType.Confirmed"
                 >
-                  <i class="bwi bwi-fw bwi-file-text" aria-hidden="true"></i>
+                  <i class="fa fa-fw fa-file-text-o" aria-hidden="true"></i>
                   {{ "eventLogs" | i18n }}
                 </a>
                 <a class="dropdown-item text-danger" href="#" appStopClick (click)="remove(u)">
-                  <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
+                  <i class="fa fa-fw fa-remove" aria-hidden="true"></i>
                   {{ "remove" | i18n }}
                 </a>
               </div>

bitwarden_license/src/app/providers/manage/people.component.ts

@@ -1,11 +1,8 @@
 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";
@@ -14,18 +11,26 @@ 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";
@@ -153,13 +158,17 @@ export class PeopleComponent
   }
 
   async events(user: ProviderUserUserDetailsResponse) {
-    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";
-    });
+    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";
+      }
+    );
   }
 
   async bulkRemove() {
@@ -263,14 +272,13 @@ 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), // eslint-disable-line
+            error: keyedErrors.hasOwnProperty(user.id),
             message: message,
           };
         });

bitwarden_license/src/app/providers/manage/user-add-edit.component.html

@@ -23,7 +23,7 @@
       </div>
       <div class="modal-body" *ngIf="loading">
         <i
-          class="bwi bwi-spinner bwi-spin text-muted"
+          class="fa fa-spinner fa-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/provider-users/"
+            href="https://bitwarden.com/help/article/user-types-access-control/#user-types"
           >
-            <i class="bwi bwi-question-circle" aria-hidden="true"></i>
+            <i class="fa fa-question-circle-o" 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="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="fa fa-spinner fa-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="bwi bwi-trash bwi-lg bwi-fw"
+              class="fa fa-trash-o fa-lg fa-fw"
               [hidden]="deleteBtn.loading"
               aria-hidden="true"
             ></i>
             <i
-              class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
+              class="fa fa-spinner fa-spin fa-lg fa-fw"
               [hidden]="!deleteBtn.loading"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"

bitwarden_license/src/app/providers/manage/user-add-edit.component.ts

@@ -4,9 +4,12 @@ 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 { ProviderUserType } from "jslib-common/enums/providerUserType";
-import { PermissionsApi } from "jslib-common/models/api/permissionsApi";
+
 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 { ProviderUserUpdateRequest } from "jslib-common/models/request/provider/providerUserUpdateRequest";
 
 @Component({
@@ -21,7 +24,7 @@ export class UserAddEditComponent implements OnInit {
   @Output() onDeletedUser = new EventEmitter();
 
   loading = true;
-  editMode = false;
+  editMode: boolean = false;
   title: string;
   emails: string;
   type: ProviderUserType = ProviderUserType.ServiceUser;

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="bwi bwi-exclamation-triangle" aria-hidden="true"></i>
+            <i class="fa fa-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="bwi bwi-bank" aria-hidden="true"></i>
+            <i class="fa fa-university" aria-hidden="true"></i>
             {{ "clients" | i18n }}
           </a>
         </li>
         <li class="nav-item" *ngIf="showManageTab">
           <a class="nav-link" [routerLink]="manageRoute" routerLinkActive="active">
-            <i class="bwi bwi-sliders" aria-hidden="true"></i>
+            <i class="fa fa-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="bwi bwi-cogs" aria-hidden="true"></i>
+            <i class="fa fa-cogs" aria-hidden="true"></i>
             {{ "settings" | i18n }}
           </a>
         </li>

bitwarden_license/src/app/providers/providers-layout.component.ts

@@ -2,6 +2,7 @@ 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({

bitwarden_license/src/app/providers/providers-routing.module.ts

@@ -4,9 +4,7 @@ import { RouterModule, Routes } from "@angular/router";
 import { AuthGuardService } from "jslib-angular/services/auth-guard.service";
 import { Permissions } from "jslib-common/enums/permissions";
 
-import { FrontendLayoutComponent } from "src/app/layouts/frontend-layout.component";
-import { ProvidersComponent } from "src/app/providers/providers.component";
-
+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";
@@ -14,13 +12,17 @@ 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 { 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";
 
+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";
+
 const routes: Routes = [
   {
     path: "",

bitwarden_license/src/app/providers/providers.module.ts

@@ -1,14 +1,21 @@
 import { CommonModule } from "@angular/common";
-import { ComponentFactoryResolver, NgModule } from "@angular/core";
+import { ComponentFactoryResolver } from "@angular/core";
+import { NgModule } from "@angular/core";
 import { FormsModule } from "@angular/forms";
 
 import { ModalService } from "jslib-angular/services/modal.service";
 
-import { OssModule } from "src/app/oss.module";
+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 { 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";
@@ -16,16 +23,15 @@ 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: [

bitwarden_license/src/app/providers/services/provider-type-guard.service.ts

@@ -2,6 +2,7 @@ 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()

bitwarden_license/src/app/providers/services/webProvider.service.ts

@@ -3,6 +3,7 @@ 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()

bitwarden_license/src/app/providers/settings/account.component.html

@@ -2,11 +2,7 @@
   <h1>{{ "myProvider" | i18n }}</h1>
 </div>
 <div *ngIf="loading">
-  <i
-    class="bwi bwi-spinner bwi-spin text-muted"
-    title="{{ 'loading' | i18n }}"
-    aria-hidden="true"
-  ></i>
+  <i class="fa fa-spinner fa-spin text-muted" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
   <span class="sr-only">{{ "loading" | i18n }}</span>
 </div>
 <form
@@ -46,7 +42,7 @@
     </div>
   </div>
   <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
     <span>{{ "save" | i18n }}</span>
   </button>
 </form>

bitwarden_license/src/app/providers/settings/account.component.ts

@@ -6,7 +6,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 { 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({

bitwarden_license/src/app/providers/settings/settings.component.ts

@@ -1,6 +1,7 @@
 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({
@@ -8,11 +9,15 @@ import { ProviderService } from "jslib-common/abstractions/provider.service";
   templateUrl: "settings.component.html",
 })
 export class SettingsComponent {
-  constructor(private route: ActivatedRoute, private providerService: ProviderService) {}
+  constructor(
+    private route: ActivatedRoute,
+    private providerService: ProviderService,
+    private platformUtilsService: PlatformUtilsService
+  ) {}
 
   ngOnInit() {
     this.route.parent.params.subscribe(async (params) => {
-      await this.providerService.get(params.providerId);
+      const provider = await this.providerService.get(params.providerId);
     });
   }
 }

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="bwi bwi-spinner bwi-spin bwi-2x text-muted"
+        class="fa fa-spinner fa-spin fa-2x text-muted"
         title="{{ 'loading' | i18n }}"
         aria-hidden="true"
       ></i>

bitwarden_license/src/app/providers/setup/setup-provider.component.ts

@@ -16,7 +16,6 @@ export class SetupProviderComponent extends BaseAcceptComponent {
     this.router.navigate(["/providers/setup"], { queryParams: qParams });
   }
 
-  async unauthedHandler(qParams: any) {
-    // Empty
-  }
+  // tslint:disable-next-line
+  async unauthedHandler(qParams: any) {}
 }

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="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+        <i class="fa fa-spinner fa-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">

bitwarden_license/src/app/providers/setup/setup.component.ts

@@ -1,10 +1,12 @@
 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";
@@ -46,7 +48,9 @@ export class SetupComponent implements OnInit {
           "error",
           null,
           this.i18nService.t("emergencyInviteAcceptFailed"),
-          { timeout: 10000 }
+          {
+            timeout: 10000,
+          }
         );
         this.router.navigate(["/"]);
         return;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/web-vault",
-  "version": "2.27.0",
+  "version": "2.25.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": "eslint . && prettier --check .",
-    "lint:fix": "eslint . --fix",
+    "lint": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts' && prettier --check .",
+    "lint:fix": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts' --fix",
     "prettier": "prettier --write .",
     "prepare": "husky install"
   },
@@ -41,17 +41,11 @@
     "@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",
@@ -61,12 +55,13 @@
     "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",
@@ -90,11 +85,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",
-    "jszip": "^3.7.1",
     "ngx-infinite-scroll": "^10.0.1",
     "ngx-toastr": "14.1.4",
-    "node-forge": "^0.10.0",
     "popper.js": "1.16.1",
     "qrious": "4.0.2",
     "rxjs": "^7.4.0",
@@ -107,8 +101,7 @@
     "npm": "~8"
   },
   "lint-staged": {
-    "./!(jslib)**": "prettier --ignore-unknown --write",
-    "*.ts": "eslint --fix",
+    "*": "prettier --ignore-unknown --write",
     "*.png": "node scripts/optimize.js"
   }
 }

src/404.html

@@ -9,7 +9,13 @@
       href="/404/bootstrap.min.css"
       rel="stylesheet"
       type="text/css"
-      integrity="sha384-hA/ESrxp2b05ywLtD9YwM6m+pNyLRY4+ruk6dWK00SM4k6SQs0bfrITJVSf6uZyH"
+      integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l"
+    />
+    <link
+      href="/404/font-awesome.min.css"
+      rel="stylesheet"
+      type="text/css"
+      integrity="sha512-SfTiTlX6kk+qitfevl/7LibUOeJWlt9rbyDn92a1DqWOw9vWG2MFoays0sgObmWazO5BQPiFucnnEAjpAB+/Sw=="
     />
     <link href="/404/styles.css" rel="stylesheet" type="text/css" />
 
@@ -27,9 +33,7 @@
     <div class="banner">
       <div class="container inner banner">
         <div class="row align-items-center">
-          <div class="col brand">
-            <i class="bwi bwi-shield"></i>&nbsp; <strong>bit</strong>warden
-          </div>
+          <div class="col brand"><i class="fa fa-shield"></i>&nbsp; <strong>bit</strong>warden</div>
         </div>
       </div>
     </div>

src/404/styles.css

@@ -119,33 +119,3 @@ 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";
-}

src/abstractions/state.service.ts

@@ -1,9 +0,0 @@
-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>;
-}

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="bwi bwi-spinner bwi-spin bwi-2x text-muted"
+        class="fa fa-spinner fa-spin fa-2x text-muted"
         title="{{ 'loading' | i18n }}"
         aria-hidden="true"
       ></i>

src/app/accounts/accept-emergency.component.ts

@@ -6,7 +6,6 @@ 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({

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="bwi bwi-spinner bwi-spin bwi-2x text-muted"
+        class="fa fa-spinner fa-spin fa-2x text-muted"
         title="{{ 'loading' | i18n }}"
         aria-hidden="true"
       ></i>

src/app/accounts/accept-organization.component.ts

@@ -8,11 +8,12 @@ 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({

src/app/accounts/hint.component.html

@@ -28,7 +28,7 @@
             >
               <span [hidden]="form.loading">{{ "submit" | i18n }}</span>
               <i
-                class="bwi bwi-spinner bwi-spin"
+                class="fa fa-spinner fa-spin"
                 title="{{ 'loading' | i18n }}"
                 aria-hidden="true"
               ></i>

src/app/accounts/hint.component.ts

@@ -1,12 +1,13 @@
 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",

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="bwi bwi-lock bwi-4x text-muted" aria-hidden="true"></i>
+        <i class="fa fa-lock fa-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="bwi bwi-lg"
+                  class="fa fa-lg"
                   aria-hidden="true"
-                  [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
+                  [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
                 ></i>
               </button>
             </div>
@@ -44,9 +44,11 @@
               class="btn btn-primary btn-block btn-submit"
               [disabled]="form.loading"
             >
-              <span> <i class="bwi bwi-unlock" aria-hidden="true"></i> {{ "unlock" | i18n }} </span>
+              <span>
+                <i class="fa fa-unlock-alt" aria-hidden="true"></i> {{ "unlock" | i18n }}
+              </span>
               <i
-                class="bwi bwi-spinner bwi-spin"
+                class="fa fa-spinner fa-spin"
                 title="{{ 'loading' | i18n }}"
                 aria-hidden="true"
               ></i>

src/app/accounts/lock.component.ts

@@ -1,7 +1,6 @@
 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";
@@ -15,6 +14,8 @@ 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",

src/app/accounts/login.component.html

@@ -44,9 +44,9 @@
                 (click)="togglePassword()"
               >
                 <i
-                  class="bwi bwi-lg"
+                  class="fa fa-lg"
                   aria-hidden="true"
-                  [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
+                  [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
                 ></i>
               </button>
             </div>
@@ -74,9 +74,9 @@
               class="btn btn-primary btn-block btn-submit"
               [disabled]="form.loading"
             >
-              <span> <i class="bwi bwi-sign-in" aria-hidden="true"></i> {{ "logIn" | i18n }} </span>
+              <span> <i class="fa fa-sign-in" aria-hidden="true"></i> {{ "logIn" | i18n }} </span>
               <i
-                class="bwi bwi-spinner bwi-spin"
+                class="fa fa-spinner fa-spin"
                 title="{{ 'loading' | i18n }}"
                 aria-hidden="true"
               ></i>
@@ -86,13 +86,12 @@
               [queryParams]="{ email: email }"
               class="btn btn-outline-secondary btn-block ml-2 mt-0"
             >
-              <i class="bwi bwi-pencil-square" aria-hidden="true"></i>
-              {{ "createAccount" | i18n }}
+              <i class="fa fa-pencil-square-o" 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="bwi bwi-bank" aria-hidden="true"></i> {{ "enterpriseSingleSignOn" | i18n }}
+              <i class="fa fa-bank" aria-hidden="true"></i> {{ "enterpriseSingleSignOn" | i18n }}
             </a>
           </div>
         </div>

src/app/accounts/login.component.ts

@@ -1,25 +1,22 @@
 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";
 import { EnvironmentService } from "jslib-common/abstractions/environment.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 { 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 "jslib-common/abstractions/state.service";
 
-import { StateService } from "../../abstractions/state.service";
+import { LoginComponent as BaseLoginComponent } from "jslib-angular/components/login.component";
+
+import { Policy } from "jslib-common/models/domain/policy";
 
 @Component({
   selector: "app-login",
@@ -27,14 +24,13 @@ import { StateService } from "../../abstractions/state.service";
 })
 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,
@@ -42,9 +38,7 @@ export class LoginComponent extends BaseLoginComponent {
     private apiService: ApiService,
     private policyService: PolicyService,
     logService: LogService,
-    ngZone: NgZone,
-    protected stateService: StateService,
-    private messagingService: MessagingService
+    ngZone: NgZone
   ) {
     super(
       authService,
@@ -58,9 +52,6 @@ export class LoginComponent extends BaseLoginComponent {
       logService,
       ngZone
     );
-    this.onSuccessfulLogin = async () => {
-      this.messagingService.send("setFullWidth");
-    };
     this.onSuccessfulLoginNavigate = this.goAfterLogIn;
   }
 
@@ -87,64 +78,35 @@ 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 {
-        this.policies = await this.apiService.getPoliciesByToken(
+        const policies = await this.apiService.getPoliciesByToken(
           invite.organizationId,
           invite.token,
           invite.email,
           invite.organizationUserId
         );
-        policyList = this.policyService.mapPoliciesFromToken(this.policies);
+        policyList = this.policyService.mapPoliciesFromToken(policies);
       } catch (e) {
         this.logService.error(e);
       }
 
       if (policyList != null) {
-        const resetPasswordPolicy = this.policyService.getResetPasswordPolicyOptions(
+        const result = this.policyService.getResetPasswordPolicyOptions(
           policyList,
           invite.organizationId
         );
         // Set to true if policy enabled and auto-enroll enabled
-        this.showResetPasswordAutoEnrollWarning =
-          resetPasswordPolicy[1] && resetPasswordPolicy[0].autoEnrollEnabled;
-
-        this.enforcedPasswordPolicyOptions =
-          await this.policyService.getMasterPasswordPolicyOptions(policyList);
+        this.showResetPasswordAutoEnrollWarning = result[1] && result[0].autoEnrollEnabled;
       }
     }
   }
 
   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 });
@@ -153,27 +115,4 @@ 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;
-  }
 }

src/app/accounts/recover-delete.component.html

@@ -28,7 +28,7 @@
             >
               <span>{{ "submit" | i18n }}</span>
               <i
-                class="bwi bwi-spinner bwi-spin"
+                class="fa fa-spinner fa-spin"
                 title="{{ 'loading' | i18n }}"
                 aria-hidden="true"
               ></i>

src/app/accounts/recover-delete.component.ts

@@ -5,6 +5,7 @@ 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({

src/app/accounts/recover-two-factor.component.html

@@ -7,7 +7,7 @@
           <p>
             {{ "recoverAccountTwoStepDesc" | i18n }}
             <a
-              href="https://bitwarden.com/help/lost-two-step-device/"
+              href="https://help.bitwarden.com/article/lost-two-step-device/"
               target="_blank"
               rel="noopener"
               >{{ "learnMore" | i18n }}</a
@@ -60,7 +60,7 @@
             >
               <span>{{ "submit" | i18n }}</span>
               <i
-                class="bwi bwi-spinner bwi-spin"
+                class="fa fa-spinner fa-spin"
                 title="{{ 'loading' | i18n }}"
                 aria-hidden="true"
               ></i>

src/app/accounts/recover-two-factor.component.ts

@@ -7,6 +7,7 @@ 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({

src/app/accounts/register.component.html

@@ -1,100 +1,44 @@
 <div class="layout" [ngClass]="['layout', layout]">
-  <!-- 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'
-    "
-  >
+  <header class="header" *ngIf="layout === 'enterprise2'">
     <div class="container">
       <div class="row">
         <div class="col-7">
           <img
             alt="Bitwarden"
             class="logo mb-2"
-            src="../../images/register-layout/logo-horizontal-white.svg"
+            src="../../images/register-layout/logo-horizontal-white.png"
           />
         </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">
-          <!-- 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>
+          <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>
             <p>Collaborate and share securely</p>
-            <p>Access anywhere on any device</p>
-            <p>Create your account to get started</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>
           </div>
-
-          <!-- 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 *ngIf="layout === 'enterprise3'">
+            <p>Enterprise 3 layout</p>
           </div>
-
-          <!-- 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 *ngIf="layout === 'enterprise4'">
+            <p>Enterprise 4 layout</p>
           </div>
         </div>
       </div>
@@ -107,7 +51,7 @@
                 <app-callout
                   title="{{ 'createOrganizationStep1' | i18n }}"
                   type="info"
-                  icon="bwi bwi-thumb-tack"
+                  icon="fa-thumb-tack"
                   *ngIf="showCreateOrgMessage"
                 >
                   {{ "createOrganizationCreatePersonalAccount" | i18n }}
@@ -170,11 +114,11 @@
                         (click)="togglePassword(false)"
                       >
                         <i
-                          class="bwi bwi-lg"
+                          class="fa fa-lg"
                           aria-hidden="true"
                           [ngClass]="{
-                            'bwi-eye': !showPassword,
-                            'bwi-eye-slash': showPassword
+                            'fa-eye': !showPassword,
+                            'fa-eye-slash': showPassword
                           }"
                         ></i>
                       </button>
@@ -202,9 +146,9 @@
                       (click)="togglePassword(true)"
                     >
                       <i
-                        class="bwi bwi-lg"
+                        class="fa fa-lg"
                         aria-hidden="true"
-                        [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
+                        [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
                       ></i>
                     </button>
                   </div>
@@ -253,7 +197,7 @@
                   >
                     <span>{{ "submit" | i18n }}</span>
                     <i
-                      class="bwi bwi-spinner bwi-spin"
+                      class="fa fa-spinner fa-spin"
                       title="{{ 'loading' | i18n }}"
                       aria-hidden="true"
                     ></i>
@@ -268,88 +212,5 @@
         </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>

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,9 +13,13 @@ 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 { PolicyData } from "jslib-common/models/data/policyData";
+
+import { RegisterComponent as BaseRegisterComponent } from "jslib-angular/components/register.component";
+
 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({

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="bwi bwi-spinner bwi-spin bwi-2x text-muted"
+        class="fa fa-spinner fa-spin fa-2x text-muted"
         title="{{ 'loading' | i18n }}"
         aria-hidden="true"
       ></i>
@@ -27,7 +27,7 @@
             [disabled]="actionPromise"
           >
             <i
-              class="bwi bwi-spinner bwi-spin"
+              class="fa fa-spinner fa-spin"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"
               *ngIf="continuing"
@@ -41,7 +41,7 @@
             [disabled]="actionPromise"
           >
             <i
-              class="bwi bwi-spinner bwi-spin"
+              class="fa fa-spinner fa-spin"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"
               *ngIf="leaving"

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="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="fa fa-spinner fa-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="bwi bwi-lg"
+                    class="fa fa-lg"
                     aria-hidden="true"
-                    [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
+                    [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
                   ></i>
                 </button>
                 <div class="progress-bar invisible"></div>
@@ -76,9 +76,9 @@
                 (click)="togglePassword(true)"
               >
                 <i
-                  class="bwi bwi-lg"
+                  class="fa fa-lg"
                   aria-hidden="true"
-                  [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
+                  [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
                 ></i>
               </button>
             </div>
@@ -96,7 +96,7 @@
               [disabled]="form.loading"
             >
               <i
-                class="bwi bwi-spinner bwi-spin"
+                class="fa fa-spinner fa-spin"
                 title="{{ 'loading' | i18n }}"
                 aria-hidden="true"
               ></i>

src/app/accounts/set-password.component.ts

@@ -1,7 +1,6 @@
 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";
@@ -12,6 +11,8 @@ 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",

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="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
+          <i class="fa fa-spinner fa-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="bwi bwi-sign-in" aria-hidden="true"></i> {{ "logIn" | i18n }} </span>
+              <span> <i class="fa fa-sign-in" aria-hidden="true"></i> {{ "logIn" | i18n }} </span>
               <i
-                class="bwi bwi-spinner bwi-spin"
+                class="fa fa-spinner fa-spin"
                 title="{{ 'loading' | i18n }}"
                 aria-hidden="true"
               ></i>

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,6 +13,8 @@ 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",

src/app/accounts/two-factor-options.component.ts

@@ -1,10 +1,11 @@
 import { Component } from "@angular/core";
 import { Router } from "@angular/router";
 
-import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "jslib-angular/components/two-factor-options.component";
+import { AuthService } from "jslib-common/abstractions/auth.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service";
+
+import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "jslib-angular/components/two-factor-options.component";
 
 @Component({
   selector: "app-two-factor-options",
@@ -12,11 +13,11 @@ import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service";
 })
 export class TwoFactorOptionsComponent extends BaseTwoFactorOptionsComponent {
   constructor(
-    twoFactorService: TwoFactorService,
+    authService: AuthService,
     router: Router,
     i18nService: I18nService,
     platformUtilsService: PlatformUtilsService
   ) {
-    super(twoFactorService, router, i18nService, platformUtilsService, window);
+    super(authService, router, i18nService, platformUtilsService, window);
   }
 }

src/app/accounts/two-factor.component.html

@@ -94,7 +94,7 @@
             </div>
           </ng-container>
           <i
-            class="bwi bwi-spinner text-muted bwi-spin pull-right"
+            class="fa fa-spinner text-muted fa-spin pull-right"
             title="{{ 'loading' | i18n }}"
             *ngIf="form.loading && selectedProviderType === providerType.WebAuthn"
             aria-hidden="true"
@@ -114,9 +114,6 @@
             <p>{{ "noTwoStepProviders2" | i18n }}</p>
           </ng-container>
           <hr />
-          <div [hidden]="!showCaptcha()">
-            <iframe id="hcaptcha_iframe" height="80"></iframe>
-          </div>
           <div class="d-flex mb-3">
             <button
               type="submit"
@@ -130,10 +127,10 @@
               "
             >
               <span>
-                <i class="bwi bwi-sign-in" aria-hidden="true"></i> {{ "continue" | i18n }}
+                <i class="fa fa-sign-in" aria-hidden="true"></i> {{ "continue" | i18n }}
               </span>
               <i
-                class="bwi bwi-spinner bwi-spin"
+                class="fa fa-spinner fa-spin"
                 title="{{ 'loading' | i18n }}"
                 aria-hidden="true"
               ></i>

src/app/accounts/two-factor.component.ts

@@ -1,8 +1,7 @@
 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";
@@ -10,9 +9,13 @@ 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 { TwoFactorService } from "jslib-common/abstractions/twoFactor.service";
+
+import { ModalService } from "jslib-angular/services/modal.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({
@@ -33,8 +36,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
     environmentService: EnvironmentService,
     private modalService: ModalService,
     route: ActivatedRoute,
-    logService: LogService,
-    twoFactorService: TwoFactorService
+    logService: LogService
   ) {
     super(
       authService,
@@ -46,8 +48,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
       environmentService,
       stateService,
       route,
-      logService,
-      twoFactorService
+      logService
     );
     this.onSuccessfulLoginNavigate = this.goAfterLogIn;
   }

src/app/accounts/update-password.component.html

@@ -1,90 +0,0 @@
-<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>

src/app/accounts/update-password.component.ts

@@ -1,48 +0,0 @@
-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
-    );
-  }
-}

src/app/accounts/update-temp-password.component.html

@@ -36,9 +36,9 @@
                   (click)="togglePassword(false)"
                 >
                   <i
-                    class="bwi bwi-lg"
+                    class="fa fa-lg"
                     aria-hidden="true"
-                    [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
+                    [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
                   ></i>
                 </button>
                 <div class="progress-bar invisible"></div>
@@ -64,9 +64,9 @@
                 (click)="togglePassword(true)"
               >
                 <i
-                  class="bwi bwi-lg"
+                  class="fa fa-lg"
                   aria-hidden="true"
-                  [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
+                  [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
                 ></i>
               </button>
             </div>
@@ -84,7 +84,7 @@
               [disabled]="form.loading"
             >
               <i
-                class="bwi bwi-spinner bwi-spin"
+                class="fa fa-spinner fa-spin"
                 title="{{ 'loading' | i18n }}"
                 aria-hidden="true"
               ></i>

src/app/accounts/update-temp-password.component.ts

@@ -1,6 +1,5 @@
 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";
@@ -9,9 +8,11 @@ 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 { 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";
+
 @Component({
   selector: "app-update-temp-password",
   templateUrl: "update-temp-password.component.html",

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="bwi bwi-spinner bwi-spin bwi-2x text-muted"
+        class="fa fa-spinner fa-spin fa-2x text-muted"
         title="{{ 'loading' | i18n }}"
         aria-hidden="true"
       ></i>

src/app/accounts/verify-email-token.component.ts

@@ -1,5 +1,6 @@
 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";
@@ -7,6 +8,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 { StateService } from "jslib-common/abstractions/state.service";
+
 import { VerifyEmailRequest } from "jslib-common/models/request/verifyEmailRequest";
 
 @Component({

src/app/accounts/verify-recover-delete.component.html

@@ -18,7 +18,7 @@
             >
               <span>{{ "deleteAccount" | i18n }}</span>
               <i
-                class="bwi bwi-spinner bwi-spin"
+                class="fa fa-spinner fa-spin"
                 title="{{ 'loading' | i18n }}"
                 aria-hidden="true"
               ></i>

src/app/accounts/verify-recover-delete.component.ts

@@ -1,11 +1,13 @@
 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({

src/app/app.component.ts

@@ -21,10 +21,14 @@ 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";
@@ -34,8 +38,6 @@ 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
@@ -115,7 +117,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"),
@@ -131,8 +133,7 @@ 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"),
@@ -143,8 +144,7 @@ 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,11 +153,10 @@ export class AppComponent implements OnDestroy, OnInit {
             );
             if (emailVerificationConfirmed) {
               this.platformUtilsService.launchUri(
-                "https://bitwarden.com/help/create-bitwarden-account/"
+                "https://bitwarden.com/help/article/create-bitwarden-account/"
               );
             }
             break;
-          }
           case "showToast":
             this.showToast(message);
             break;
@@ -165,6 +164,7 @@ export class AppComponent implements OnDestroy, OnInit {
             this.setFullWidth();
             break;
           case "convertAccountToKeyConnector":
+            this.keyConnectorService.setConvertAccountRequired(true);
             this.router.navigate(["/remove-password"]);
             break;
           default:
@@ -211,6 +211,7 @@ 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),

src/app/app.module.ts

@@ -1,8 +1,9 @@
+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";
 

src/app/common/base.accept.component.ts

@@ -1,5 +1,6 @@
 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";
@@ -59,7 +60,9 @@ 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(["/"]);
       }
 

src/app/common/base.events.component.ts

@@ -4,9 +4,11 @@ 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";
 
@@ -17,7 +19,7 @@ export abstract class BaseEventsComponent {
   events: EventView[];
   start: string;
   end: string;
-  dirtyDates = true;
+  dirtyDates: boolean = true;
   continuationToken: string;
   refreshPromise: Promise<any>;
   exportPromise: Promise<any>;
@@ -108,7 +110,13 @@ 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,
@@ -136,7 +144,10 @@ export abstract class BaseEventsComponent {
         });
       })
     );
-    return { continuationToken: response.continuationToken, events: events };
+    return {
+      continuationToken: response.continuationToken,
+      events: events,
+    };
   }
 
   protected parseDates() {
@@ -170,6 +181,13 @@ 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
+    );
   }
 }

src/app/common/base.people.component.ts

@@ -1,9 +1,5 @@
 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";
@@ -11,15 +7,24 @@ 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;
@@ -30,7 +35,10 @@ 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() {

src/app/components/nested-checkbox.component.ts

@@ -1,5 +1,4 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
-
 import { Utils } from "jslib-common/misc/utils";
 
 @Component({
@@ -7,10 +6,18 @@ 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());

src/app/components/password-reprompt.component.html

@@ -32,9 +32,12 @@
               (click)="togglePassword()"
             >
               <i
-                class="bwi bwi-lg"
+                class="fa fa-lg"
                 aria-hidden="true"
-                [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
+                [ngClass]="{
+                  'fa-eye': !showPassword,
+                  'fa-eye-slash': showPassword
+                }"
               ></i>
             </button>
           </div>