Revert jslib

This reverts commit eae38e2f9c.

.editorconfig

@@ -12,7 +12,7 @@ insert_final_newline = true
 [*.{js,ts,scss,html}]
 charset = utf-8
 indent_style = space
-indent_size = 4
+indent_size = 2
 
 [*.{ts}]
 quote_type = single

.eslintignore

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

.eslintrc.json

@@ -0,0 +1,31 @@
+{
+  "root": true,
+  "env": {
+    "browser": true
+  },
+  "extends": ["./jslib/shared/eslintrc.json"],
+  "rules": {
+    "import/order": [
+      "error",
+      {
+        "alphabetize": {
+          "order": "asc"
+        },
+        "newlines-between": "always",
+        "pathGroups": [
+          {
+            "pattern": "jslib-*/**",
+            "group": "external",
+            "position": "after"
+          },
+          {
+            "pattern": "src/**/*",
+            "group": "parent",
+            "position": "before"
+          }
+        ],
+        "pathGroupsExcludedImportTypes": ["builtin"]
+      }
+    ]
+  }
+}

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Apply Prettier https://github.com/bitwarden/web/pull/1347
+56477eb39cfd8a73c9920577d24d75fed36e2cf5

.gitattributes

@@ -1,3 +1 @@
-*.sh eol=lf
-.dockerignore eol=lf
-dockerfile eol=lf
+* text=auto eol=lf

.github/ISSUE_TEMPLATE/bug.yml

@@ -6,7 +6,7 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill out this bug report!
-        
+
         Please do not submit feature requests. The [Community Forums](https://community.bitwarden.com) has a section for submitting, voting for, and discussing product feature requests.
   - type: textarea
     id: reproduce

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,28 @@
+## Type of change
+
+- [ ] Bug fix
+- [ ] New feature development
+- [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc)
+- [ ] Build/deploy pipeline (DevOps)
+- [ ] Other
+
+## Objective
+
+<!--Describe what the purpose of this PR is. For example: what bug you're fixing or what new feature you're adding-->
+
+## Code changes
+
+<!--Explain the changes you've made to each file or major component. This should help the reviewer understand your changes-->
+<!--Also refer to any related changes or PRs in other repositories-->
+
+- **file.ext:** Description of what was changed and why
+
+## Screenshots
+
+<!--Required for any UI changes. Delete if not applicable-->
+
+## Before you submit
+
+- [ ] I have checked for **linting** errors (`npm run lint`) (required)
+- [ ] This change requires a **documentation update** (notify the documentation team)
+- [ ] This change has particular **deployment requirements** (notify the DevOps team)

.github/workflows/build.yml

@@ -9,8 +9,12 @@ on:
         required: false
   push:
     branches-ignore:
-      - 'l10n_master'
-      - 'gh-pages'
+      - "l10n_master"
+      - "gh-pages"
+      - "deploy"
+    paths-ignore:
+      - '.github/workflows/**'
+
 
 jobs:
   cloc:
@@ -29,6 +33,27 @@ jobs:
         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
@@ -40,32 +65,27 @@ jobs:
 
       - name: Get GitHub sha as version
         id: version
-        run: |
-          echo "::set-output name=value::${GITHUB_SHA:0:7}"
+        run: echo "::set-output name=value::${GITHUB_SHA:0:7}"
 
 
   build-oss-selfhost:
     name: Build OSS zip
     runs-on: ubuntu-20.04
-    needs: setup
+    needs:
+      - setup
+      - lint
     env:
       _VERSION: ${{ needs.setup.outputs.version }}
     steps:
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
       - name: Set up Node
-        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
+        uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
         with:
-          node-version: '14'
-
-      - name: Update NPM
-        run: |
-          npm install -g npm@7
-
-      - name: Cache npm
-        id: npm-cache
-        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353  # v2.1.6
-        with:
-          path: '~/.npm'
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+          node-version: "16"
 
       - name: Print environment
         run: |
@@ -77,9 +97,6 @@ jobs:
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
 
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
       - name: Install dependencies
         run: npm ci
 
@@ -99,25 +116,21 @@ jobs:
   build-cloud:
     name: Build Cloud zip
     runs-on: ubuntu-20.04
-    needs: setup
+    needs:
+      - setup
+      - lint
     env:
       _VERSION: ${{ needs.setup.outputs.version }}
     steps:
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
       - name: Set up Node
-        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
+        uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
         with:
-          node-version: '14'
-
-      - name: Update NPM
-        run: |
-          npm install -g npm@7
-
-      - name: Cache npm
-        id: npm-cache
-        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353  # v2.1.6
-        with:
-          path: '~/.npm'
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+          node-version: "16"
 
       - name: Print environment
         run: |
@@ -129,9 +142,6 @@ jobs:
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
 
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
       - name: Install dependencies
         run: npm ci
 
@@ -151,25 +161,21 @@ jobs:
   build-commercial-selfhost:
     name: Build SelfHost Docker image
     runs-on: ubuntu-20.04
-    needs: setup
+    needs:
+      - setup
+      - lint
     env:
       _VERSION: ${{ needs.setup.outputs.version }}
     steps:
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
       - name: Set up Node
-        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
+        uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
         with:
-          node-version: '14'
-
-      - name: Update NPM
-        run: |
-          npm install -g npm@7
-
-      - name: Cache npm
-        id: npm-cache
-        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353  # v2.1.6
-        with:
-          path: '~/.npm'
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+          node-version: "16"
 
       - name: Print environment
         run: |
@@ -182,19 +188,13 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Setup DCT
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc'
         id: setup-dct
         uses: bitwarden/gh-actions/setup-docker-trust@a8c384a05a974c05c48374c818b004be221d43ff
         with:
           azure-creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
           azure-keyvault-name: "bitwarden-prod-kv"
 
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
-      - name: Restore
-        run: dotnet tool restore
-
       - name: Install dependencies
         run: npm ci
 
@@ -228,48 +228,81 @@ jobs:
         if: github.ref == 'refs/heads/master'
         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
+
       - name: List Docker images
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc'
         run: docker images
 
-      - name: Push rc images
+      - name: Push rc image
         if: github.ref == 'refs/heads/rc'
         run: docker push bitwarden/web:rc
         env:
           DOCKER_CONTENT_TRUST: 1
           DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.setup-dct.outputs.dct-delegate-repo-passphrase }}
 
-      - name: Push dev images
+      - name: Push dev image
         if: github.ref == 'refs/heads/master'
         run: docker push bitwarden/web:dev
         env:
           DOCKER_CONTENT_TRUST: 1
           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
+        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'
+        run: |
+          docker logout
+          echo "DOCKER_CONTENT_TRUST=0" >> $GITHUB_ENV
+
+      - 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 and Push RC to Azure ACR QA registry
+        env:
+          REGISTRY: bitwardenqa.azurecr.io
+        run: |
+          IMAGE_TAG=$(echo "${GITHUB_REF:11}" | sed "s#/#-#g")  # slash safe branch name
+          if [[ "$IMAGE_TAG" == "master" ]]; then
+            IMAGE_TAG=dev
+          fi
+          docker tag bitwarden/web \
+            $REGISTRY/web-sh:$IMAGE_TAG
+          docker push $REGISTRY/web-sh:$IMAGE_TAG
+
       - name: Log out of Docker
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
         run: docker logout
 
 
   build-qa:
     name: Build Docker images for QA environment
     runs-on: ubuntu-20.04
+    needs:
+      - setup
+      - lint
     steps:
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
       - name: Set up Node
-        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
+        uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
         with:
-          node-version: '14'
-
-      - name: Update NPM
-        run: |
-          npm install -g npm@7
-
-      - name: Cache npm
-        id: npm-cache
-        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353  # v2.1.6
-        with:
-          path: '~/.npm'
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+          node-version: "16"
 
       - name: Print environment
         run: |
@@ -289,12 +322,6 @@ jobs:
       - name: Log into container registry
         run: az acr login -n bitwardenqa
 
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
-      - name: Restore
-        run: dotnet tool restore
-
       - name: Install dependencies
         run: npm ci
 
@@ -318,7 +345,7 @@ jobs:
       - name: Get image tag
         id: image-tag
         run: |
-          IMAGE_TAG=$(echo "$GITHUB_REF" | awk '{split($0, a, "/"); print a[3];}')
+          IMAGE_TAG=$(echo "${GITHUB_REF:11}" | sed "s#/#-#g")
           TAG_EXTENSION=${{ github.event.inputs.custom_tag_extension }}
 
           if [[ $TAG_EXTENSION ]]; then
@@ -355,35 +382,24 @@ jobs:
     name: Test code on Windows
     runs-on: windows-2019
     steps:
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
       - name: Set up NuGet
         uses: nuget/setup-nuget@04b0c2b8d1b97922f67eca497d7cf0bf17b8ffe1
         with:
-          nuget-version: 'latest'
-
-      - name: Set up MSBuild
-        uses: microsoft/setup-msbuild@c26a08ba26249b81327e26f6ef381897b6a8754d
-
-      - name: Cache npm
-        id: npm-cache
-        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353  # v2.1.6
-        with:
-          path: '~/.npm'
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+          nuget-version: "latest"
 
       - name: Set up Node
-        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
+        uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
         with:
-          node-version: '14'
-
-      - name: Update NPM
-        run: |
-          npm install -g npm@7
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+          node-version: "16"
 
       - name: Print environment
         run: |
           nuget help | grep Version
-          msbuild -version
-          dotnet --info
           node --version
           npm --version
           echo "GitHub ref: $GITHUB_REF"
@@ -392,14 +408,118 @@ jobs:
           GITHUB_REF: ${{ github.ref }}
           GITHUB_EVENT: ${{ github.event_name }}
 
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
       - name: Install dependencies
         run: npm ci
 
-      - name: NPM install
-        run: npm ci
-
       - name: NPM build
         run: npm run build:bit:cloud
+
+
+  crowdin-push:
+    name: Crowdin Push
+    if: github.ref == 'refs/heads/master'
+    needs:
+      - build-oss-selfhost
+      - build-cloud
+      - build-commercial-selfhost
+      - build-qa
+    runs-on: ubuntu-20.04
+    env:
+      _CROWDIN_PROJECT_ID: "308189"
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
+
+      - name: Login to Azure
+        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
+        with:
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
+
+      - name: Retrieve secrets
+        id: retrieve-secrets
+        uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403
+        with:
+          keyvault: "bitwarden-prod-kv"
+          secrets: "crowdin-api-token"
+
+      - name: Upload Sources
+        uses: crowdin/github-action@e39093fd75daae7859c68eded4b43d42ec78d8ea  # v1.3.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
+        with:
+          config: crowdin.yml
+          crowdin_branch_name: master
+          upload_sources: true
+          upload_translations: false
+
+
+  check-failures:
+    name: Check for failures
+    if: always()
+    runs-on: ubuntu-20.04
+    needs:
+      - cloc
+      - setup
+      - lint
+      - build-oss-selfhost
+      - build-cloud
+      - build-commercial-selfhost
+      - build-qa
+      - crowdin-push
+      - windows
+    steps:
+      - name: Check if any job failed
+        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 }}
+          BUILD_COMMERCIAL_SELFHOST_STATUS: ${{ needs.build-commercial-selfhost.result }}
+          BUILD_QA_STATUS: ${{ needs.build-qa.result }}
+          CROWDIN_PUSH_STATUS: ${{ needs.crowdin-push.result }}
+          WINDOWS_STATUS: ${{ needs.windows.result }}
+        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
+              exit 1
+          elif [ "$BUILD_CLOUD_STATUS" = "failure" ]; then
+              exit 1
+          elif [ "$BUILD_COMMERCIAL_SELFHOST_STATUS" = "failure" ]; then
+              exit 1
+          elif [ "$BUILD_QA_STATUS" = "failure" ]; then
+              exit 1
+          elif [ "$CROWDIN_PUSH_STATUS" = "failure" ]; then
+              exit 1
+          elif [ "$WINDOWS_STATUS" = "failure" ]; then
+              exit 1
+          fi
+
+      - name: Login to Azure - Prod Subscription
+        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
+        if: failure()
+        with:
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
+
+      - name: Retrieve secrets
+        id: retrieve-secrets
+        uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403
+        if: failure()
+        with:
+          keyvault: "bitwarden-prod-kv"
+          secrets: "devops-alerts-slack-webhook-url"
+
+      - name: Notify Slack on failure
+        uses: act10ns/slack@e4e71685b9b239384b0f676a63c32367f59c2522  # v1.2.2
+        if: failure()
+        env:
+          SLACK_WEBHOOK_URL: ${{ steps.retrieve-secrets.outputs.devops-alerts-slack-webhook-url }}
+        with:
+          status: ${{ job.status }}

.github/workflows/crowdin-pull.yml

@@ -1,15 +1,15 @@
 ---
-name: Crowdin Sync
+name: Crowdin Pull
 
 on:
   workflow_dispatch:
     inputs: {}
-# schedule:
-#   - cron: '0 0 * * *'
+  schedule:
+    - cron: "0 0 * * 5"
 
 jobs:
-  crowdin-sync:
-    name: Autosync
+  crowdin-pull:
+    name: Pull
     runs-on: ubuntu-20.04
     env:
       _CROWDIN_PROJECT_ID: "308189"
@@ -30,7 +30,7 @@ jobs:
           secrets: "crowdin-api-token"
 
       - name: Download translations
-        uses: crowdin/github-action@e39093fd75daae7859c68eded4b43d42ec78d8ea
+        uses: crowdin/github-action@e39093fd75daae7859c68eded4b43d42ec78d8ea  # v1.3.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}

.github/workflows/enforce-labels.yml

@@ -0,0 +1,16 @@
+---
+name: Enforce PR labels
+
+on:
+  pull_request:
+    types: [labeled, unlabeled, opened, edited, synchronize]
+jobs:
+  enforce-label:
+    name: EnforceLabel
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Enforce Label
+        uses: yogevbd/enforce-label-action@8d1e1709b1011e6d90400a0e6cf7c0b77aa5efeb
+        with:
+          BANNED_LABELS: "hold"
+          BANNED_LABELS_DESCRIPTION: "PRs on hold cannot be merged"

.github/workflows/qa-deploy.yml

@@ -9,8 +9,8 @@ on:
         required: false
 
 env:
-  _QA_CLUSTER_RESOURCE_GROUP: "bitwarden-devops"
-  _QA_CLUSTER_NAME: "dev-aks"
+  _QA_CLUSTER_RESOURCE_GROUP: "bw-env-qa"
+  _QA_CLUSTER_NAME: "bw-aks-qa"
   _QA_K8S_NAMESPACE: "bw-qa"
   _QA_K8S_APP_NAME: "bw-web"
 
@@ -23,8 +23,7 @@ jobs:
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
       - name: Setup
-        run:
-          export PATH=$PATH:~/work/web/web
+        run: export PATH=$PATH:~/work/web/web
 
       - name: Login to Azure
         uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
@@ -36,16 +35,16 @@ jobs:
         uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403
         with:
           keyvault: "bitwarden-qa-kv"
-          secrets: "dev-aks-kubectl-credentials"
+          secrets: "qa-aks-kubectl-credentials"
 
-      - name: Login to dev-aks-kubectl SP
+      - name: Login with qa-aks-kubectl-credentials SP
         uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
         with:
-          creds: ${{ env.dev-aks-kubectl-credentials }}
+          creds: ${{ env.qa-aks-kubectl-credentials }}
 
       - name: Setup AKS access
-        env:
-          USER_ID: ${{ env.qa-kubectl-managed-identity-clientId }}
+        #env:
+        #  USER_ID: ${{ env.qa-kubectl-managed-identity-clientId }}
         run: |
           echo "---az install---"
           az aks install-cli --install-location ./kubectl --kubelogin-install-location ./kubelogin
@@ -55,7 +54,7 @@ jobs:
       - name: Get image tag
         id: image_tag
         run: |
-          IMAGE_TAG=$(echo "$GITHUB_REF" | awk '{split($0, a, "/"); print a[3];}')
+          IMAGE_TAG=$(echo "${GITHUB_REF:11}" | sed "s#/#-#g")
           TAG_EXTENSION=${{ github.event.inputs.image_extension }}
 
           if [[ $TAG_EXTENSION ]]; then

.github/workflows/release.yml

@@ -3,7 +3,16 @@ name: Release
 
 on:
   workflow_dispatch:
-    inputs: {}
+    inputs:
+      release_type:
+        description: 'Release Options'
+        required: true
+        default: 'Initial Release'
+        type: choice
+        options:
+          - Initial Release
+          - Redeploy
+          - Dry Run
 
 jobs:
   setup:
@@ -12,18 +21,20 @@ jobs:
     outputs:
       release_version: ${{ steps.version.outputs.package }}
       tag_version: ${{ steps.version.outputs.tag }}
+      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" ]]; then
+          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix-rc" ]]; then
             echo "==================================="
-            echo "[!] Can only release from rc branch"
+            echo "[!] Can only release from the 'rc' or 'hotfix-rc' branches"
             echo "==================================="
             exit 1
           fi
 
       - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # 2.3.4
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # 2.4.0
 
       - name: Check Release Version
         id: version
@@ -33,7 +44,8 @@ jobs:
             curl -sL https://api.github.com/repos/$GITHUB_REPOSITORY/releases/latest | jq -r ".tag_name"
           )
 
-          if [ "v$version" == "$previous_release_tag_version" ]; then
+          if [ "v$version" == "$previous_release_tag_version" ] && \
+          [ "${{ github.event.inputs.release_type }}" == "Initial Release" ]; then
             echo "[!] Already released v$version. Please bump version to continue"
             exit 1
           fi
@@ -41,13 +53,21 @@ jobs:
           echo "::set-output name=package::$version"
           echo "::set-output name=tag::v$version"
 
+      - name: Get branch name
+        id: branch
+        run: |
+          BRANCH_NAME=$(basename ${{ github.ref }})
+          echo "::set-output name=branch_name::$BRANCH_NAME"
+
 
   self-host:
-    name: Build self-host docker
+    name: Release self-host docker
     runs-on: ubuntu-20.04
     needs: setup
     env:
+      _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: |
@@ -55,7 +75,12 @@ 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
@@ -63,34 +88,77 @@ 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 rc image
-        run: docker pull bitwarden/web:rc
-
-      - name: Tag version
+      - name: Pull latest selfhost image
         run: |
-          docker tag bitwarden/web:rc bitwarden/web:latest
-          docker tag bitwarden/web:rc bitwarden/web:$_RELEASE_VERSION
+          if [[ "${{ github.event.inputs.release_type }}" == "Dry Run" ]]; then
+            docker pull bitwarden/web:latest
+          else
+            docker pull bitwarden/web:$_BRANCH_NAME
+          fi
 
-      - name: List Docker images
-        run: docker images
-
-      - name: Push images
+      - name: Tag version and latest
         run: |
-          docker push bitwarden/web:latest
-          docker push bitwarden/web:$_RELEASE_VERSION
+          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
+
+      - 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 }}
+        run: |
+          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
+
+            docker tag bitwarden/web:$_BRANCH_NAME $REGISTRY/web-sh:$_RELEASE_VERSION
+            docker tag bitwarden/web:$_BRANCH_NAME $REGISTRY/web-sh: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
+
+          docker push $REGISTRY/web-sh:$_RELEASE_VERSION
+          docker push $REGISTRY/web-sh:latest
 
       - name: Log out of Docker
         run: docker logout
 
 
   ghpages-deploy:
-    name: Deploy Web Vault
+    name: Deploy Web Vault to GitHub Pages
     runs-on: ubuntu-20.04
     needs:
       - setup
@@ -100,15 +168,17 @@ jobs:
       _TAG_VERSION: ${{ needs.setup.outputs.tag_version }}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
         with:
           ref: gh-pages
 
-      - name: Create deploy branch
+      - name: Create gh-pages-deploy branch
         run: |
-          git switch -c deploy-$_TAG_VERSION
-          git push -u origin deploy-$_TAG_VERSION
-          git switch rc
+          git switch -c gh-pages-deploy-$_TAG_VERSION
+          git push -u origin gh-pages-deploy-$_TAG_VERSION
+
+      - name: Checkout Repo
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
 
       - name: Setup git config
         run: |
@@ -118,11 +188,11 @@ jobs:
           git config --global url."https://".insteadOf ssh://
 
       - name: Download latest cloud asset
-        uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
+        uses: bitwarden/gh-actions/download-artifacts@c1fa8e09871a860862d6bbe36184b06d2c7e35a8
         with:
           workflow: build.yml
           workflow_conclusion: success
-          branch: rc
+          branch: ${{ needs.setup.outputs.branch_name }}
           artifacts: web-*-cloud-COMMERCIAL.zip
 
       # This should result in a build directory in the current working directory
@@ -130,26 +200,92 @@ jobs:
         run: unzip web-*-cloud-COMMERCIAL.zip
 
       - name: Deploy GitHub Pages
-        uses: crazy-max/ghaction-github-pages@db4476a01402e1a7ce05f41832040eef16d14925  # v2.5.0
+        uses: crazy-max/ghaction-github-pages@a117e4aa1fb4854d021546d2abdfac95be568a3a  # v2.6.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          target_branch: deploy-${{ needs.setup.outputs.tag_version }}
+          target_branch: gh-pages-deploy-${{ needs.setup.outputs.tag_version }}
           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
+      - name: Create GitHub Pages Deploy PR
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         env:
-          PR_BRANCH: deploy-${{ env._TAG_VERSION }}
+          PR_BRANCH: gh-pages-deploy-${{ env._TAG_VERSION }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh pr create --title "Deploy $_RELEASE_VERSION" \
+          gh pr create --title "Deploy $_RELEASE_VERSION to GitHub Pages" \
             --body "Deploying $_RELEASE_VERSION" \
             --base gh-pages \
             --head "$PR_BRANCH"
 
 
+  cfpages-deploy:
+    name: Deploy Web Vault to CloudFlare Pages branch
+    runs-on: ubuntu-20.04
+    needs:
+      - setup
+      - self-host
+    env:
+      _RELEASE_VERSION: ${{ needs.setup.outputs.release_version }}
+      _TAG_VERSION: ${{ needs.setup.outputs.tag_version }}
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
+
+      - name: Download latest cloud asset
+        uses: bitwarden/gh-actions/download-artifacts@c1fa8e09871a860862d6bbe36184b06d2c7e35a8
+        with:
+          workflow: build.yml
+          workflow_conclusion: success
+          branch: ${{ needs.setup.outputs.branch_name }}
+          artifacts: web-*-cloud-COMMERCIAL.zip
+
+      # This should result in a build directory in the current working directory
+      - name: Unzip build asset
+        run: unzip web-*-cloud-COMMERCIAL.zip
+
+      - name: Checkout Repo
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
+        with:
+          ref: deploy
+          path: deployment
+
+      - name: Setup git config
+        run: |
+          git config --global user.name = "GitHub Action Bot"
+          git config --global user.email = "<>"
+          git config --global url."https://github.com/".insteadOf ssh://git@github.com/
+          git config --global url."https://".insteadOf ssh://
+
+      - name: Deploy CloudFlare Pages
+        run: |
+          rm -rf ./*
+          cp -R ../build/* .
+        working-directory: deployment
+
+      - name: Create cf-pages-deploy branch
+        run: |
+          git switch -c cf-pages-deploy-$_TAG_VERSION
+          git add .
+          git commit -m "Staging deploy ${{ needs.setup.outputs.release_version }}"
+          git push -u origin cf-pages-deploy-$_TAG_VERSION
+        working-directory: deployment    
+
+      - name: Create CloudFlare Pages Deploy PR
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
+        env:
+          PR_BRANCH: cf-pages-deploy-${{ env._TAG_VERSION }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr create --title "Deploy $_RELEASE_VERSION to CloudFlare Pages" \
+            --body "Deploying $_RELEASE_VERSION" \
+            --base deploy \
+            --head "$PR_BRANCH"
+
+
   release:
     name: Create GitHub Release
     runs-on: ubuntu-20.04
@@ -157,15 +293,16 @@ jobs:
       - setup
       - self-host
       - ghpages-deploy
+      - cfpages-deploy
     steps:
       - name: Download latest build artifacts
         uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
         with:
           workflow: build.yml
           workflow_conclusion: success
-          branch: rc
+          branch: ${{ needs.setup.outputs.branch_name }}
           artifacts: "web-*-selfhosted-COMMERCIAL.zip,
-                      web-*-selfhosted-open-source.zip"
+            web-*-selfhosted-open-source.zip"
 
       - name: Rename assets
         run: |
@@ -173,12 +310,34 @@ jobs:
           mv web-*-selfhosted-open-source.zip web-${{ needs.setup.outputs.release_version }}-selfhosted-open-source.zip
 
       - name: Create release
-        uses: ncipollo/release-action@95215a3cb6e6a1908b3c44e00b4fdb15548b1e09
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
+        uses: ncipollo/release-action@40bb172bd05f266cf9ba4ff965cb61e9ee5f6d01
         with:
           name: "Version ${{ needs.setup.outputs.release_version }}"
           commit: ${{ github.sha }}
           tag: "${{ needs.setup.outputs.tag_version }}"
           body: "<insert release notes here>"
           artifacts: "web-${{ needs.setup.outputs.release_version }}-selfhosted-COMMERCIAL.zip,
-                      web-${{ needs.setup.outputs.release_version }}-selfhosted-open-source.zip"
+            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 gh-pages-deploy branch
+        run: git push origin --delete gh-pages-deploy-$_TAG_VERSION
+
+      - name: Remove cf-pages-deploy branch
+        run: git push origin --delete cf-pages-deploy-$_TAG_VERSION

.github/workflows/version-bump.yml

@@ -0,0 +1,71 @@
+---
+name: Version Bump
+
+on:
+  workflow_dispatch:
+    inputs:
+      version_number:
+        description: "New Version"
+        required: true
+
+jobs:
+  bump_props_version:
+    name: "Create version_bump_${{ github.event.inputs.version_number }} branch"
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout Branch
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
+
+      - name: Create Version Branch
+        run: |
+          git switch -c version_bump_${{ github.event.inputs.version_number }}
+          git push -u origin version_bump_${{ github.event.inputs.version_number }}
+
+      - name: Checkout Version Branch
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
+        with:
+          ref: version_bump_${{ github.event.inputs.version_number }}
+
+      - name: Bump Version - package.json
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
+        with:
+          version: ${{ github.event.inputs.version_number }}
+          file_path: "./package.json"
+
+      - name: Bump Version - package-lock.json
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
+        with:
+          version: ${{ github.event.inputs.version_number }}
+          file_path: "./package-lock.json"
+
+      - name: Commit files
+        run: |
+          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git commit -m "Bumped version to ${{ github.event.inputs.version_number }}" -a
+
+      - name: Push changes
+        run: git push -u origin version_bump_${{ github.event.inputs.version_number }}
+
+      - name: Create Version PR
+        env:
+          PR_BRANCH: "version_bump_${{ github.event.inputs.version_number }}"
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          BASE_BRANCH: master
+          TITLE: "Bump version to ${{ github.event.inputs.version_number }}"
+        run: |
+          gh pr create --title "$TITLE" \
+            --base "$BASE" \
+            --head "$PR_BRANCH" \
+            --label "version update" \
+            --label "automated pr" \
+            --body "
+              ## Type of change
+              - [ ] Bug fix
+              - [ ] New feature development
+              - [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc)
+              - [ ] Build/deploy pipeline (DevOps)
+              - [X] Other
+
+              ## Objective
+              Automated version bump to ${{ github.event.inputs.version_number }}"

.github/workflows/workflow-linter.yml

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

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged

.prettierignore

@@ -0,0 +1,12 @@
+# Build directories
+build
+dist
+
+jslib
+
+# External libraries / auto synced locales
+src/locales
+src/404/*.min.css
+
+# Github Workflows
+.github/workflows

.prettierrc.json

@@ -0,0 +1,3 @@
+{
+  "printWidth": 100
+}

CONTRIBUTING.md

@@ -6,17 +6,12 @@ Please visit our [Community Forums](https://community.bitwarden.com/) for genera
 
 Here is how you can get involved:
 
-* **Request a new feature:** Go to the [Feature Requests category](https://community.bitwarden.com/c/feature-requests/) of the Community Forums. Please search existing feature requests before making a new one
-  
-* **Write code for a new feature:** Make a new post in the [Github Contributions category](https://community.bitwarden.com/c/github-contributions/) of the Community Forums. Include a description of your proposed contribution, screeshots, and links to any relevant feature requests. This helps get feedback from the community and Bitwarden team members before you start writing code
-  
-* **Report a bug or submit a bugfix:** Use Github issues and pull requests
-  
-* **Write documentation:** Submit a pull request to the [Bitwarden help repository](https://github.com/bitwarden/help)
-  
-* **Help other users:** Go to the [User-to-User Support category](https://community.bitwarden.com/c/support/) on the Community Forums
-  
-* **Translate:** See the localization (l10n) section below
+- **Request a new feature:** Go to the [Feature Requests category](https://community.bitwarden.com/c/feature-requests/) of the Community Forums. Please search existing feature requests before making a new one
+- **Write code for a new feature:** Make a new post in the [Github Contributions category](https://community.bitwarden.com/c/github-contributions/) of the Community Forums. Include a description of your proposed contribution, screeshots, and links to any relevant feature requests. This helps get feedback from the community and Bitwarden team members before you start writing code
+- **Report a bug or submit a bugfix:** Use Github issues and pull requests
+- **Write documentation:** Submit a pull request to the [Bitwarden help repository](https://github.com/bitwarden/help)
+- **Help other users:** Go to the [Ask the Bitwarden Community category](https://community.bitwarden.com/c/support/) on the Community Forums
+- **Translate:** See the localization (l10n) section below
 
 ## Contributor Agreement
 
@@ -24,9 +19,9 @@ Please sign the [Contributor Agreement](https://cla-assistant.io/bitwarden/web)
 
 ## Pull Request Guidelines
 
-* use `npm run lint` and fix any linting suggestions before submitting a pull request
-* commit any pull requests against the `master` branch
-* include a link to your Community Forums post
+- use `npm run lint` and fix any linting suggestions before submitting a pull request
+- commit any pull requests against the `master` branch
+- include a link to your Community Forums post
 
 # Localization (l10n)
 
@@ -36,6 +31,6 @@ We use a translation tool called [Crowdin](https://crowdin.com) to help manage o
 
 If you are interested in helping translate the Bitwarden web vault into another language (or make a translation correction), please register an account at Crowdin and join our project here: https://crowdin.com/project/bitwarden-web
 
-If the language that you are interested in translating is not already listed, create a new account on Crowdin, join the project, and contact the project owner (https://crowdin.com/profile/kspearrin).
+If the language that you are interested in translating is not already listed, create a new account on Crowdin, join the project, and contact the project owner (https://crowdin.com/profile/dwbit).
 
 You can read Crowdin's getting started guide for translators here: https://support.crowdin.com/crowdin-intro/

README.md

@@ -1,3 +1,9 @@
+> **Repository Reorganization in Progress**
+>
+> We are currently migrating some projects over to a mono repository. For existing PR's we will be providing documentation on how to move/migrate them. To minimize the overhead we are actively reviewing open PRs. If possible please ensure any pending comments are resolved as soon as possible.
+>
+> New pull requests created during this transition period may not get addressed —if needed, please create a new PR after the reorganization is complete.
+
 <p align="center">
     <img src="https://raw.githubusercontent.com/bitwarden/brand/master/screenshots/web-vault-macbook.png" alt="" width="600" height="358" />
 </p>
@@ -23,8 +29,8 @@
 
 ### Requirements
 
-- [Node.js](https://nodejs.org) v14.17 or greater
-- NPM v7
+- [Node.js](https://nodejs.org) v16.13.1 or greater
+- NPM v8
 
 ### Run the app
 
@@ -41,28 +47,52 @@ If you want to point the development web vault to the production APIs, you can r
 
 ```
 npm install
-ENV=production npm run build:oss:watch
+ENV=cloud npm run build:oss:watch
 ```
 
 You can also manually adjusting your API endpoint settings by adding `config/local.json` overriding any of the following values:
 
 ```json
 {
+  "dev": {
     "proxyApi": "http://your-api-url",
     "proxyIdentity": "http://your-identity-url",
     "proxyEvents": "http://your-events-url",
     "proxyNotifications": "http://your-notifications-url",
-    "allowedHosts": ["hostnames-to-allow-in-webpack"],
-    "urls": {
-      
-    }
+    "allowedHosts": ["hostnames-to-allow-in-webpack"]
+  },
+  "urls": {}
 }
 ```
 
 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.
 
 Security audits and feedback are welcome. Please open an issue or email us privately if the report is sensitive in nature. You can read our security policy in the [`SECURITY.md`](SECURITY.md) file.
+
+## Prettier
+
+We recently migrated to using Prettier as code formatter. All previous branches will need to updated to avoid large merge conflicts using the following steps:
+
+1. Check out your local Branch
+2. Run `git merge 2b0a9d995e0147601ca8ae4778434a19354a60c2`
+3. Resolve any merge conflicts, commit.
+4. Run `npm run prettier`
+5. Commit
+6. Run `git merge -Xours 56477eb39cfd8a73c9920577d24d75fed36e2cf5`
+7. Push
+
+### Git blame
+
+We also recommend that you configure git to ignore the prettier revision using:
+
+```bash
+git config blame.ignoreRevsFile .git-blame-ignore-revs
+```

SECURITY.md

@@ -1,39 +1,11 @@
-Bitwarden believes that working with security researchers across the globe is crucial to keeping our
-users safe. If you believe you've found a security issue in our product or service, we encourage you to
-notify us. We welcome working with you to resolve the issue promptly. Thanks in advance!
+Bitwarden believes that working with security researchers across the globe is crucial to keeping our users safe. If you believe you've found a security issue in our product or service, we encourage you to please submit a report through our [HackerOne Program](https://hackerone.com/bitwarden/). We welcome working with you to resolve the issue promptly. Thanks in advance!
 
 # Disclosure Policy
 
-- Let us know as soon as possible upon discovery of a potential security issue, and we'll make every
-  effort to quickly resolve the issue.
-- Provide us a reasonable amount of time to resolve the issue before any disclosure to the public or a
-  third-party. We may publicly disclose the issue before resolving it, if appropriate. 
-- Make a good faith effort to avoid privacy violations, destruction of data, and interruption or
-  degradation of our service. Only interact with accounts you own or with explicit permission of the
-  account holder.
-- If you would like to encrypt your report, please use the PGP key with long ID
-  `0xDE6887086F892325FEC04CC0D847525B6931381F` (available in the public keyserver pool).
-
-# In-scope
-
-- Security issues in any current release of Bitwarden. This includes the web vault, browser extension,
-  and mobile apps (iOS and Android). Product downloads are available at https://bitwarden.com. Source
-  code is available at https://github.com/bitwarden.
-
-# Exclusions
-
-The following bug classes are out-of scope:
-
-- Bugs that are already reported on any of Bitwarden's issue trackers (https://github.com/bitwarden),
-  or that we already know of. Note that some of our issue tracking is private.
-- Issues in an upstream software dependency (ex: Xamarin, ASP.NET) which are already reported to the
-  upstream maintainer.
-- Attacks requiring physical access to a user's device.
-- Self-XSS
-- Issues related to software or protocols not under Bitwarden's control
-- Vulnerabilities in outdated versions of Bitwarden
-- Missing security best practices that do not directly lead to a vulnerability
-- Issues that do not have any impact on the general public
+- Let us know as soon as possible upon discovery of a potential security issue, and we'll make every effort to quickly resolve the issue.
+- Provide us a reasonable amount of time to resolve the issue before any disclosure to the public or a third-party. We may publicly disclose the issue before resolving it, if appropriate.
+- Make a good faith effort to avoid privacy violations, destruction of data, and interruption or degradation of our service. Only interact with accounts you own or with explicit permission of the account holder.
+- If you would like to encrypt your report, please use the PGP key with long ID `0xDE6887086F892325FEC04CC0D847525B6931381F` (available in the public keyserver pool).
 
 While researching, we'd like to ask you to refrain from:
 
@@ -42,4 +14,8 @@ While researching, we'd like to ask you to refrain from:
 - Social engineering (including phishing) of Bitwarden staff or contractors
 - Any physical attempts against Bitwarden property or data centers
 
+# We want to help you!
+
+If you have something that you feel is close to exploitation, or if you'd like some information regarding the internal API, or generally have any questions regarding the app that would help in your efforts, please email us at https://bitwarden.com/contact and ask for that information. As stated above, Bitwarden wants to help you find issues, and is more than willing to help.
+
 Thank you for helping keep Bitwarden and our users safe!

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

@@ -1,15 +1,15 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+import { NgModule } from "@angular/core";
+import { RouterModule, Routes } from "@angular/router";
 
 const routes: Routes = [
-    {
-        path: 'providers',
-        loadChildren: async () => (await import('./providers/providers.module')).ProvidersModule,
-    },
+  {
+    path: "providers",
+    loadChildren: async () => (await import("./providers/providers.module")).ProvidersModule,
+  },
 ];
 
 @NgModule({
-    imports: [RouterModule.forChild(routes)],
-    exports: [RouterModule],
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
 })
-export class AppRoutingModule { }
+export class AppRoutingModule {}

bitwarden_license/src/app/app.component.ts

@@ -1,22 +1,21 @@
-import { Component } from '@angular/core';
+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';
+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";
 
 @Component({
-    selector: 'app-root',
-    templateUrl: '../../../src/app/app.component.html',
+  selector: "app-root",
+  templateUrl: "../../../src/app/app.component.html",
 })
 export class AppComponent extends BaseAppComponent {
+  ngOnInit() {
+    super.ngOnInit();
 
-    ngOnInit() {
-        super.ngOnInit();
-
-        this.policyListService.addPolicies([
-            new MaximumVaultTimeoutPolicy(),
-            new DisablePersonalVaultExportPolicy(),
-        ]);
-    }
-
+    this.policyListService.addPolicies([
+      new MaximumVaultTimeoutPolicy(),
+      new DisablePersonalVaultExportPolicy(),
+    ]);
+  }
 }

bitwarden_license/src/app/app.module.ts

@@ -1,44 +1,46 @@
-import { ToasterModule } from 'angular2-toaster';
-import { InfiniteScrollModule } from 'ngx-infinite-scroll';
+import { DragDropModule } from "@angular/cdk/drag-drop";
+import { OverlayModule } from "@angular/cdk/overlay";
+import { NgModule } from "@angular/core";
+import { FormsModule, ReactiveFormsModule } from "@angular/forms";
+import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
+import { RouterModule } from "@angular/router";
+import { InfiniteScrollModule } from "ngx-infinite-scroll";
 
-import { DragDropModule } from '@angular/cdk/drag-drop';
-import { NgModule } from '@angular/core';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { RouterModule } from '@angular/router';
+import { JslibModule } from "jslib-angular/jslib.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";
 
-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";
 
 @NgModule({
-    imports: [
-        OssModule,
-        BrowserAnimationsModule,
-        FormsModule,
-        ReactiveFormsModule,
-        ServicesModule,
-        ToasterModule.forRoot(),
-        InfiniteScrollModule,
-        DragDropModule,
-        AppRoutingModule,
-        OssRoutingModule,
-        OrganizationsModule,
-        RouterModule,
-        WildcardRoutingModule, // Needs to be last to catch all non-existing routes
-    ],
-    declarations: [
-        AppComponent,
-        MaximumVaultTimeoutPolicyComponent,
-        DisablePersonalVaultExportPolicyComponent,
-    ],
-    bootstrap: [AppComponent],
+  imports: [
+    OverlayModule,
+    OssModule,
+    JslibModule,
+    BrowserAnimationsModule,
+    FormsModule,
+    ReactiveFormsModule,
+    ServicesModule,
+    InfiniteScrollModule,
+    DragDropModule,
+    AppRoutingModule,
+    OssRoutingModule,
+    OrganizationsModule, // Must be after OssRoutingModule for competing routes to resolve properly
+    RouterModule,
+    WildcardRoutingModule, // Needs to be last to catch all non-existing routes
+  ],
+  declarations: [
+    AppComponent,
+    DisablePersonalVaultExportPolicyComponent,
+    MaximumVaultTimeoutPolicyComponent,
+  ],
+  bootstrap: [AppComponent],
 })
-export class AppModule { }
+export class AppModule {}

bitwarden_license/src/app/main.ts

@@ -1,17 +1,17 @@
-import { enableProdMode } from '@angular/core';
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { enableProdMode } from "@angular/core";
+import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
 
-import 'bootstrap';
-import 'jquery';
-import 'popper.js';
+import "bootstrap";
+import "jquery";
+import "popper.js";
 
-// tslint:disable-next-line
-require('src/scss/styles.scss');
+require("src/scss/styles.scss");
+require("src/scss/tailwind.css");
 
-import { AppModule } from './app.module';
+import { AppModule } from "./app.module";
 
-if (process.env.NODE_ENV === 'production') {
-    enableProdMode();
+if (process.env.NODE_ENV === "production") {
+  enableProdMode();
 }
 
 platformBrowserDynamic().bootstrapModule(AppModule, { preserveWhitespaces: true });

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

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

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

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

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

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

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

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

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

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

@@ -1,284 +1,448 @@
 <div class="page-header d-flex">
-    <h1>{{'singleSignOn' | i18n}}</h1>
+  <h1>{{ "singleSignOn" | i18n }}</h1>
 </div>
 
 <ng-container *ngIf="loading">
-    <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}" aria-hidden="true"></i>
-    <span class="sr-only">{{'loading' | i18n}}</span>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
+  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 
-<form #form (ngSubmit)="submit()" [formGroup]="data" [appApiAction]="formPromise" *ngIf="!loading">
-    <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">{{'enabled' | i18n}}</label>
-        </div>
-    </div>
+<form
+  #form
+  (ngSubmit)="submit()"
+  [formGroup]="ssoConfigForm"
+  [appApiAction]="formPromise"
+  *ngIf="!loading"
+>
+  <p>
+    {{ "ssoPolicyHelpStart" | i18n }}
+    <a routerLink="../policies">{{ "ssoPolicyHelpLink" | i18n }}</a>
+    {{ "ssoPolicyHelpEnd" | i18n }}
+    <br />
+    {{ "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">
-        <label for="type">{{'type' | i18n}}</label>
-        <select class="form-control" id="type" formControlName="configType">
-            <option value="0" disabled>{{'selectType' | i18n}}</option>
-            <option value="1">OpenID Connect</option>
-            <option value="2">SAML 2.0</option>
-        </select>
+      <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/about-key-connector/"
+          >
+            <i class="bwi bwi-question-circle" aria-hidden="true"></i>
+          </a>
+          <small>{{ "memberDecryptionKeyConnectorDesc" | i18n }}</small>
+        </label>
+      </div>
     </div>
 
-    <!-- OIDC -->
-    <div *ngIf="data.value.configType == 1">
-        <div class="config-section">
-            <h2>{{'openIdConnectConfig' | i18n}}</h2>
-            <div class="form-group">
-                <label>{{'callbackPath' | i18n}}</label>
-                <div class="input-group">
-                    <input class="form-control" readonly [value]="callbackPath">
-                    <div class="input-group-append">
-                        <button type="button" class="btn btn-outline-secondary"
-                            appA11yTitle="{{'copyValue' | i18n}}"
-                            (click)="copy(data.value.callbackPath)">
-                            <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
-                        </button>
-                    </div>
-                </div>
-            </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(data.value.signedOutCallbackPath)">
-                            <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
-                        </button>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label>{{'authority' | i18n}}</label>
-                <input class="form-control" formControlName="authority">
-            </div>
-            <div class="form-group">
-                <label>{{'clientId' | i18n}}</label>
-                <input class="form-control" formControlName="clientId">
-            </div>
-            <div class="form-group">
-                <label>{{'clientSecret' | i18n}}</label>
-                <input class="form-control" formControlName="clientSecret">
-            </div>
-            <div class="form-group">
-                <label>{{'metadataAddress' | i18n}}</label>
-                <input class="form-control" formControlName="metadataAddress">
-            </div>
-            <div class="form-group">
-                <label>{{'oidcRedirectBehavior' | i18n}}</label>
-                <select class="form-control" formControlName="redirectBehavior">
-                    <option value="0">Redirect GET</option>
-                    <option value="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>{{'additionalScopes' | i18n}}</label>
-                <input class="form-control" formControlName="additionalScopes">
-            </div>
-            <div class="form-group">
-                <label>{{'additionalUserIdClaimTypes' | i18n}}</label>
-                <input class="form-control" formControlName="additionalUserIdClaimTypes">
-            </div>
-            <div class="form-group">
-                <label>{{'additionalEmailClaimTypes' | i18n}}</label>
-                <input class="form-control" formControlName="additionalEmailClaimTypes">
-            </div>
-            <div class="form-group">
-                <label>{{'additionalNameClaimTypes' | i18n}}</label>
-                <input class="form-control" formControlName="additionalNameClaimTypes">
-            </div>
-            <div class="form-group">
-                <label>{{'acrValues' | i18n}}</label>
-                <input class="form-control" formControlName="acrValues">
-            </div>
-            <div class="form-group">
-                <label>{{'expectedReturnAcrValue' | i18n}}</label>
-                <input class="form-control" formControlName="expectedReturnAcrValue">
-            </div>
+    <!-- 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="keyConnectorUrl">
+          {{ "keyConnectorUrl" | i18n }}
+          <small class="text-muted form-text d-inline">({{ "required" | i18n }})</small>
+        </label>
+        <div class="input-group">
+          <input
+            class="form-control"
+            formControlName="keyConnectorUrl"
+            id="keyConnectorUrl"
+            aria-describedby="keyConnectorUrlDesc"
+            (change)="haveTestedKeyConnector = false"
+            appInputStripSpaces
+            appA11yInvalid
+          />
+          <div class="input-group-append">
+            <button
+              type="button"
+              class="btn btn-outline-secondary"
+              (click)="validateKeyConnectorUrl()"
+              [disabled]="!enableTestKeyConnector"
+            >
+              <i
+                class="bwi bwi-spinner bwi-spin"
+                title="{{ 'loading' | i18n }}"
+                aria-hidden="true"
+                *ngIf="keyConnectorUrl.pending"
+              ></i>
+              <span *ngIf="!keyConnectorUrl.pending">
+                {{ "keyConnectorTest" | i18n }}
+              </span>
+            </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>
+    </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>
+      <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"
+          formControlName="additionalUserIdClaimTypes"
+        ></app-input-text>
+
+        <app-input-text
+          [label]="'additionalEmailClaimTypes' | i18n"
+          controlId="additionalEmailClaimTypes"
+          [helperText]="'separateMultipleWithComma' | i18n"
+          formControlName="additionalEmailClaimTypes"
+        ></app-input-text>
+
+        <app-input-text
+          [label]="'additionalNameClaimTypes' | i18n"
+          controlId="additionalNameClaimTypes"
+          [helperText]="'separateMultipleWithComma' | i18n"
+          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"
+          formControlName="expectedReturnAcrValue"
+        ></app-input-text>
+      </div>
+    </div>
+  </div>
+
+  <!-- SAML2 SP -->
+  <div *ngIf="ssoConfigForm.get('configType').value === ssoType.Saml2" [formGroup]="samlForm">
+    <!-- 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>
     </div>
 
-    <div *ngIf="data.value.configType == 2">
-        <!-- SAML2 SP -->
-        <div class="config-section">
-            <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(data.value.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="{{'copyValue' | i18n}}"
-                            (click)="launchUri(data.value.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(data.value.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(data.value.spAcsUrl)">
-                            <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
-                        </button>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label>{{'spNameIdFormat' | i18n}}</label>
-                <select class="form-control" formControlName="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>{{'spOutboundSigningAlgorithm' | i18n}}</label>
-                <select class="form-control" formControlName="spOutboundSigningAlgorithm">
-                    <option *ngFor="let o of samlSigningAlgorithms" [ngValue]="o">{{o}}</option>
-                </select>
-            </div>
-            <div class="form-group">
-                <label>{{'spSigningBehavior' | i18n}}</label>
-                <select class="form-control" formControlName="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>{{'spMinIncomingSigningAlgorithm' | i18n}}</label>
-                <select class="form-control" formControlName="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>
 
-        <!-- SAML2 IDP -->
-        <div class="config-section">
-            <h2>{{'samlIdpConfig' | i18n}}</h2>
+      <app-input-text
+        [label]="'idpEntityId' | i18n"
+        controlId="idpEntityId"
+        formControlName="idpEntityId"
+      ></app-input-text>
 
-            <div class="form-group">
-                <label>{{'idpEntityId' | i18n}}</label>
-                <input class="form-control" formControlName="idpEntityId">
-            </div>
-            <div class="form-group">
-                <label>{{'idpBindingType' | i18n}}</label>
-                <select class="form-control" formControlName="idpBindingType">
-                    <option value="1">Redirect</option>
-                    <option value="2">HTTP POST</option>
-                    <option value="4">Artifact</option>
-                </select>
-            </div>
-            <div class="form-group">
-                <label>{{'idpSingleSignOnServiceUrl' | i18n}}</label>
-                <input class="form-control" formControlName="idpSingleSignOnServiceUrl">
-            </div>
-            <div class="form-group">
-                <label>{{'idpSingleLogoutServiceUrl' | i18n}}</label>
-                <input class="form-control" formControlName="idpSingleLogoutServiceUrl">
-            </div>
-            <div class="form-group">
-                <label>{{'idpArtifactResolutionServiceUrl' | i18n}}</label>
-                <input class="form-control" formControlName="idpArtifactResolutionServiceUrl">
-            </div>
-            <div class="form-group">
-                <label>{{'idpX509PublicCert' | i18n}}</label>
-                <textarea formControlName="idpX509PublicCert" class="form-control form-control-sm text-monospace" rows="6"></textarea>
-            </div>
-            <div class="form-group">
-                <label>{{'idpOutboundSigningAlgorithm' | i18n}}</label>
-                <select class="form-control" formControlName="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>
+      <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>
+
+      <div class="form-group">
+        <label for="idpX509PublicCert">
+          {{ "idpX509PublicCert" | i18n }}
+          <small class="text-muted form-text d-inline">({{ "required" | i18n }})</small>
+        </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>
+  </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>{{'save' | i18n}}</span>
-    </button>
+  <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>
+    <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,121 +1,318 @@
-import {
-    Component,
-    OnInit,
-} from '@angular/core';
-import { FormBuilder } from '@angular/forms';
-import { ActivatedRoute } from '@angular/router';
+import { Component, OnInit } from "@angular/core";
+import { AbstractControl, FormBuilder, FormGroup } from "@angular/forms";
+import { ActivatedRoute } from "@angular/router";
 
-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 { OrganizationSsoRequest } from 'jslib-common/models/request/organization/organizationSsoRequest';
+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";
 
 @Component({
-    selector: 'app-org-manage-sso',
-    templateUrl: 'sso.component.html',
+  selector: "app-org-manage-sso",
+  templateUrl: "sso.component.html",
 })
 export class SsoComponent implements OnInit {
+  readonly ssoType = SsoType;
 
-    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 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 },
+  ];
 
-    loading = true;
-    organizationId: string;
-    formPromise: Promise<any>;
+  readonly 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",
+  ];
 
-    callbackPath: string;
-    signedOutCallbackPath: string;
-    spEntityId: string;
-    spMetadataUrl: string;
-    spAcsUrl: string;
+  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 },
+  ];
 
-    enabled = this.fb.control(false);
-    data = this.fb.group({
-        configType: [],
+  readonly connectRedirectOptions: SelectOptions[] = [
+    { name: "Redirect GET", value: OpenIdConnectRedirectBehavior.RedirectGet },
+    { name: "Form POST", value: OpenIdConnectRedirectBehavior.FormPost },
+  ];
 
-        // OpenId
-        authority: [],
-        clientId: [],
-        clientSecret: [],
-        metadataAddress: [],
-        redirectBehavior: [],
-        getClaimsFromUserInfoEndpoint: [],
-        additionalScopes: [],
-        additionalUserIdClaimTypes: [],
-        additionalEmailClaimTypes: [],
-        additionalNameClaimTypes: [],
-        acrValues: [],
-        expectedReturnAcrValue: [],
+  showOpenIdCustomizations = false;
 
-        // SAML
-        spNameIdFormat: [],
-        spOutboundSigningAlgorithm: [],
-        spSigningBehavior: [],
-        spMinIncomingSigningAlgorithm: [],
-        spWantAssertionsSigned: [],
-        spValidateCertificates: [],
+  loading = true;
+  haveTestedKeyConnector = false;
+  organizationId: string;
+  organization: Organization;
+  formPromise: Promise<any>;
 
-        idpEntityId: [],
-        idpBindingType: [],
-        idpSingleSignOnServiceUrl: [],
-        idpSingleLogoutServiceUrl: [],
-        idpArtifactResolutionServiceUrl: [],
-        idpX509PublicCert: [],
-        idpOutboundSigningAlgorithm: [],
-        idpAllowUnsolicitedAuthnResponse: [],
-        idpDisableOutboundLogoutRequests: [],
-        idpWantAuthnRequestsSigned: [],
+  callbackPath: string;
+  signedOutCallbackPath: string;
+  spEntityId: string;
+  spMetadataUrl: string;
+  spAcsUrl: string;
+
+  enabled = this.formBuilder.control(false);
+
+  openIdForm = this.formBuilder.group(
+    {
+      authority: ["", dirtyRequired],
+      clientId: ["", dirtyRequired],
+      clientSecret: ["", dirtyRequired],
+      metadataAddress: [],
+      redirectBehavior: [OpenIdConnectRedirectBehavior.RedirectGet, dirtyRequired],
+      getClaimsFromUserInfoEndpoint: [],
+      additionalScopes: [],
+      additionalUserIdClaimTypes: [],
+      additionalEmailClaimTypes: [],
+      additionalNameClaimTypes: [],
+      acrValues: [],
+      expectedReturnAcrValue: [],
+    },
+    {
+      updateOn: "blur",
+    }
+  );
+
+  samlForm = this.formBuilder.group(
+    {
+      spNameIdFormat: [Saml2NameIdFormat.NotConfigured],
+      spOutboundSigningAlgorithm: [defaultSigningAlgorithm],
+      spSigningBehavior: [Saml2SigningBehavior.IfIdpWantAuthnRequestsSigned],
+      spMinIncomingSigningAlgorithm: [defaultSigningAlgorithm],
+      spWantAssertionsSigned: [],
+      spValidateCertificates: [],
+
+      idpEntityId: ["", dirtyRequired],
+      idpBindingType: [Saml2BindingType.HttpRedirect],
+      idpSingleSignOnServiceUrl: [],
+      idpSingleLogoutServiceUrl: [],
+      idpX509PublicCert: ["", dirtyRequired],
+      idpOutboundSigningAlgorithm: [defaultSigningAlgorithm],
+      idpAllowUnsolicitedAuthnResponse: [],
+      idpAllowOutboundLogoutRequests: [true],
+      idpWantAuthnRequestsSigned: [],
+    },
+    {
+      updateOn: "blur",
+    }
+  );
+
+  ssoConfigForm = this.formBuilder.group({
+    configType: [SsoType.None],
+    keyConnectorEnabled: [false],
+    keyConnectorUrl: [""],
+    openId: this.openIdForm,
+    saml: this.samlForm,
+  });
+
+  constructor(
+    private formBuilder: FormBuilder,
+    private route: ActivatedRoute,
+    private apiService: ApiService,
+    private platformUtilsService: PlatformUtilsService,
+    private i18nService: I18nService,
+    private organizationService: OrganizationService
+  ) {}
+
+  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();
+      }
     });
 
-    constructor(private fb: FormBuilder, private route: ActivatedRoute, private apiService: ApiService,
-        private platformUtilsService: PlatformUtilsService, private i18nService: I18nService) { }
+    this.samlForm
+      .get("spSigningBehavior")
+      .valueChanges.subscribe(() =>
+        this.samlForm.get("idpX509PublicCert").updateValueAndValidity()
+      );
 
-    async ngOnInit() {
-        this.route.parent.parent.params.subscribe(async params => {
-            this.organizationId = params.organizationId;
-            await this.load();
-        });
+    this.route.parent.parent.params.subscribe(async (params) => {
+      this.organizationId = params.organizationId;
+      await this.load();
+    });
+  }
+
+  async load() {
+    this.organization = await this.organizationService.get(this.organizationId);
+    const ssoSettings = await this.apiService.getOrganizationSso(this.organizationId);
+    this.populateForm(ssoSettings);
+
+    this.callbackPath = ssoSettings.urls.callbackPath;
+    this.signedOutCallbackPath = ssoSettings.urls.signedOutCallbackPath;
+    this.spEntityId = ssoSettings.urls.spEntityId;
+    this.spMetadataUrl = ssoSettings.urls.spMetadataUrl;
+    this.spAcsUrl = ssoSettings.urls.spAcsUrl;
+
+    this.loading = false;
+  }
+
+  async submit() {
+    this.validateForm(this.ssoConfigForm);
+
+    if (this.ssoConfigForm.get("keyConnectorEnabled").value) {
+      await this.validateKeyConnectorUrl();
     }
 
-    async load() {
-        const ssoSettings = await this.apiService.getOrganizationSso(this.organizationId);
-
-        this.data.patchValue(ssoSettings.data);
-        this.enabled.setValue(ssoSettings.enabled);
-
-        this.callbackPath = ssoSettings.urls.callbackPath;
-        this.signedOutCallbackPath = ssoSettings.urls.signedOutCallbackPath;
-        this.spEntityId = ssoSettings.urls.spEntityId;
-        this.spMetadataUrl = ssoSettings.urls.spMetadataUrl;
-        this.spAcsUrl = ssoSettings.urls.spAcsUrl;
-
-        this.loading = false;
+    if (!this.ssoConfigForm.valid) {
+      this.readOutErrors();
+      return;
     }
 
-    copy(value: string) {
-        this.platformUtilsService.copyToClipboard(value);
+    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);
+
+    try {
+      const response = await this.formPromise;
+      this.populateForm(response);
+      this.platformUtilsService.showToast("success", null, this.i18nService.t("ssoSettingsSaved"));
+    } catch {
+      // Logged by appApiAction, do nothing
     }
 
-    launchUri(url: string) {
-        this.platformUtilsService.launchUri(url);
+    this.formPromise = null;
+  }
+
+  async validateKeyConnectorUrl() {
+    if (this.haveTestedKeyConnector) {
+      return;
     }
 
-    async submit() {
-        const request = new OrganizationSsoRequest();
-        request.enabled = this.enabled.value;
-        request.data = this.data.value;
+    this.keyConnectorUrl.markAsPending();
 
-        this.formPromise = this.apiService.postOrganizationSso(this.organizationId, request);
-
-        const response = await this.formPromise;
-        this.data.patchValue(response.data);
-        this.enabled.setValue(response.enabled);
-
-        this.formPromise = null;
-        this.platformUtilsService.showToast('success', null, this.i18nService.t('ssoSettingsSaved'));
+    try {
+      await this.apiService.getKeyConnectorAlive(this.keyConnectorUrl.value);
+      this.keyConnectorUrl.updateValueAndValidity();
+    } catch {
+      this.keyConnectorUrl.setErrors({
+        invalidUrl: true,
+      });
     }
+
+    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);
+  }
+
+  get enableTestKeyConnector() {
+    return (
+      this.ssoConfigForm.get("keyConnectorEnabled").value &&
+      !Utils.isNullOrWhitespace(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);
+  }
 }

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

@@ -1,51 +1,44 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+import { NgModule } from "@angular/core";
+import { RouterModule, Routes } from "@angular/router";
 
-import { AuthGuardService } from 'jslib-angular/services/auth-guard.service';
+import { AuthGuard } from "jslib-angular/guards/auth.guard";
+import { Permissions } from "jslib-common/enums/permissions";
 
-import { Permissions } from 'jslib-common/enums/permissions';
+import { PermissionsGuard } from "src/app/organizations/guards/permissions.guard";
+import { OrganizationLayoutComponent } from "src/app/organizations/layouts/organization-layout.component";
+import { ManageComponent } from "src/app/organizations/manage/manage.component";
+import { NavigationPermissionsService } from "src/app/organizations/services/navigation-permissions.service";
 
-import { OrganizationLayoutComponent } from 'src/app/layouts/organization-layout.component';
-import { ManageComponent } from 'src/app/organizations/manage/manage.component';
-import { OrganizationGuardService } from 'src/app/services/organization-guard.service';
-import { OrganizationTypeGuardService } from 'src/app/services/organization-type-guard.service';
-
-import { SsoComponent } from './manage/sso.component';
+import { SsoComponent } from "./manage/sso.component";
 
 const routes: Routes = [
-    {
-        path: 'organizations/:organizationId',
-        component: OrganizationLayoutComponent,
-        canActivate: [AuthGuardService, OrganizationGuardService],
+  {
+    path: "organizations/:organizationId",
+    component: OrganizationLayoutComponent,
+    canActivate: [AuthGuard, PermissionsGuard],
+    children: [
+      {
+        path: "manage",
+        component: ManageComponent,
+        canActivate: [PermissionsGuard],
+        data: {
+          permissions: NavigationPermissionsService.getPermissions("manage").concat(
+            Permissions.ManageSso
+          ),
+        },
         children: [
-            {
-                path: 'manage',
-                component: ManageComponent,
-                canActivate: [OrganizationTypeGuardService],
-                data: {
-                    permissions: [
-                        Permissions.ManageAssignedCollections,
-                        Permissions.ManageAllCollections,
-                        Permissions.AccessEventLogs,
-                        Permissions.ManageGroups,
-                        Permissions.ManageUsers,
-                        Permissions.ManagePolicies,
-                        Permissions.ManageSso,
-                    ],
-                },
-                children: [
-                    {
-                        path: 'sso',
-                        component: SsoComponent,
-                    },
-                ],
-            },
+          {
+            path: "sso",
+            component: SsoComponent,
+          },
         ],
-    },
+      },
+    ],
+  },
 ];
 
 @NgModule({
-    imports: [RouterModule.forChild(routes)],
-    exports: [RouterModule],
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
 })
-export class OrganizationsRoutingModule { }
+export class OrganizationsRoutingModule {}

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

@@ -1,22 +1,32 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { CommonModule } from "@angular/common";
+import { NgModule } from "@angular/core";
+import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 
-import { OssModule } from 'src/app/oss.module';
+import { JslibModule } from "jslib-angular/jslib.module";
 
-import { SsoComponent } from './manage/sso.component';
-import { OrganizationsRoutingModule } from './organizations-routing.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: [
-        SsoComponent,
-    ],
+  imports: [
+    CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
+    JslibModule,
+    OrganizationsRoutingModule,
+  ],
+  declarations: [
+    InputCheckboxComponent,
+    InputTextComponent,
+    InputTextReadOnlyComponent,
+    SelectComponent,
+    SsoComponent,
+  ],
 })
 export class OrganizationsModule {}

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

@@ -1,6 +1,12 @@
 <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">{{'enabled' | i18n}}</label>
-    </div>
+  <div class="form-check">
+    <input
+      class="form-check-input"
+      type="checkbox"
+      id="enabled"
+      [formControl]="enabled"
+      name="Enabled"
+    />
+    <label class="form-check-label" for="enabled">{{ "enabled" | i18n }}</label>
+  </div>
 </div>

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

@@ -1,24 +1,21 @@
-import { Component } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
+import { Component } from "@angular/core";
 
-import { I18nService } from 'jslib-common/abstractions/i18n.service';
+import { PolicyType } from "jslib-common/enums/policyType";
 
-import { PolicyType } from 'jslib-common/enums/policyType';
-
-import { PolicyRequest } from 'jslib-common/models/request/policyRequest';
-
-import { BasePolicy, BasePolicyComponent } from 'src/app/organizations/policies/base-policy.component';
+import {
+  BasePolicy,
+  BasePolicyComponent,
+} from "src/app/organizations/policies/base-policy.component";
 
 export class DisablePersonalVaultExportPolicy extends BasePolicy {
-    name = 'disablePersonalVaultExport';
-    description = 'disablePersonalVaultExportDesc';
-    type = PolicyType.DisablePersonalVaultExport;
-    component = DisablePersonalVaultExportPolicyComponent;
+  name = "disablePersonalVaultExport";
+  description = "disablePersonalVaultExportDesc";
+  type = PolicyType.DisablePersonalVaultExport;
+  component = DisablePersonalVaultExportPolicyComponent;
 }
 
 @Component({
-    selector: 'policy-disable-personal-vault-export',
-    templateUrl: 'disable-personal-vault-export.component.html',
+  selector: "policy-disable-personal-vault-export",
+  templateUrl: "disable-personal-vault-export.component.html",
 })
-export class DisablePersonalVaultExportPolicyComponent extends BasePolicyComponent {
-}
+export class DisablePersonalVaultExportPolicyComponent extends BasePolicyComponent {}

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

@@ -1,27 +1,47 @@
-<app-callout type="tip" title="{{'prerequisite' | i18n}}">
-    {{'requireSsoPolicyReq' | i18n}}
+<app-callout type="tip" title="{{ 'prerequisite' | i18n }}">
+  {{ "requireSsoPolicyReq" | i18n }}
 </app-callout>
 
 <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">{{'enabled' | i18n}}</label>
-    </div>
+  <div class="form-check">
+    <input
+      class="form-check-input"
+      type="checkbox"
+      id="enabled"
+      [formControl]="enabled"
+      name="Enabled"
+    />
+    <label class="form-check-label" for="enabled">{{ "enabled" | i18n }}</label>
+  </div>
 </div>
 
 <div [formGroup]="data">
-    <div class="form-group">
-        <label for="hours">{{'maximumVaultTimeoutLabel' | i18n}}</label>
-        <div class="row">
-            <div class="col-6">
-                <input id="hours" class="form-control" type="number" min="0" name="hours" formControlName="hours">
-                <small>{{'hours' | i18n }}</small>
-            </div>
-            <div class="col-6">
-                <input id="minutes" class="form-control" type="number" min="0" max="59" name="minutes"
-                    formControlName="minutes">
-                <small>{{'minutes' | i18n }}</small>
-            </div>
-        </div>
+  <div class="form-group">
+    <label for="hours">{{ "maximumVaultTimeoutLabel" | i18n }}</label>
+    <div class="row">
+      <div class="col-6">
+        <input
+          id="hours"
+          class="form-control"
+          type="number"
+          min="0"
+          name="hours"
+          formControlName="hours"
+        />
+        <small>{{ "hours" | i18n }}</small>
+      </div>
+      <div class="col-6">
+        <input
+          id="minutes"
+          class="form-control"
+          type="number"
+          min="0"
+          max="59"
+          name="minutes"
+          formControlName="minutes"
+        />
+        <small>{{ "minutes" | i18n }}</small>
+      </div>
     </div>
+  </div>
 </div>

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

@@ -1,70 +1,70 @@
-import { Component } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
+import { Component } from "@angular/core";
+import { FormBuilder } from "@angular/forms";
 
-import { I18nService } from 'jslib-common/abstractions/i18n.service';
+import { I18nService } from "jslib-common/abstractions/i18n.service";
+import { PolicyType } from "jslib-common/enums/policyType";
+import { PolicyRequest } from "jslib-common/models/request/policyRequest";
 
-import { PolicyType } from 'jslib-common/enums/policyType';
-
-import { PolicyRequest } from 'jslib-common/models/request/policyRequest';
-
-import { BasePolicy, BasePolicyComponent } from 'src/app/organizations/policies/base-policy.component';
+import {
+  BasePolicy,
+  BasePolicyComponent,
+} from "src/app/organizations/policies/base-policy.component";
 
 export class MaximumVaultTimeoutPolicy extends BasePolicy {
-    name = 'maximumVaultTimeout';
-    description = 'maximumVaultTimeoutDesc';
-    type = PolicyType.MaximumVaultTimeout;
-    component = MaximumVaultTimeoutPolicyComponent;
+  name = "maximumVaultTimeout";
+  description = "maximumVaultTimeoutDesc";
+  type = PolicyType.MaximumVaultTimeout;
+  component = MaximumVaultTimeoutPolicyComponent;
 }
 
 @Component({
-    selector: 'policy-maximum-timeout',
-    templateUrl: 'maximum-vault-timeout.component.html',
+  selector: "policy-maximum-timeout",
+  templateUrl: "maximum-vault-timeout.component.html",
 })
 export class MaximumVaultTimeoutPolicyComponent extends BasePolicyComponent {
+  data = this.formBuilder.group({
+    hours: [null],
+    minutes: [null],
+  });
 
-    data = this.fb.group({
-        hours: [null],
-        minutes: [null],
+  constructor(private formBuilder: FormBuilder, private i18nService: I18nService) {
+    super();
+  }
+
+  loadData() {
+    const minutes = this.policyResponse.data?.minutes;
+
+    if (minutes == null) {
+      return;
+    }
+
+    this.data.patchValue({
+      hours: Math.floor(minutes / 60),
+      minutes: minutes % 60,
     });
+  }
 
-    constructor(private fb: FormBuilder, private i18nService: I18nService) {
-        super();
+  buildRequestData() {
+    if (this.data.value.hours == null && this.data.value.minutes == null) {
+      return null;
     }
 
-    loadData() {
-        const minutes = this.policyResponse.data?.minutes;
+    return {
+      minutes: this.data.value.hours * 60 + this.data.value.minutes,
+    };
+  }
 
-        if (minutes == null) {
-            return;
-        }
-
-        this.data.patchValue({
-            hours: Math.floor(minutes / 60),
-            minutes: minutes % 60,
-        });
+  buildRequest(policiesEnabledMap: Map<PolicyType, boolean>): Promise<PolicyRequest> {
+    const singleOrgEnabled = policiesEnabledMap.get(PolicyType.SingleOrg) ?? false;
+    if (this.enabled.value && !singleOrgEnabled) {
+      throw new Error(this.i18nService.t("requireSsoPolicyReqError"));
     }
 
-    buildRequestData() {
-        if (this.data.value.hours == null && this.data.value.minutes == null) {
-            return null;
-        }
-
-        return {
-            minutes: this.data.value.hours * 60 + this.data.value.minutes,
-        };
+    const data = this.buildRequestData();
+    if (data?.minutes == null || data?.minutes <= 0) {
+      throw new Error(this.i18nService.t("invalidMaximumVaultTimeout"));
     }
 
-    buildRequest(policiesEnabledMap: Map<PolicyType, boolean>): Promise<PolicyRequest> {
-        const singleOrgEnabled = policiesEnabledMap.get(PolicyType.SingleOrg) ?? false;
-        if (this.enabled.value && !singleOrgEnabled) {
-            throw new Error(this.i18nService.t('requireSsoPolicyReqError'));
-        }
-
-        const data = this.buildRequestData();
-        if (data?.minutes == null || data?.minutes <= 0) {
-            throw new Error(this.i18nService.t('invalidMaximumVaultTimeout'));
-        }
-
-        return super.buildRequest(policiesEnabledMap);
-    }
+    return super.buildRequest(policiesEnabledMap);
+  }
 }

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

@@ -1,35 +1,46 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="addTitle">
-    <div class="modal-dialog modal-dialog-scrollable" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h2 class="modal-title" id="addTitle">
-                    {{'addExistingOrganization' | i18n}}
-                </h2>
-                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="card-body text-center" *ngIf="loading">
-                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
-                    {{'loading' | i18n}}
-                </div>
-                <ng-container *ngIf="!loading">
-                    <table class="table table-hover table-list">
-                        <tr *ngFor="let o of organizations">
-                            <td width="30">
-                                <app-avatar [data]="o.name" size="25" [circle]="true" [fontSize]="14"></app-avatar>
-                            </td>
-                            <td>
-                                {{o.name}}
-                            </td>
-                            <td>
-                                <button class="btn btn-outline-secondary pull-right" (click)="add(o)" [disabled]="formPromise">Add</button>
-                            </td>
-                        </tr>
-                    </table>
-                </ng-container>
-            </div>
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="addTitle">
+  <div class="modal-dialog modal-dialog-scrollable" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h2 class="modal-title" id="addTitle">
+          {{ "addExistingOrganization" | i18n }}
+        </h2>
+        <button
+          type="button"
+          class="close"
+          data-dismiss="modal"
+          appA11yTitle="{{ 'close' | i18n }}"
+        >
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </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>
+          {{ "loading" | i18n }}
         </div>
+        <ng-container *ngIf="!loading">
+          <table class="table table-hover table-list">
+            <tr *ngFor="let o of organizations">
+              <td width="30">
+                <app-avatar [data]="o.name" size="25" [circle]="true" [fontSize]="14"></app-avatar>
+              </td>
+              <td>
+                {{ o.name }}
+              </td>
+              <td>
+                <button
+                  class="btn btn-outline-secondary pull-right"
+                  (click)="add(o)"
+                  [disabled]="formPromise"
+                >
+                  Add
+                </button>
+              </td>
+            </tr>
+          </table>
+        </ng-container>
+      </div>
     </div>
+  </div>
 </div>

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

@@ -1,83 +1,84 @@
-import {
-    Component,
-    EventEmitter,
-    Input,
-    OnInit,
-    Output
-} from '@angular/core';
-import { ToasterService } from 'angular2-toaster';
+import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
 
-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 { UserService } from 'jslib-common/abstractions/user.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 { 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 { ProviderService } from '../services/provider.service';
-
-import { Organization } from 'jslib-common/models/domain/organization';
-import { Provider } from 'jslib-common/models/domain/provider';
-
-import { PlanType } from 'jslib-common/enums/planType';
+import { WebProviderService } from "../services/webProvider.service";
 
 @Component({
-    selector: 'provider-add-organization',
-    templateUrl: 'add-organization.component.html',
+  selector: "provider-add-organization",
+  templateUrl: "add-organization.component.html",
 })
 export class AddOrganizationComponent implements OnInit {
+  @Input() providerId: string;
+  @Input() organizations: Organization[];
+  @Output() onAddedOrganization = new EventEmitter();
 
-    @Input() providerId: string;
-    @Input() organizations: Organization[];
-    @Output() onAddedOrganization = new EventEmitter();
+  provider: Provider;
+  formPromise: Promise<any>;
+  loading = true;
 
-    provider: Provider;
-    formPromise: Promise<any>;
-    loading = true;
+  constructor(
+    private providerService: ProviderService,
+    private webProviderService: WebProviderService,
+    private i18nService: I18nService,
+    private platformUtilsService: PlatformUtilsService,
+    private validationService: ValidationService
+  ) {}
 
-    constructor(private userService: UserService, private providerService: ProviderService,
-        private toasterService: ToasterService, private i18nService: I18nService,
-        private platformUtilsService: PlatformUtilsService, private validationService: ValidationService,
-        private apiService: ApiService) { }
+  async ngOnInit() {
+    await this.load();
+  }
 
-    async ngOnInit() {
-        await this.load();
+  async load() {
+    if (this.providerId == null) {
+      return;
     }
 
-    async load() {
-        if (this.providerId == null) {
-            return;
-        }
+    this.provider = await this.providerService.get(this.providerId);
 
-        this.provider = await this.userService.getProvider(this.providerId);
+    this.loading = false;
+  }
 
-        this.loading = false;
+  async add(organization: Organization) {
+    if (this.formPromise) {
+      return;
     }
 
-    async add(organization: Organization) {
-        if (this.formPromise) {
-            return;
-        }
+    const confirmed = await this.platformUtilsService.showDialog(
+      this.i18nService.t("addOrganizationConfirmation", organization.name, this.provider.name),
+      organization.name,
+      this.i18nService.t("yes"),
+      this.i18nService.t("no"),
+      "warning"
+    );
 
-        const confirmed = await this.platformUtilsService.showDialog(
-            this.i18nService.t('addOrganizationConfirmation', organization.name, this.provider.name), organization.name,
-            this.i18nService.t('yes'), this.i18nService.t('no'), 'warning');
-
-        if (!confirmed) {
-            return false;
-        }
-
-        try {
-            this.formPromise = this.providerService.addOrganizationToProvider(this.providerId, organization.id);
-            await this.formPromise;
-        } catch (e) {
-            this.validationService.showError(e);
-            return;
-        } finally {
-            this.formPromise = null;
-        }
-
-        this.toasterService.popAsync('success', null, this.i18nService.t('organizationJoinedProvider'));
-        this.onAddedOrganization.emit();
+    if (!confirmed) {
+      return false;
     }
+
+    try {
+      this.formPromise = this.webProviderService.addOrganizationToProvider(
+        this.providerId,
+        organization.id
+      );
+      await this.formPromise;
+    } catch (e) {
+      this.validationService.showError(e);
+      return;
+    } finally {
+      this.formPromise = null;
+    }
+
+    this.platformUtilsService.showToast(
+      "success",
+      null,
+      this.i18nService.t("organizationJoinedProvider")
+    );
+    this.onAddedOrganization.emit();
+  }
 }

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

@@ -1,62 +1,90 @@
 <div class="page-header d-flex">
-    <h1>{{'clients' | i18n}}</h1>
+  <h1>{{ "clients" | i18n }}</h1>
 
-    <div class="ml-auto d-flex">
-        <div>
-            <label class="sr-only" for="search">{{'search' | i18n}}</label>
-            <input type="search" class="form-control form-control-sm" id="search" placeholder="{{'search' | i18n}}"
-                [(ngModel)]="searchText">
-        </div>
-        <a class="btn btn-sm btn-outline-primary ml-3" routerLink="create" *ngIf="manageOrganizations">
-            <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
-            {{'newClientOrganization' | i18n}}
-        </a>
-        <button class="btn btn-sm btn-outline-primary ml-3" (click)="addExistingOrganization()"
-            *ngIf="manageOrganizations && showAddExisting">
-            <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
-            {{'addExistingOrganization' | i18n}}
-        </button>
+  <div class="ml-auto d-flex">
+    <div>
+      <label class="sr-only" for="search">{{ "search" | i18n }}</label>
+      <input
+        type="search"
+        class="form-control form-control-sm"
+        id="search"
+        placeholder="{{ 'search' | i18n }}"
+        [(ngModel)]="searchText"
+      />
     </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>
+      {{ "newClientOrganization" | i18n }}
+    </a>
+    <button
+      class="btn btn-sm btn-outline-primary ml-3"
+      (click)="addExistingOrganization()"
+      *ngIf="manageOrganizations && showAddExisting"
+    >
+      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
+      {{ "addExistingOrganization" | i18n }}
+    </button>
+  </div>
 </div>
 
 <ng-container *ngIf="loading">
-    <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}" aria-hidden="true"></i>
-    <span class="sr-only">{{'loading' | i18n}}</span>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
+  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 
 <ng-container
-    *ngIf="!loading && (clients | search:searchText:'organizationName':'id') as searchedClients">
-    <p *ngIf="!searchedClients.length">{{'noClientsInList' | i18n}}</p>
-    <ng-container *ngIf="searchedClients.length">
-        <table class="table table-hover table-list" infiniteScroll [infiniteScrollDistance]="1"
-            [infiniteScrollDisabled]="!isPaging()" (scrolled)="loadMore()">
-            <tbody>
-                <tr *ngFor="let o of searchedClients">
-                    <td width="30">
-                        <app-avatar [data]="o.organizationName" size="25" [circle]="true" [fontSize]="14"></app-avatar>
-                    </td>
-                    <td>
-                        <a [routerLink]="['/organizations', o.organizationId]">{{o.organizationName}}</a>
-                    </td>
-                    <td class="table-list-options" *ngIf="manageOrganizations">
-                        <div class="dropdown" appListDropdown>
-                            <button class="btn btn-outline-secondary dropdown-toggle" type="button"
-                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
-                                appA11yTitle="{{'options' | i18n}}">
-                                <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="fa fa-fw fa-remove" aria-hidden="true"></i>
-                                    {{'remove' | i18n}}
-                                </a>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </ng-container>
+  *ngIf="!loading && (clients | search: searchText:'organizationName':'id') as searchedClients"
+>
+  <p *ngIf="!searchedClients.length">{{ "noClientsInList" | i18n }}</p>
+  <ng-container *ngIf="searchedClients.length">
+    <table
+      class="table table-hover table-list"
+      infiniteScroll
+      [infiniteScrollDistance]="1"
+      [infiniteScrollDisabled]="!isPaging()"
+      (scrolled)="loadMore()"
+    >
+      <tbody>
+        <tr *ngFor="let o of searchedClients">
+          <td width="30">
+            <app-avatar
+              [data]="o.organizationName"
+              size="25"
+              [circle]="true"
+              [fontSize]="14"
+            ></app-avatar>
+          </td>
+          <td>
+            <a [routerLink]="['/organizations', o.organizationId]">{{ o.organizationName }}</a>
+          </td>
+          <td class="table-list-options" *ngIf="manageOrganizations">
+            <div class="dropdown" appListDropdown>
+              <button
+                class="btn btn-outline-secondary dropdown-toggle"
+                type="button"
+                data-toggle="dropdown"
+                aria-haspopup="true"
+                aria-expanded="false"
+                appA11yTitle="{{ 'options' | i18n }}"
+              >
+                <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
+              </button>
+              <div class="dropdown-menu dropdown-menu-right">
+                <a class="dropdown-item text-danger" href="#" appStopClick (click)="remove(o)">
+                  <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
+                  {{ "remove" | i18n }}
+                </a>
+              </div>
+            </div>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </ng-container>
 </ng-container>
 
 <ng-template #add></ng-template>

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

@@ -1,160 +1,179 @@
-import {
-    Component,
-    OnInit,
-    ViewChild,
-    ViewContainerRef
-} from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { ToasterService } from 'angular2-toaster';
+import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core";
+import { ActivatedRoute } 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 { SearchService } from 'jslib-common/abstractions/search.service';
-import { UserService } from 'jslib-common/abstractions/user.service';
+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";
+import { OrganizationService } from "jslib-common/abstractions/organization.service";
+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 { 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";
 
-import { ModalService } from 'jslib-angular/services/modal.service';
-import { ValidationService } from 'jslib-angular/services/validation.service';
+import { WebProviderService } from "../services/webProvider.service";
 
-import { PlanType } from 'jslib-common/enums/planType';
-import { ProviderUserType } from 'jslib-common/enums/providerUserType';
+import { AddOrganizationComponent } from "./add-organization.component";
 
-import { Organization } from 'jslib-common/models/domain/organization';
-import {
-    ProviderOrganizationOrganizationDetailsResponse
-} from 'jslib-common/models/response/provider/providerOrganizationResponse';
-
-import { ProviderService } from '../services/provider.service';
-
-import { AddOrganizationComponent } from './add-organization.component';
-
-const DisallowedPlanTypes = [PlanType.Free, PlanType.FamiliesAnnually2019, PlanType.FamiliesAnnually];
+const DisallowedPlanTypes = [
+  PlanType.Free,
+  PlanType.FamiliesAnnually2019,
+  PlanType.FamiliesAnnually,
+];
 
 @Component({
-    templateUrl: 'clients.component.html',
+  templateUrl: "clients.component.html",
 })
 export class ClientsComponent implements OnInit {
+  @ViewChild("add", { read: ViewContainerRef, static: true }) addModalRef: ViewContainerRef;
 
-    @ViewChild('add', { read: ViewContainerRef, static: true }) addModalRef: ViewContainerRef;
+  providerId: any;
+  searchText: string;
+  addableOrganizations: Organization[];
+  loading = true;
+  manageOrganizations = false;
+  showAddExisting = false;
 
-    providerId: any;
-    searchText: string;
-    addableOrganizations: Organization[];
-    loading = true;
-    manageOrganizations = false;
-    showAddExisting = false;
+  clients: ProviderOrganizationOrganizationDetailsResponse[];
+  pagedClients: ProviderOrganizationOrganizationDetailsResponse[];
 
-    clients: ProviderOrganizationOrganizationDetailsResponse[];
-    pagedClients: ProviderOrganizationOrganizationDetailsResponse[];
+  protected didScroll = false;
+  protected pageSize = 100;
+  protected actionPromise: Promise<any>;
+  private pagedClientsCount = 0;
 
-    protected didScroll = false;
-    protected pageSize = 100;
-    protected actionPromise: Promise<any>;
-    private pagedClientsCount = 0;
+  constructor(
+    private route: ActivatedRoute,
+    private providerService: ProviderService,
+    private apiService: ApiService,
+    private searchService: SearchService,
+    private platformUtilsService: PlatformUtilsService,
+    private i18nService: I18nService,
+    private validationService: ValidationService,
+    private webProviderService: WebProviderService,
+    private logService: LogService,
+    private modalService: ModalService,
+    private organizationService: OrganizationService
+  ) {}
 
-    constructor(private route: ActivatedRoute, private userService: UserService,
-        private apiService: ApiService, private searchService: SearchService,
-        private platformUtilsService: PlatformUtilsService, private i18nService: I18nService,
-        private toasterService: ToasterService, private validationService: ValidationService,
-        private providerService: ProviderService, private logService: LogService,
-        private modalService: ModalService) { }
+  async ngOnInit() {
+    this.route.parent.params.subscribe(async (params) => {
+      this.providerId = params.providerId;
 
-    async ngOnInit() {
-        this.route.parent.params.subscribe(async params => {
-            this.providerId = params.providerId;
+      await this.load();
 
+      this.route.queryParams.pipe(first()).subscribe(async (qParams) => {
+        this.searchText = qParams.search;
+      });
+    });
+  }
+
+  async load() {
+    const response = await this.apiService.getProviderClients(this.providerId);
+    this.clients = response.data != null && response.data.length > 0 ? response.data : [];
+    this.manageOrganizations =
+      (await this.providerService.get(this.providerId)).type === ProviderUserType.ProviderAdmin;
+    const candidateOrgs = (await this.organizationService.getAll()).filter(
+      (o) => o.isOwner && o.providerId == null
+    );
+    const allowedOrgsIds = await Promise.all(
+      candidateOrgs.map((o) => this.apiService.getOrganization(o.id))
+    ).then((orgs) =>
+      orgs.filter((o) => !DisallowedPlanTypes.includes(o.planType)).map((o) => o.id)
+    );
+    this.addableOrganizations = candidateOrgs.filter((o) => allowedOrgsIds.includes(o.id));
+
+    this.showAddExisting = this.addableOrganizations.length !== 0;
+    this.loading = false;
+  }
+
+  isPaging() {
+    const searching = this.isSearching();
+    if (searching && this.didScroll) {
+      this.resetPaging();
+    }
+    return !searching && this.clients && this.clients.length > this.pageSize;
+  }
+
+  isSearching() {
+    return this.searchService.isSearchable(this.searchText);
+  }
+
+  async resetPaging() {
+    this.pagedClients = [];
+    this.loadMore();
+  }
+
+  loadMore() {
+    if (!this.clients || this.clients.length <= this.pageSize) {
+      return;
+    }
+    const pagedLength = this.pagedClients.length;
+    let pagedSize = this.pageSize;
+    if (pagedLength === 0 && this.pagedClientsCount > this.pageSize) {
+      pagedSize = this.pagedClientsCount;
+    }
+    if (this.clients.length > pagedLength) {
+      this.pagedClients = this.pagedClients.concat(
+        this.clients.slice(pagedLength, pagedLength + pagedSize)
+      );
+    }
+    this.pagedClientsCount = this.pagedClients.length;
+    this.didScroll = this.pagedClients.length > this.pageSize;
+  }
+
+  async addExistingOrganization() {
+    const [modal] = await this.modalService.openViewRef(
+      AddOrganizationComponent,
+      this.addModalRef,
+      (comp) => {
+        comp.providerId = this.providerId;
+        comp.organizations = this.addableOrganizations;
+        comp.onAddedOrganization.subscribe(async () => {
+          try {
             await this.load();
-
-            const queryParamsSub = this.route.queryParams.subscribe(async qParams => {
-                this.searchText = qParams.search;
-                if (queryParamsSub != null) {
-                    queryParamsSub.unsubscribe();
-                }
-            });
+            modal.close();
+          } catch (e) {
+            this.logService.error(`Handled exception: ${e}`);
+          }
         });
+      }
+    );
+  }
+
+  async remove(organization: ProviderOrganizationOrganizationDetailsResponse) {
+    const confirmed = await this.platformUtilsService.showDialog(
+      this.i18nService.t("detachOrganizationConfirmation"),
+      organization.organizationName,
+      this.i18nService.t("yes"),
+      this.i18nService.t("no"),
+      "warning"
+    );
+
+    if (!confirmed) {
+      return false;
     }
 
-    async load() {
-        const response = await this.apiService.getProviderClients(this.providerId);
-        this.clients = response.data != null && response.data.length > 0 ? response.data : [];
-        this.manageOrganizations = (await this.userService.getProvider(this.providerId)).type === ProviderUserType.ProviderAdmin;
-        const candidateOrgs = (await this.userService.getAllOrganizations()).filter(o => o.isOwner && o.providerId == null);
-        const allowedOrgsIds = await Promise.all(candidateOrgs.map(o => this.apiService.getOrganization(o.id))).then(orgs =>
-            orgs.filter(o => !DisallowedPlanTypes.includes(o.planType))
-                .map(o => o.id));
-        this.addableOrganizations = candidateOrgs.filter(o => allowedOrgsIds.includes(o.id));
-
-        this.showAddExisting = this.addableOrganizations.length !== 0;
-        this.loading = false;
-    }
-
-    isPaging() {
-        const searching = this.isSearching();
-        if (searching && this.didScroll) {
-            this.resetPaging();
-        }
-        return !searching && this.clients && this.clients.length > this.pageSize;
-    }
-
-    isSearching() {
-        return this.searchService.isSearchable(this.searchText);
-    }
-
-    async resetPaging() {
-        this.pagedClients = [];
-        this.loadMore();
-    }
-
-
-    loadMore() {
-        if (!this.clients || this.clients.length <= this.pageSize) {
-            return;
-        }
-        const pagedLength = this.pagedClients.length;
-        let pagedSize = this.pageSize;
-        if (pagedLength === 0 && this.pagedClientsCount > this.pageSize) {
-            pagedSize = this.pagedClientsCount;
-        }
-        if (this.clients.length > pagedLength) {
-            this.pagedClients = this.pagedClients.concat(this.clients.slice(pagedLength, pagedLength + pagedSize));
-        }
-        this.pagedClientsCount = this.pagedClients.length;
-        this.didScroll = this.pagedClients.length > this.pageSize;
-    }
-
-    async addExistingOrganization() {
-        const [modal] = await this.modalService.openViewRef(AddOrganizationComponent, this.addModalRef, comp => {
-            comp.providerId = this.providerId;
-            comp.organizations = this.addableOrganizations;
-            comp.onAddedOrganization.subscribe(async () => {
-                try {
-                    await this.load();
-                    modal.close();
-                } catch (e) {
-                    this.logService.error(`Handled exception: ${e}`);
-                }
-            });
-        });
-    }
-
-    async remove(organization: ProviderOrganizationOrganizationDetailsResponse) {
-        const confirmed = await this.platformUtilsService.showDialog(
-            this.i18nService.t('detachOrganizationConfirmation'), organization.organizationName,
-            this.i18nService.t('yes'), this.i18nService.t('no'), 'warning');
-
-        if (!confirmed) {
-            return false;
-        }
-
-        this.actionPromise = this.providerService.detachOrganizastion(this.providerId, organization.id);
-        try {
-            await this.actionPromise;
-            this.toasterService.popAsync('success', null, this.i18nService.t('detachedOrganization', organization.organizationName));
-            await this.load();
-        } catch (e) {
-            this.validationService.showError(e);
-        }
-        this.actionPromise = null;
+    this.actionPromise = this.webProviderService.detachOrganizastion(
+      this.providerId,
+      organization.id
+    );
+    try {
+      await this.actionPromise;
+      this.platformUtilsService.showToast(
+        "success",
+        null,
+        this.i18nService.t("detachedOrganization", organization.organizationName)
+      );
+      await this.load();
+    } catch (e) {
+      this.validationService.showError(e);
     }
+    this.actionPromise = null;
+  }
 }

bitwarden_license/src/app/providers/clients/create-organization.component.html

@@ -1,5 +1,5 @@
 <div class="page-header">
-    <h1>{{'newClientOrganization' | i18n}}</h1>
+  <h1>{{ "newClientOrganization" | i18n }}</h1>
 </div>
-<p>{{'newClientOrganizationDesc' | i18n}}</p>
+<p>{{ "newClientOrganizationDesc" | i18n }}</p>
 <app-organization-plans [providerId]="providerId"></app-organization-plans>

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

@@ -1,26 +1,23 @@
-import {
-    Component,
-    OnInit,
-    ViewChild,
-} from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
 
-import { OrganizationPlansComponent } from 'src/app/settings/organization-plans.component';
+import { OrganizationPlansComponent } from "src/app/settings/organization-plans.component";
 
 @Component({
-    selector: 'app-create-organization',
-    templateUrl: 'create-organization.component.html',
+  selector: "app-create-organization",
+  templateUrl: "create-organization.component.html",
 })
 export class CreateOrganizationComponent implements OnInit {
-    @ViewChild(OrganizationPlansComponent, { static: true }) orgPlansComponent: OrganizationPlansComponent;
+  @ViewChild(OrganizationPlansComponent, { static: true })
+  orgPlansComponent: OrganizationPlansComponent;
 
-    providerId: string;
+  providerId: string;
 
-    constructor(private route: ActivatedRoute) { }
+  constructor(private route: ActivatedRoute) {}
 
-    ngOnInit() {
-        this.route.parent.params.subscribe(async params => {
-            this.providerId = params.providerId;
-        });
-    }
+  ngOnInit() {
+    this.route.parent.params.subscribe(async (params) => {
+      this.providerId = params.providerId;
+    });
+  }
 }

bitwarden_license/src/app/providers/guards/provider-type.guard.ts

@@ -0,0 +1,26 @@
+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()
+export class PermissionsGuard implements CanActivate {
+  constructor(private providerService: ProviderService, private router: Router) {}
+
+  async canActivate(route: ActivatedRouteSnapshot) {
+    const provider = await this.providerService.get(route.params.providerId);
+    const permissions = route.data == null ? null : (route.data.permissions as Permissions[]);
+
+    if (
+      (permissions.indexOf(Permissions.AccessEventLogs) !== -1 && provider.canAccessEventLogs) ||
+      (permissions.indexOf(Permissions.ManageProvider) !== -1 && provider.isProviderAdmin) ||
+      (permissions.indexOf(Permissions.ManageUsers) !== -1 && provider.canManageUsers)
+    ) {
+      return true;
+    }
+
+    this.router.navigate(["/providers", provider.id]);
+    return false;
+  }
+}

bitwarden_license/src/app/providers/guards/provider.guard.ts

@@ -0,0 +1,31 @@
+import { Injectable } from "@angular/core";
+import { ActivatedRouteSnapshot, CanActivate, Router } from "@angular/router";
+
+import { I18nService } from "jslib-common/abstractions/i18n.service";
+import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
+import { ProviderService } from "jslib-common/abstractions/provider.service";
+
+@Injectable()
+export class ProviderGuard implements CanActivate {
+  constructor(
+    private router: Router,
+    private platformUtilsService: PlatformUtilsService,
+    private i18nService: I18nService,
+    private providerService: ProviderService
+  ) {}
+
+  async canActivate(route: ActivatedRouteSnapshot) {
+    const provider = await this.providerService.get(route.params.providerId);
+    if (provider == null) {
+      this.router.navigate(["/"]);
+      return false;
+    }
+    if (!provider.isProviderAdmin && !provider.enabled) {
+      this.platformUtilsService.showToast("error", null, this.i18nService.t("providerIsDisabled"));
+      this.router.navigate(["/"]);
+      return false;
+    }
+
+    return true;
+  }
+}

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

@@ -1,35 +1,46 @@
 <div class="mt-5 d-flex justify-content-center" *ngIf="loading">
-    <div>
-        <img class="mb-4 logo logo-themed" alt="Bitwarden">
-        <p class="text-center">
-            <i class="fa fa-spinner fa-spin fa-2x text-muted" title="{{'loading' | i18n}}" aria-hidden="true"></i>
-            <span class="sr-only">{{'loading' | i18n}}</span>
-        </p>
-    </div>
+  <div>
+    <img class="mb-4 logo logo-themed" alt="Bitwarden" />
+    <p class="text-center">
+      <i
+        class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
+        title="{{ 'loading' | i18n }}"
+        aria-hidden="true"
+      ></i>
+      <span class="sr-only">{{ "loading" | i18n }}</span>
+    </p>
+  </div>
 </div>
 <div class="container" *ngIf="!loading && !authed">
-    <div class="row justify-content-md-center mt-5">
-        <div class="col-5">
-            <p class="lead text-center mb-4">{{'joinProvider' | i18n}}</p>
-            <div class="card d-block">
-                <div class="card-body">
-                    <p class="text-center">
-                        {{providerName}}
-                        <strong class="d-block mt-2">{{email}}</strong>
-                    </p>
-                    <p>{{'joinProviderDesc' | i18n}}</p>
-                    <hr>
-                    <div class="d-flex">
-                        <a routerLink="/" [queryParams]="{email: email}" class="btn btn-primary btn-block">
-                            {{'logIn' | i18n}}
-                        </a>
-                        <a routerLink="/register" [queryParams]="{email: email}"
-                            class="btn btn-primary btn-block ml-2 mt-0">
-                            {{'createAccount' | i18n}}
-                        </a>
-                    </div>
-                </div>
-            </div>
+  <div class="row justify-content-md-center mt-5">
+    <div class="col-5">
+      <p class="lead text-center mb-4">{{ "joinProvider" | i18n }}</p>
+      <div class="card d-block">
+        <div class="card-body">
+          <p class="text-center">
+            {{ providerName }}
+            <strong class="d-block mt-2">{{ email }}</strong>
+          </p>
+          <p>{{ "joinProviderDesc" | i18n }}</p>
+          <hr />
+          <div class="d-flex">
+            <a
+              routerLink="/login"
+              [queryParams]="{ email: email }"
+              class="btn btn-primary btn-block"
+            >
+              {{ "logIn" | i18n }}
+            </a>
+            <a
+              routerLink="/register"
+              [queryParams]="{ email: email }"
+              class="btn btn-primary btn-block ml-2 mt-0"
+            >
+              {{ "createAccount" | i18n }}
+            </a>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 </div>

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

@@ -1,48 +1,55 @@
-import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Toast, ToasterService } from 'angular2-toaster';
+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 { ApiService } from 'jslib-common/abstractions/api.service';
-
-import { I18nService } from 'jslib-common/abstractions/i18n.service';
-import { StateService } from 'jslib-common/abstractions/state.service';
-import { UserService } from 'jslib-common/abstractions/user.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',
+  selector: "app-accept-provider",
+  templateUrl: "accept-provider.component.html",
 })
 export class AcceptProviderComponent extends BaseAcceptComponent {
-    providerName: string;
+  providerName: string;
 
-    failedMessage = 'providerInviteAcceptFailed';
+  failedMessage = "providerInviteAcceptFailed";
 
-    requiredParameters = ['providerId', 'providerUserId', 'token'];
+  requiredParameters = ["providerId", "providerUserId", "token"];
 
-    constructor(router: Router, toasterService: ToasterService, i18nService: I18nService, route: ActivatedRoute,
-        userService: UserService, stateService: StateService, private apiService: ApiService) {
-        super(router, toasterService, i18nService, route, userService, stateService);
-    }
+  constructor(
+    router: Router,
+    i18nService: I18nService,
+    route: ActivatedRoute,
+    stateService: StateService,
+    private apiService: ApiService,
+    platformUtilService: PlatformUtilsService
+  ) {
+    super(router, platformUtilService, i18nService, route, stateService);
+  }
 
-    async authedHandler(qParams: any) {
-        const request = new ProviderUserAcceptRequest();
-        request.token = qParams.token;
+  async authedHandler(qParams: any) {
+    const request = new ProviderUserAcceptRequest();
+    request.token = qParams.token;
 
-        await this.apiService.postProviderUserAccept(qParams.providerId, qParams.providerUserId, request);
-        const toast: Toast = {
-            type: 'success',
-            title: this.i18nService.t('inviteAccepted'),
-            body: this.i18nService.t('providerInviteAcceptedDesc'),
-            timeout: 10000,
-        };
-        this.toasterService.popAsync(toast);
-        this.router.navigate(['/vault']);
-    }
+    await this.apiService.postProviderUserAccept(
+      qParams.providerId,
+      qParams.providerUserId,
+      request
+    );
+    this.platformUtilService.showToast(
+      "success",
+      this.i18nService.t("inviteAccepted"),
+      this.i18nService.t("providerInviteAcceptedDesc"),
+      { timeout: 10000 }
+    );
+    this.router.navigate(["/vault"]);
+  }
 
-    async unauthedHandler(qParams: any) {
-        this.providerName = qParams.providerName;
-    }
+  async unauthedHandler(qParams: any) {
+    this.providerName = qParams.providerName;
+  }
 }

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

@@ -1,38 +1,33 @@
-import {
-    Component,
-    Input,
-} from '@angular/core';
+import { Component, Input } from "@angular/core";
 
-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 { 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';
+import { BulkConfirmComponent as OrganizationBulkConfirmComponent } from "src/app/organizations/manage/bulk/bulk-confirm.component";
+import { BulkUserDetails } from "src/app/organizations/manage/bulk/bulk-status.component";
 
 @Component({
-    templateUrl: '/src/app/organizations/manage/bulk/bulk-confirm.component.html',
+  templateUrl: "../../../../../../src/app/organizations/manage/bulk/bulk-confirm.component.html",
 })
 export class BulkConfirmComponent extends OrganizationBulkConfirmComponent {
+  @Input() providerId: string;
 
-    @Input() providerId: string;
+  protected isAccepted(user: BulkUserDetails) {
+    return user.status === ProviderUserStatusType.Accepted;
+  }
 
-    protected isAccepted(user: BulkUserDetails) {
-        return user.status === ProviderUserStatusType.Accepted;
-    }
+  protected async getPublicKeys() {
+    const request = new ProviderUserBulkRequest(this.filteredUsers.map((user) => user.id));
+    return await this.apiService.postProviderUsersPublicKey(this.providerId, request);
+  }
 
-    protected async getPublicKeys() {
-        const request = new ProviderUserBulkRequest(this.filteredUsers.map(user => user.id));
-        return await this.apiService.postProviderUsersPublicKey(this.providerId, request);
-    }
+  protected getCryptoKey() {
+    return this.cryptoService.getProviderKey(this.providerId);
+  }
 
-    protected getCryptoKey() {
-        return this.cryptoService.getProviderKey(this.providerId);
-    }
-
-    protected async postConfirmRequest(userIdsWithKeys: any[]) {
-        const request = new ProviderUserBulkConfirmRequest(userIdsWithKeys);
-        return await this.apiService.postProviderUserBulkConfirm(this.providerId, request);
-    }
+  protected async postConfirmRequest(userIdsWithKeys: any[]) {
+    const request = new ProviderUserBulkConfirmRequest(userIdsWithKeys);
+    return await this.apiService.postProviderUserBulkConfirm(this.providerId, request);
+  }
 }

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

@@ -1,21 +1,17 @@
-import {
-    Component,
-    Input,
-} from '@angular/core';
+import { Component, Input } from "@angular/core";
 
-import { ProviderUserBulkRequest } from 'jslib-common/models/request/provider/providerUserBulkRequest';
+import { ProviderUserBulkRequest } from "jslib-common/models/request/provider/providerUserBulkRequest";
 
-import { BulkRemoveComponent as OrganizationBulkRemoveComponent } from 'src/app/organizations/manage/bulk/bulk-remove.component';
+import { BulkRemoveComponent as OrganizationBulkRemoveComponent } from "src/app/organizations/manage/bulk/bulk-remove.component";
 
 @Component({
-    templateUrl: '/src/app/organizations/manage/bulk/bulk-remove.component.html',
+  templateUrl: "../../../../../../src/app/organizations/manage/bulk/bulk-remove.component.html",
 })
 export class BulkRemoveComponent extends OrganizationBulkRemoveComponent {
+  @Input() providerId: string;
 
-    @Input() providerId: string;
-
-    async deleteUsers() {
-        const request = new ProviderUserBulkRequest(this.users.map(user => user.id));
-        return await this.apiService.deleteManyProviderUsers(this.providerId, request);
-    }
+  async deleteUsers() {
+    const request = new ProviderUserBulkRequest(this.users.map((user) => user.id));
+    return await this.apiService.deleteManyProviderUsers(this.providerId, request);
+  }
 }

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

@@ -1,68 +1,107 @@
 <div class="page-header d-flex">
-    <h1>{{'eventLogs' | i18n}}</h1>
-    <div class="ml-auto d-flex">
-        <div class="form-inline">
-            <label class="sr-only" for="start">{{'startDate' | i18n}}</label>
-            <input type="datetime-local" class="form-control form-control-sm" id="start"
-                placeholder="{{'startDate' | i18n}}" [(ngModel)]="start" placeholder="YYYY-MM-DDTHH:MM"
-                (change)="dirtyDates = true">
-            <span class="mx-2">-</span>
-            <label class="sr-only" for="end">{{'endDate' | i18n}}</label>
-            <input type="datetime-local" class="form-control form-control-sm" id="end"
-                placeholder="{{'endDate' | i18n}}" [(ngModel)]="end" placeholder="YYYY-MM-DDTHH:MM"
-                (change)="dirtyDates = true">
-        </div>
-        <form #refreshForm [appApiAction]="refreshPromise" class="d-inline">
-            <button type="button" class="btn btn-sm btn-outline-primary ml-3" (click)="loadEvents(true)"
-                [disabled]="loaded && refreshForm.loading">
-                <i class="fa fa-refresh fa-fw" aria-hidden="true" [ngClass]="{'fa-spin': loaded && refreshForm.loading}"></i>
-                {{'refresh' | i18n}}
-            </button>
-        </form>
-        <form #exportForm [appApiAction]="exportPromise" class="d-inline">
-            <button type="button" class="btn btn-sm btn-outline-primary btn-submit manual ml-3"
-                [ngClass]="{loading:exportForm.loading}" (click)="exportEvents()"
-                [disabled]="loaded && exportForm.loading || dirtyDates">
-                <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
-                <span>{{'export' | i18n}}</span>
-            </button>
-        </form>
+  <h1>{{ "eventLogs" | i18n }}</h1>
+  <div class="ml-auto d-flex">
+    <div class="form-inline">
+      <label class="sr-only" for="start">{{ "startDate" | i18n }}</label>
+      <input
+        type="datetime-local"
+        class="form-control form-control-sm"
+        id="start"
+        placeholder="{{ 'startDate' | i18n }}"
+        [(ngModel)]="start"
+        placeholder="YYYY-MM-DDTHH:MM"
+        (change)="dirtyDates = true"
+      />
+      <span class="mx-2">-</span>
+      <label class="sr-only" for="end">{{ "endDate" | i18n }}</label>
+      <input
+        type="datetime-local"
+        class="form-control form-control-sm"
+        id="end"
+        placeholder="{{ 'endDate' | i18n }}"
+        [(ngModel)]="end"
+        placeholder="YYYY-MM-DDTHH:MM"
+        (change)="dirtyDates = true"
+      />
     </div>
+    <form #refreshForm [appApiAction]="refreshPromise" class="d-inline">
+      <button
+        type="button"
+        class="btn btn-sm btn-outline-primary ml-3"
+        (click)="loadEvents(true)"
+        [disabled]="loaded && refreshForm.loading"
+      >
+        <i
+          class="bwi bwi-refresh bwi-fw"
+          aria-hidden="true"
+          [ngClass]="{ 'bwi-spin': loaded && refreshForm.loading }"
+        ></i>
+        {{ "refresh" | i18n }}
+      </button>
+    </form>
+    <form #exportForm [appApiAction]="exportPromise" class="d-inline">
+      <button
+        type="button"
+        class="btn btn-sm btn-outline-primary btn-submit manual ml-3"
+        [ngClass]="{ loading: exportForm.loading }"
+        (click)="exportEvents()"
+        [disabled]="(loaded && exportForm.loading) || dirtyDates"
+      >
+        <i class="bwi bwi-spinner bwi-spin" aria-hidden="true"></i>
+        <span>{{ "export" | i18n }}</span>
+      </button>
+    </form>
+  </div>
 </div>
 <ng-container *ngIf="!loaded">
-    <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}" aria-hidden="true"></i>
-    <span class="sr-only">{{'loading' | i18n}}</span>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
+  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container *ngIf="loaded">
-    <p *ngIf="!events || !events.length">{{'noEventsInList' | i18n}}</p>
-    <table class="table table-hover" *ngIf="events && events.length">
-        <thead>
-            <tr>
-                <th class="border-top-0" width="210">{{'timestamp' | i18n}}</th>
-                <th class="border-top-0" width="40">
-                    <span class="sr-only">{{'device' | i18n}}</span>
-                </th>
-                <th class="border-top-0" width="150">{{'user' | i18n}}</th>
-                <th class="border-top-0">{{'event' | i18n}}</th>
-            </tr>
-        </thead>
-        <tbody>
-            <tr *ngFor="let e of events">
-                <td>{{e.date | date:'medium'}}</td>
-                <td>
-                    <i class="text-muted fa fa-lg {{e.appIcon}}" title="{{e.appName}}, {{e.ip}}" aria-hidden="true"></i>
-                    <span class="sr-only">{{e.appName}}, {{e.ip}}</span>
-                </td>
-                <td>
-                    <span title="{{e.userEmail}}">{{e.userName}}</span>
-                </td>
-                <td [innerHTML]="e.message"></td>
-            </tr>
-        </tbody>
-    </table>
-    <button #moreBtn [appApiAction]="morePromise" type="button" class="btn btn-block btn-link btn-submit"
-        (click)="loadEvents(false)" [disabled]="loaded && moreBtn.loading" *ngIf="continuationToken">
-        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
-        <span>{{'loadMore' | i18n}}</span>
-    </button>
+  <p *ngIf="!events || !events.length">{{ "noEventsInList" | i18n }}</p>
+  <table class="table table-hover" *ngIf="events && events.length">
+    <thead>
+      <tr>
+        <th class="border-top-0" width="210">{{ "timestamp" | i18n }}</th>
+        <th class="border-top-0" width="40">
+          <span class="sr-only">{{ "device" | i18n }}</span>
+        </th>
+        <th class="border-top-0" width="150">{{ "user" | i18n }}</th>
+        <th class="border-top-0">{{ "event" | i18n }}</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr *ngFor="let e of events">
+        <td>{{ e.date | date: "medium" }}</td>
+        <td>
+          <i
+            class="text-muted bwi bwi-lg {{ e.appIcon }}"
+            title="{{ e.appName }}, {{ e.ip }}"
+            aria-hidden="true"
+          ></i>
+          <span class="sr-only">{{ e.appName }}, {{ e.ip }}</span>
+        </td>
+        <td>
+          <span title="{{ e.userEmail }}">{{ e.userName }}</span>
+        </td>
+        <td [innerHTML]="e.message"></td>
+      </tr>
+    </tbody>
+  </table>
+  <button
+    #moreBtn
+    [appApiAction]="morePromise"
+    type="button"
+    class="btn btn-block btn-link btn-submit"
+    (click)="loadEvents(false)"
+    [disabled]="loaded && moreBtn.loading"
+    *ngIf="continuationToken"
+  >
+    <i class="bwi bwi-spinner bwi-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,71 +1,79 @@
-import {
-    Component,
-    OnInit,
-} from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ToasterService } from 'angular2-toaster';
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
 
-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 { UserService } from 'jslib-common/abstractions/user.service';
+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 { EventResponse } from "jslib-common/models/response/eventResponse";
 
-import { UserNamePipe } from 'jslib-angular/pipes/user-name.pipe';
-
-import { EventResponse } from 'jslib-common/models/response/eventResponse';
-
-import { EventService } from 'src/app/services/event.service';
-
-import { BaseEventsComponent } from 'src/app/common/base.events.component';
+import { BaseEventsComponent } from "src/app/common/base.events.component";
+import { EventService } from "src/app/services/event.service";
 
 @Component({
-    selector: 'provider-events',
-    templateUrl: 'events.component.html',
+  selector: "provider-events",
+  templateUrl: "events.component.html",
 })
 export class EventsComponent extends BaseEventsComponent implements OnInit {
-    exportFileName: string = 'provider-events';
-    providerId: string;
+  exportFileName = "provider-events";
+  providerId: string;
 
-    private providerUsersUserIdMap = new Map<string, any>();
-    private providerUsersIdMap = new Map<string, any>();
+  private providerUsersUserIdMap = new Map<string, any>();
+  private providerUsersIdMap = new Map<string, any>();
 
-    constructor(private apiService: ApiService, private route: ActivatedRoute, eventService: EventService,
-        i18nService: I18nService, toasterService: ToasterService, private userService: UserService,
-        exportService: ExportService, platformUtilsService: PlatformUtilsService, private router: Router,
-        logService: LogService, private userNamePipe: UserNamePipe) {
-        super(eventService, i18nService, toasterService, exportService, platformUtilsService, logService);
-    }
+  constructor(
+    private apiService: ApiService,
+    private route: ActivatedRoute,
+    eventService: EventService,
+    i18nService: I18nService,
+    private providerService: ProviderService,
+    exportService: ExportService,
+    platformUtilsService: PlatformUtilsService,
+    private router: Router,
+    logService: LogService,
+    private userNamePipe: UserNamePipe
+  ) {
+    super(eventService, i18nService, exportService, platformUtilsService, logService);
+  }
 
-    async ngOnInit() {
-        this.route.parent.parent.params.subscribe(async params => {
-            this.providerId = params.providerId;
-            const provider = await this.userService.getProvider(this.providerId);
-            if (provider == null || !provider.useEvents) {
-                this.router.navigate(['/providers', this.providerId]);
-                return;
-            }
-            await this.load();
-        });
-    }
+  async ngOnInit() {
+    this.route.parent.parent.params.subscribe(async (params) => {
+      this.providerId = params.providerId;
+      const provider = await this.providerService.get(this.providerId);
+      if (provider == null || !provider.useEvents) {
+        this.router.navigate(["/providers", this.providerId]);
+        return;
+      }
+      await this.load();
+    });
+  }
 
-    async load() {
-        const response = await this.apiService.getProviderUsers(this.providerId);
-        response.data.forEach(u => {
-            const name = this.userNamePipe.transform(u);
-            this.providerUsersIdMap.set(u.id, { name: name, email: u.email });
-            this.providerUsersUserIdMap.set(u.userId, { name: name, email: u.email });
-        });
-        await this.loadEvents(true);
-        this.loaded = true;
-    }
+  async load() {
+    const response = await this.apiService.getProviderUsers(this.providerId);
+    response.data.forEach((u) => {
+      const name = this.userNamePipe.transform(u);
+      this.providerUsersIdMap.set(u.id, { name: name, email: u.email });
+      this.providerUsersUserIdMap.set(u.userId, { name: name, email: u.email });
+    });
+    await this.loadEvents(true);
+    this.loaded = true;
+  }
 
-    protected requestEvents(startDate: string, endDate: string, continuationToken: string) {
-        return this.apiService.getEventsProvider(this.providerId, startDate, endDate, continuationToken);
-    }
+  protected requestEvents(startDate: string, endDate: string, continuationToken: string) {
+    return this.apiService.getEventsProvider(
+      this.providerId,
+      startDate,
+      endDate,
+      continuationToken
+    );
+  }
 
-    protected getUserName(r: EventResponse, userId: string) {
-        return userId != null && this.providerUsersUserIdMap.has(userId) ? this.providerUsersUserIdMap.get(userId) : null;
-    }
+  protected getUserName(r: EventResponse, userId: string) {
+    return userId != null && this.providerUsersUserIdMap.has(userId)
+      ? this.providerUsersUserIdMap.get(userId)
+      : null;
+  }
 }

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

@@ -1,22 +1,30 @@
 <div class="container page-content">
-    <div class="row">
-        <div class="col-3">
-            <div class="card" *ngIf="provider">
-                <div class="card-header">{{'manage' | i18n}}</div>
-                <div class="list-group list-group-flush">
-                    <a routerLink="people" class="list-group-item" routerLinkActive="active"
-                        *ngIf="provider.canManageUsers">
-                        {{'people' | i18n}}
-                    </a>
-                    <a routerLink="events" class="list-group-item" routerLinkActive="active"
-                        *ngIf="provider.canAccessEventLogs && accessEvents">
-                        {{'eventLogs' | i18n}}
-                    </a>
-                </div>
-            </div>
-        </div>
-        <div class="col-9">
-            <router-outlet></router-outlet>
+  <div class="row">
+    <div class="col-3">
+      <div class="card" *ngIf="provider">
+        <div class="card-header">{{ "manage" | i18n }}</div>
+        <div class="list-group list-group-flush">
+          <a
+            routerLink="people"
+            class="list-group-item"
+            routerLinkActive="active"
+            *ngIf="provider.canManageUsers"
+          >
+            {{ "people" | i18n }}
+          </a>
+          <a
+            routerLink="events"
+            class="list-group-item"
+            routerLinkActive="active"
+            *ngIf="provider.canAccessEventLogs && accessEvents"
+          >
+            {{ "eventLogs" | i18n }}
+          </a>
         </div>
+      </div>
     </div>
+    <div class="col-9">
+      <router-outlet></router-outlet>
+    </div>
+  </div>
 </div>

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

@@ -1,27 +1,23 @@
-import {
-    Component,
-    OnInit,
-} from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
 
-import { UserService } from 'jslib-common/abstractions/user.service';
-
-import { Provider } from 'jslib-common/models/domain/provider';
+import { ProviderService } from "jslib-common/abstractions/provider.service";
+import { Provider } from "jslib-common/models/domain/provider";
 
 @Component({
-    selector: 'provider-manage',
-    templateUrl: 'manage.component.html',
+  selector: "provider-manage",
+  templateUrl: "manage.component.html",
 })
 export class ManageComponent implements OnInit {
-    provider: Provider;
-    accessEvents = false;
+  provider: Provider;
+  accessEvents = false;
 
-    constructor(private route: ActivatedRoute, private userService: UserService) { }
+  constructor(private route: ActivatedRoute, private providerService: ProviderService) {}
 
-    ngOnInit() {
-        this.route.parent.params.subscribe(async params => {
-            this.provider = await this.userService.getProvider(params.providerId);
-            this.accessEvents = this.provider.useEvents;
-        });
-    }
+  ngOnInit() {
+    this.route.parent.params.subscribe(async (params) => {
+      this.provider = await this.providerService.get(params.providerId);
+      this.accessEvents = this.provider.useEvents;
+    });
+  }
 }

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

@@ -1,145 +1,229 @@
 <div class="page-header d-flex">
-    <h1>{{'people' | i18n}}</h1>
-    <div class="ml-auto d-flex">
-        <div class="btn-group btn-group-sm" role="group">
-            <button type="button" class="btn btn-outline-secondary" [ngClass]="{active: status == null}"
-                (click)="filter(null)">
-                {{'all' | i18n}}
-                <span class="badge badge-pill badge-info" *ngIf="allCount">{{allCount}}</span>
-            </button>
-            <button type="button" class="btn btn-outline-secondary"
-                [ngClass]="{active: status == userStatusType.Invited}"
-                (click)="filter(userStatusType.Invited)">
-                {{'invited' | i18n}}
-                <span class="badge badge-pill badge-info" *ngIf="invitedCount">{{invitedCount}}</span>
-            </button>
-            <button type="button" class="btn btn-outline-secondary"
-                [ngClass]="{active: status == userStatusType.Accepted}"
-                (click)="filter(userStatusType.Accepted)">
-                {{'accepted' | i18n}}
-                <span class="badge badge-pill badge-warning" *ngIf="acceptedCount">{{acceptedCount}}</span>
-            </button>
-        </div>
-        <div class="ml-3">
-            <label class="sr-only" for="search">{{'search' | i18n}}</label>
-            <input type="search" class="form-control form-control-sm" id="search" placeholder="{{'search' | i18n}}"
-                [(ngModel)]="searchText">
-        </div>
-        <div class="dropdown ml-3" appListDropdown>
-            <button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" id="bulkActionsButton"
-                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" appA11yTitle="{{'options' | i18n}}">
-                <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="fa fa-fw fa-envelope-o" aria-hidden="true"></i>
-                    {{'reinviteSelected' | i18n}}
-                </button>
-                <button class="dropdown-item text-success" appStopClick (click)="bulkConfirm()"
-                    *ngIf="showBulkConfirmUsers">
-                    <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="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="fa fa-fw fa-check-square-o" aria-hidden="true"></i>
-                    {{'selectAll' | i18n}}
-                </button>
-                <button class="dropdown-item" appStopClick (click)="selectAll(false)">
-                    <i class="fa fa-fw fa-minus-square-o" aria-hidden="true"></i>
-                    {{'unselectAll' | i18n}}
-                </button>
-            </div>
-        </div>        
-        <button type="button" class="btn btn-sm btn-outline-primary ml-3" (click)="invite()">
-            <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
-            {{'inviteUser' | i18n}}
-        </button>
+  <h1>{{ "people" | i18n }}</h1>
+  <div class="ml-auto d-flex">
+    <div class="btn-group btn-group-sm" role="group">
+      <button
+        type="button"
+        class="btn btn-outline-secondary"
+        [ngClass]="{ active: status == null }"
+        (click)="filter(null)"
+      >
+        {{ "all" | i18n }}
+        <span class="badge badge-pill badge-info" *ngIf="allCount">{{ allCount }}</span>
+      </button>
+      <button
+        type="button"
+        class="btn btn-outline-secondary"
+        [ngClass]="{ active: status == userStatusType.Invited }"
+        (click)="filter(userStatusType.Invited)"
+      >
+        {{ "invited" | i18n }}
+        <span class="badge badge-pill badge-info" *ngIf="invitedCount">{{ invitedCount }}</span>
+      </button>
+      <button
+        type="button"
+        class="btn btn-outline-secondary"
+        [ngClass]="{ active: status == userStatusType.Accepted }"
+        (click)="filter(userStatusType.Accepted)"
+      >
+        {{ "accepted" | i18n }}
+        <span class="badge badge-pill badge-warning" *ngIf="acceptedCount">{{
+          acceptedCount
+        }}</span>
+      </button>
     </div>
+    <div class="ml-3">
+      <label class="sr-only" for="search">{{ "search" | i18n }}</label>
+      <input
+        type="search"
+        class="form-control form-control-sm"
+        id="search"
+        placeholder="{{ 'search' | i18n }}"
+        [(ngModel)]="searchText"
+      />
+    </div>
+    <div class="dropdown ml-3" appListDropdown>
+      <button
+        class="btn btn-sm btn-outline-secondary dropdown-toggle"
+        type="button"
+        id="bulkActionsButton"
+        data-toggle="dropdown"
+        aria-haspopup="true"
+        aria-expanded="false"
+        appA11yTitle="{{ 'options' | i18n }}"
+      >
+        <i class="bwi bwi-cog" aria-hidden="true"></i>
+      </button>
+      <div class="dropdown-menu dropdown-menu-right" aria-labelledby="bulkActionsButton">
+        <button class="dropdown-item" appStopClick (click)="bulkReinvite()">
+          <i class="bwi bwi-fw bwi-envelope" aria-hidden="true"></i>
+          {{ "reinviteSelected" | i18n }}
+        </button>
+        <button
+          class="dropdown-item text-success"
+          appStopClick
+          (click)="bulkConfirm()"
+          *ngIf="showBulkConfirmUsers"
+        >
+          <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
+          {{ "confirmSelected" | i18n }}
+        </button>
+        <button class="dropdown-item text-danger" appStopClick (click)="bulkRemove()">
+          <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
+          {{ "remove" | i18n }}
+        </button>
+        <div class="dropdown-divider"></div>
+        <button class="dropdown-item" appStopClick (click)="selectAll(true)">
+          <i class="bwi bwi-fw bwi-check-square" 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>
+          {{ "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>
+      {{ "inviteUser" | i18n }}
+    </button>
+  </div>
 </div>
 <ng-container *ngIf="loading">
-    <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}" aria-hidden="true"></i>
-    <span class="sr-only">{{'loading' | i18n}}</span>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
+  <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container
-    *ngIf="!loading && (isPaging() ? pagedUsers : users | search:searchText:'name':'email':'id') as searchedUsers">
-    <p *ngIf="!searchedUsers.length">{{'noUsersInList' | i18n}}</p>
-    <ng-container *ngIf="searchedUsers.length">
-        <app-callout type="info" title="{{'confirmUsers' | i18n}}" icon="fa-check-circle" *ngIf="showConfirmUsers">
-            {{'providerUsersNeedConfirmed' | i18n}}
-        </app-callout>
-        <table class="table table-hover table-list" infiniteScroll [infiniteScrollDistance]="1"
-            [infiniteScrollDisabled]="!isPaging()" (scrolled)="loadMore()">
-            <tbody>
-                <tr *ngFor="let u of searchedUsers">
-                    <td (click)="checkUser(u)" class="table-list-checkbox">
-                        <input type="checkbox" [(ngModel)]="u.checked" appStopProp>
-                    </td>
-                    <td width="30">
-                        <app-avatar [data]="u | userName" [email]="u.email" size="25" [circle]="true"
-                            [fontSize]="14"></app-avatar>
-                    </td>
-                    <td>
-                        <a href="#" appStopClick (click)="edit(u)">{{u.email}}</a>
-                        <span class="badge badge-secondary"
-                            *ngIf="u.status === userStatusType.Invited">{{'invited' | i18n}}</span>
-                        <span class="badge badge-warning"
-                            *ngIf="u.status === userStatusType.Accepted">{{'accepted' | i18n}}</span>
-                        <small class="text-muted d-block" *ngIf="u.name">{{u.name}}</small>
-                    </td>
-                    <td>
-                        <ng-container *ngIf="u.twoFactorEnabled">
-                            <i class="fa fa-lock" title="{{'userUsingTwoStep' | i18n}}" aria-hidden="true"></i>
-                            <span class="sr-only">{{'userUsingTwoStep' | i18n}}</span>
-                        </ng-container>
-                    </td>
-                    <td>
-                        <span *ngIf="u.type === userType.ProviderAdmin">{{'providerAdmin' | i18n}}</span>
-                        <span *ngIf="u.type === userType.ServiceUser">{{'serviceUser' | i18n}}</span>
-                        <span *ngIf="u.type === userType.Custom">{{'custom' | i18n}}</span>
-                    </td>
-                    <td class="table-list-options">
-                        <div class="dropdown" appListDropdown>
-                            <button class="btn btn-outline-secondary dropdown-toggle" type="button"
-                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
-                                appA11yTitle="{{'options' | i18n}}">
-                                <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
-                            </button>
-                            <div class="dropdown-menu dropdown-menu-right">
-                                <a class="dropdown-item" href="#" appStopClick (click)="reinvite(u)"
-                                    *ngIf="u.status === userStatusType.Invited">
-                                    <i class="fa fa-fw fa-envelope-o" aria-hidden="true"></i>
-                                    {{'resendInvitation' | i18n}}
-                                </a>
-                                <a class="dropdown-item text-success" href="#" appStopClick (click)="confirm(u)"
-                                    *ngIf="u.status === userStatusType.Accepted">
-                                    <i class="fa fa-fw fa-check" aria-hidden="true"></i>
-                                    {{'confirm' | i18n}}
-                                </a>
-                                <a class="dropdown-item" href="#" appStopClick (click)="groups(u)" *ngIf="accessGroups">
-                                    <i class="fa fa-fw fa-sitemap" aria-hidden="true"></i>
-                                    {{'groups' | i18n}}
-                                </a>
-                                <a class="dropdown-item" href="#" appStopClick (click)="events(u)"
-                                    *ngIf="accessEvents && u.status === userStatusType.Confirmed">
-                                    <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="fa fa-fw fa-remove" aria-hidden="true"></i>
-                                    {{'remove' | i18n}}
-                                </a>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </ng-container>
+  *ngIf="
+    !loading &&
+    (isPaging() ? pagedUsers : (users | search: searchText:'name':'email':'id')) as searchedUsers
+  "
+>
+  <p *ngIf="!searchedUsers.length">{{ "noUsersInList" | i18n }}</p>
+  <ng-container *ngIf="searchedUsers.length">
+    <app-callout
+      type="info"
+      title="{{ 'confirmUsers' | i18n }}"
+      icon="bwi bwi-check-circle"
+      *ngIf="showConfirmUsers"
+    >
+      {{ "providerUsersNeedConfirmed" | i18n }}
+    </app-callout>
+    <table
+      class="table table-hover table-list"
+      infiniteScroll
+      [infiniteScrollDistance]="1"
+      [infiniteScrollDisabled]="!isPaging()"
+      (scrolled)="loadMore()"
+    >
+      <tbody>
+        <tr *ngFor="let u of searchedUsers">
+          <td (click)="checkUser(u)" class="table-list-checkbox">
+            <input type="checkbox" [(ngModel)]="u.checked" appStopProp />
+          </td>
+          <td width="30">
+            <app-avatar
+              [data]="u | userName"
+              [email]="u.email"
+              size="25"
+              [circle]="true"
+              [fontSize]="14"
+            >
+            </app-avatar>
+          </td>
+          <td>
+            <a href="#" appStopClick (click)="edit(u)">{{ u.email }}</a>
+            <span class="badge badge-secondary" *ngIf="u.status === userStatusType.Invited">{{
+              "invited" | i18n
+            }}</span>
+            <span class="badge badge-warning" *ngIf="u.status === userStatusType.Accepted">{{
+              "accepted" | i18n
+            }}</span>
+            <small class="text-muted d-block" *ngIf="u.name">{{ u.name }}</small>
+          </td>
+          <td>
+            <ng-container *ngIf="u.twoFactorEnabled">
+              <i
+                class="bwi bwi-lock"
+                title="{{ 'userUsingTwoStep' | i18n }}"
+                aria-hidden="true"
+              ></i>
+              <span class="sr-only">{{ "userUsingTwoStep" | i18n }}</span>
+            </ng-container>
+          </td>
+          <td>
+            <span *ngIf="u.type === userType.ProviderAdmin">{{ "providerAdmin" | i18n }}</span>
+            <span *ngIf="u.type === userType.ServiceUser">{{ "serviceUser" | i18n }}</span>
+            <span *ngIf="u.type === userType.Custom">{{ "custom" | i18n }}</span>
+          </td>
+          <td class="table-list-options">
+            <div class="dropdown" appListDropdown>
+              <button
+                class="btn btn-outline-secondary dropdown-toggle"
+                type="button"
+                data-toggle="dropdown"
+                aria-haspopup="true"
+                aria-expanded="false"
+                appA11yTitle="{{ 'options' | i18n }}"
+              >
+                <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
+              </button>
+              <div class="dropdown-menu dropdown-menu-right">
+                <a
+                  class="dropdown-item"
+                  href="#"
+                  appStopClick
+                  (click)="reinvite(u)"
+                  *ngIf="u.status === userStatusType.Invited"
+                >
+                  <i class="bwi bwi-fw bwi-envelope" aria-hidden="true"></i>
+                  {{ "resendInvitation" | i18n }}
+                </a>
+                <a
+                  class="dropdown-item text-success"
+                  href="#"
+                  appStopClick
+                  (click)="confirm(u)"
+                  *ngIf="u.status === userStatusType.Accepted"
+                >
+                  <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
+                  {{ "confirm" | i18n }}
+                </a>
+                <a
+                  class="dropdown-item"
+                  href="#"
+                  appStopClick
+                  (click)="groups(u)"
+                  *ngIf="accessGroups"
+                >
+                  <i class="bwi bwi-fw bwi-sitemap" aria-hidden="true"></i>
+                  {{ "groups" | i18n }}
+                </a>
+                <a
+                  class="dropdown-item"
+                  href="#"
+                  appStopClick
+                  (click)="events(u)"
+                  *ngIf="accessEvents && u.status === userStatusType.Confirmed"
+                >
+                  <i class="bwi bwi-fw bwi-file-text" aria-hidden="true"></i>
+                  {{ "eventLogs" | i18n }}
+                </a>
+                <a class="dropdown-item text-danger" href="#" appStopClick (click)="remove(u)">
+                  <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
+                  {{ "remove" | i18n }}
+                </a>
+              </div>
+            </div>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </ng-container>
 </ng-container>
 <ng-template #addEdit></ng-template>
 <ng-template #eventsTemplate></ng-template>

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

@@ -1,238 +1,284 @@
-import {
-    Component,
-    OnInit,
-    ViewChild,
-    ViewContainerRef
-} from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ToasterService } from 'angular2-toaster';
+import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { first } from "rxjs/operators";
 
-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 { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
-import { SearchService } from 'jslib-common/abstractions/search.service';
-import { StorageService } from 'jslib-common/abstractions/storage.service';
-import { UserService } from 'jslib-common/abstractions/user.service';
+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";
+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 { SearchService } from "jslib-common/abstractions/search.service";
+import { StateService } from "jslib-common/abstractions/state.service";
+import { ProviderUserStatusType } from "jslib-common/enums/providerUserStatusType";
+import { ProviderUserType } from "jslib-common/enums/providerUserType";
+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 { ModalService } from 'jslib-angular/services/modal.service';
-import { ValidationService } from 'jslib-angular/services/validation.service';
+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 { 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 { ProviderUserBulkResponse } from 'jslib-common/models/response/provider/providerUserBulkResponse';
-
-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';
+import { BulkConfirmComponent } from "./bulk/bulk-confirm.component";
+import { BulkRemoveComponent } from "./bulk/bulk-remove.component";
+import { UserAddEditComponent } from "./user-add-edit.component";
 
 @Component({
-    selector: 'provider-people',
-    templateUrl: 'people.component.html',
+  selector: "provider-people",
+  templateUrl: "people.component.html",
 })
-export class PeopleComponent extends BasePeopleComponent<ProviderUserUserDetailsResponse> implements OnInit {
+export class PeopleComponent
+  extends BasePeopleComponent<ProviderUserUserDetailsResponse>
+  implements OnInit
+{
+  @ViewChild("addEdit", { read: ViewContainerRef, static: true }) addEditModalRef: ViewContainerRef;
+  @ViewChild("groupsTemplate", { read: ViewContainerRef, static: true })
+  groupsModalRef: ViewContainerRef;
+  @ViewChild("eventsTemplate", { read: ViewContainerRef, static: true })
+  eventsModalRef: ViewContainerRef;
+  @ViewChild("bulkStatusTemplate", { read: ViewContainerRef, static: true })
+  bulkStatusModalRef: ViewContainerRef;
+  @ViewChild("bulkConfirmTemplate", { read: ViewContainerRef, static: true })
+  bulkConfirmModalRef: ViewContainerRef;
+  @ViewChild("bulkRemoveTemplate", { read: ViewContainerRef, static: true })
+  bulkRemoveModalRef: ViewContainerRef;
 
-    @ViewChild('addEdit', { read: ViewContainerRef, static: true }) addEditModalRef: ViewContainerRef;
-    @ViewChild('groupsTemplate', { read: ViewContainerRef, static: true }) groupsModalRef: ViewContainerRef;
-    @ViewChild('eventsTemplate', { read: ViewContainerRef, static: true }) eventsModalRef: ViewContainerRef;
-    @ViewChild('bulkStatusTemplate', { read: ViewContainerRef, static: true }) bulkStatusModalRef: ViewContainerRef;
-    @ViewChild('bulkConfirmTemplate', { read: ViewContainerRef, static: true }) bulkConfirmModalRef: ViewContainerRef;
-    @ViewChild('bulkRemoveTemplate', { read: ViewContainerRef, static: true }) bulkRemoveModalRef: ViewContainerRef;
+  userType = ProviderUserType;
+  userStatusType = ProviderUserStatusType;
+  providerId: string;
+  accessEvents = false;
 
-    userType = ProviderUserType;
-    userStatusType = ProviderUserStatusType;
-    providerId: string;
-    accessEvents = false;
+  constructor(
+    apiService: ApiService,
+    private route: ActivatedRoute,
+    i18nService: I18nService,
+    modalService: ModalService,
+    platformUtilsService: PlatformUtilsService,
+    cryptoService: CryptoService,
+    private router: Router,
+    searchService: SearchService,
+    validationService: ValidationService,
+    logService: LogService,
+    searchPipe: SearchPipe,
+    userNamePipe: UserNamePipe,
+    stateService: StateService,
+    private providerService: ProviderService
+  ) {
+    super(
+      apiService,
+      searchService,
+      i18nService,
+      platformUtilsService,
+      cryptoService,
+      validationService,
+      modalService,
+      logService,
+      searchPipe,
+      userNamePipe,
+      stateService
+    );
+  }
 
-    constructor(apiService: ApiService, private route: ActivatedRoute,
-        i18nService: I18nService, modalService: ModalService,
-        platformUtilsService: PlatformUtilsService, toasterService: ToasterService,
-        cryptoService: CryptoService, private userService: UserService, private router: Router,
-        storageService: StorageService, searchService: SearchService, validationService: ValidationService,
-        logService: LogService, searchPipe: SearchPipe, userNamePipe: UserNamePipe) {
-        super(apiService, searchService, i18nService, platformUtilsService, toasterService, cryptoService,
-            storageService, validationService, modalService, logService, searchPipe, userNamePipe);
-    }
+  ngOnInit() {
+    this.route.parent.params.subscribe(async (params) => {
+      this.providerId = params.providerId;
+      const provider = await this.providerService.get(this.providerId);
 
-    ngOnInit() {
-        this.route.parent.params.subscribe(async params => {
-            this.providerId = params.providerId;
-            const provider = await this.userService.getProvider(this.providerId);
+      if (!provider.canManageUsers) {
+        this.router.navigate(["../"], { relativeTo: this.route });
+        return;
+      }
 
-            if (!provider.canManageUsers) {
-                this.router.navigate(['../'], { relativeTo: this.route });
-                return;
-            }
+      this.accessEvents = provider.useEvents;
 
-            this.accessEvents = provider.useEvents;
+      await this.load();
 
-            await this.load();
-
-            const queryParamsSub = this.route.queryParams.subscribe(async qParams => {
-                this.searchText = qParams.search;
-                if (qParams.viewEvents != null) {
-                    const user = this.users.filter(u => u.id === qParams.viewEvents);
-                    if (user.length > 0 && user[0].status === ProviderUserStatusType.Confirmed) {
-                        this.events(user[0]);
-                    }
-                }
-                if (queryParamsSub != null) {
-                    queryParamsSub.unsubscribe();
-                }
-            });
-        });
-    }
-
-    getUsers(): Promise<ListResponse<ProviderUserUserDetailsResponse>> {
-        return this.apiService.getProviderUsers(this.providerId);
-    }
-
-    deleteUser(id: string): Promise<any> {
-        return this.apiService.deleteProviderUser(this.providerId, id);
-    }
-
-    reinviteUser(id: string): Promise<any> {
-        return this.apiService.postProviderUserReinvite(this.providerId, id);
-    }
-
-    async confirmUser(user: ProviderUserUserDetailsResponse, publicKey: Uint8Array): Promise<any> {
-        const providerKey = await this.cryptoService.getProviderKey(this.providerId);
-        const key = await this.cryptoService.rsaEncrypt(providerKey.key, publicKey.buffer);
-        const request = new ProviderUserConfirmRequest();
-        request.key = key.encryptedString;
-        await this.apiService.postProviderUserConfirm(this.providerId, user.id, request);
-    }
-
-    async edit(user: ProviderUserUserDetailsResponse) {
-        const [modal] = await this.modalService.openViewRef(UserAddEditComponent, this.addEditModalRef, comp => {
-            comp.name = this.userNamePipe.transform(user);
-            comp.providerId = this.providerId;
-            comp.providerUserId = user != null ? user.id : null;
-            comp.onSavedUser.subscribe(() => {
-                modal.close();
-                this.load();
-            });
-            comp.onDeletedUser.subscribe(() => {
-                modal.close();
-                this.removeUser(user);
-            });
-        });
-    }
-
-    async events(user: ProviderUserUserDetailsResponse) {
-        const [modal] = await this.modalService.openViewRef(EntityEventsComponent, this.eventsModalRef, comp => {
-            comp.name = this.userNamePipe.transform(user);
-            comp.providerId = this.providerId;
-            comp.entityId = user.id;
-            comp.showUser = false;
-            comp.entity = 'user';
-        });
-    }
-
-    async bulkRemove() {
-        if (this.actionPromise != null) {
-            return;
+      this.route.queryParams.pipe(first()).subscribe(async (qParams) => {
+        this.searchText = qParams.search;
+        if (qParams.viewEvents != null) {
+          const user = this.users.filter((u) => u.id === qParams.viewEvents);
+          if (user.length > 0 && user[0].status === ProviderUserStatusType.Confirmed) {
+            this.events(user[0]);
+          }
         }
+      });
+    });
+  }
 
-        const [modal] = await this.modalService.openViewRef(BulkRemoveComponent, this.bulkRemoveModalRef, comp => {
-            comp.providerId = this.providerId;
-            comp.users = this.getCheckedUsers();
+  getUsers(): Promise<ListResponse<ProviderUserUserDetailsResponse>> {
+    return this.apiService.getProviderUsers(this.providerId);
+  }
+
+  deleteUser(id: string): Promise<any> {
+    return this.apiService.deleteProviderUser(this.providerId, id);
+  }
+
+  reinviteUser(id: string): Promise<any> {
+    return this.apiService.postProviderUserReinvite(this.providerId, id);
+  }
+
+  async confirmUser(user: ProviderUserUserDetailsResponse, publicKey: Uint8Array): Promise<any> {
+    const providerKey = await this.cryptoService.getProviderKey(this.providerId);
+    const key = await this.cryptoService.rsaEncrypt(providerKey.key, publicKey.buffer);
+    const request = new ProviderUserConfirmRequest();
+    request.key = key.encryptedString;
+    await this.apiService.postProviderUserConfirm(this.providerId, user.id, request);
+  }
+
+  async edit(user: ProviderUserUserDetailsResponse) {
+    const [modal] = await this.modalService.openViewRef(
+      UserAddEditComponent,
+      this.addEditModalRef,
+      (comp) => {
+        comp.name = this.userNamePipe.transform(user);
+        comp.providerId = this.providerId;
+        comp.providerUserId = user != null ? user.id : null;
+        comp.onSavedUser.subscribe(() => {
+          modal.close();
+          this.load();
         });
+        comp.onDeletedUser.subscribe(() => {
+          modal.close();
+          this.removeUser(user);
+        });
+      }
+    );
+  }
 
-        await modal.onClosedPromise();
-        await this.load();
+  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";
+    });
+  }
+
+  async bulkRemove() {
+    if (this.actionPromise != null) {
+      return;
     }
 
-    async bulkReinvite() {
-        if (this.actionPromise != null) {
-            return;
-        }
+    const [modal] = await this.modalService.openViewRef(
+      BulkRemoveComponent,
+      this.bulkRemoveModalRef,
+      (comp) => {
+        comp.providerId = this.providerId;
+        comp.users = this.getCheckedUsers();
+      }
+    );
 
-        const users = this.getCheckedUsers();
-        const filteredUsers = users.filter(u => u.status === ProviderUserStatusType.Invited);
+    await modal.onClosedPromise();
+    await this.load();
+  }
 
-        if (filteredUsers.length <= 0) {
-            this.toasterService.popAsync('error', this.i18nService.t('errorOccurred'),
-                this.i18nService.t('noSelectedUsersApplicable'));
-            return;
-        }
-
-        try {
-            const request = new ProviderUserBulkRequest(filteredUsers.map(user => user.id));
-            const response = this.apiService.postManyProviderUserReinvite(this.providerId, request);
-            this.showBulkStatus(users, filteredUsers, response, this.i18nService.t('bulkReinviteMessage'));
-        } catch (e) {
-            this.validationService.showError(e);
-        }
-        this.actionPromise = null;
+  async bulkReinvite() {
+    if (this.actionPromise != null) {
+      return;
     }
 
-    async bulkConfirm() {
-        if (this.actionPromise != null) {
-            return;
-        }
+    const users = this.getCheckedUsers();
+    const filteredUsers = users.filter((u) => u.status === ProviderUserStatusType.Invited);
 
-        const [modal] = await this.modalService.openViewRef(BulkConfirmComponent, this.bulkConfirmModalRef, comp => {
-            comp.providerId = this.providerId;
-            comp.users = this.getCheckedUsers();
-        });
-
-        await modal.onClosedPromise();
-        await this.load();
+    if (filteredUsers.length <= 0) {
+      this.platformUtilsService.showToast(
+        "error",
+        this.i18nService.t("errorOccurred"),
+        this.i18nService.t("noSelectedUsersApplicable")
+      );
+      return;
     }
 
-    private async showBulkStatus(users: ProviderUserUserDetailsResponse[], filteredUsers: ProviderUserUserDetailsResponse[],
-        request: Promise<ListResponse<ProviderUserBulkResponse>>, successfullMessage: string) {
-
-        const [modal, childComponent] = await this.modalService.openViewRef(BulkStatusComponent, this.bulkStatusModalRef, comp => {
-            comp.loading = true;
-        });
-
-        // Workaround to handle closing the modal shortly after it has been opened
-        let close = false;
-        modal.onShown.subscribe(() => {
-            if (close) {
-                modal.close();
-            }
-        });
-
-        try {
-            const response = await request;
-
-            if (modal) {
-                const keyedErrors: any = response.data.filter(r => r.error !== '').reduce((a, x) => ({ ...a, [x.id]: x.error }), {});
-                const keyedFilteredUsers: any = filteredUsers.reduce((a, x) => ({ ...a, [x.id]: x }), {});
-
-                childComponent.users = users.map(user => {
-                    let message = keyedErrors[user.id] ?? successfullMessage;
-                    if (!keyedFilteredUsers.hasOwnProperty(user.id)) {
-                        message = this.i18nService.t('bulkFilteredMessage');
-                    }
-
-                    return {
-                        user: user,
-                        error: keyedErrors.hasOwnProperty(user.id),
-                        message: message,
-                    };
-                });
-                childComponent.loading = false;
-            }
-        } catch {
-            close = true;
-            modal.close();
-        }
+    try {
+      const request = new ProviderUserBulkRequest(filteredUsers.map((user) => user.id));
+      const response = this.apiService.postManyProviderUserReinvite(this.providerId, request);
+      this.showBulkStatus(
+        users,
+        filteredUsers,
+        response,
+        this.i18nService.t("bulkReinviteMessage")
+      );
+    } catch (e) {
+      this.validationService.showError(e);
     }
+    this.actionPromise = null;
+  }
+
+  async bulkConfirm() {
+    if (this.actionPromise != null) {
+      return;
+    }
+
+    const [modal] = await this.modalService.openViewRef(
+      BulkConfirmComponent,
+      this.bulkConfirmModalRef,
+      (comp) => {
+        comp.providerId = this.providerId;
+        comp.users = this.getCheckedUsers();
+      }
+    );
+
+    await modal.onClosedPromise();
+    await this.load();
+  }
+
+  private async showBulkStatus(
+    users: ProviderUserUserDetailsResponse[],
+    filteredUsers: ProviderUserUserDetailsResponse[],
+    request: Promise<ListResponse<ProviderUserBulkResponse>>,
+    successfullMessage: string
+  ) {
+    const [modal, childComponent] = await this.modalService.openViewRef(
+      BulkStatusComponent,
+      this.bulkStatusModalRef,
+      (comp) => {
+        comp.loading = true;
+      }
+    );
+
+    // Workaround to handle closing the modal shortly after it has been opened
+    let close = false;
+    modal.onShown.subscribe(() => {
+      if (close) {
+        modal.close();
+      }
+    });
+
+    try {
+      const response = await request;
+
+      if (modal) {
+        const keyedErrors: any = response.data
+          .filter((r) => r.error !== "")
+          .reduce((a, x) => ({ ...a, [x.id]: x.error }), {});
+        const keyedFilteredUsers: any = filteredUsers.reduce((a, x) => ({ ...a, [x.id]: x }), {});
+
+        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
+            message: message,
+          };
+        });
+        childComponent.loading = false;
+      }
+    } catch {
+      close = true;
+      modal.close();
+    }
+  }
 }

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

@@ -1,71 +1,124 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="userAddEditTitle">
-    <div class="modal-dialog modal-dialog-scrollable modal-lg" role="document">
-        <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
-            <div class="modal-header">
-                <h2 class="modal-title" id="userAddEditTitle">
-                    {{title}}
-                    <small class="text-muted" *ngIf="name">{{name}}</small>
-                </h2>
-                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body" *ngIf="loading">
-                <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}" aria-hidden="true"></i>
-                <span class="sr-only">{{'loading' | i18n}}</span>
-            </div>
-            <div class="modal-body" *ngIf="!loading">
-                <ng-container *ngIf="!editMode">
-                    <p>{{'providerInviteUserDesc' | i18n}}</p>
-                    <div class="form-group mb-4">
-                        <label for="emails">{{'email' | i18n}}</label>
-                        <input id="emails" class="form-control" type="text" name="Emails" [(ngModel)]="emails" required
-                            appAutoFocus>
-                        <small class="text-muted">{{'inviteMultipleEmailDesc' | i18n : '20'}}</small>
-                    </div>
-                </ng-container>
-                <h3>
-                    {{'userType' | i18n}}
-                    <a target="_blank" rel="noopener" appA11yTitle="{{'learnMore' | i18n}}"
-                        href="https://bitwarden.com/help/article/user-types-access-control/#user-types">
-                        <i class="fa fa-question-circle-o" aria-hidden="true"></i>
-                    </a>
-                </h3>
-                <div class="form-check mt-2 form-check-block">
-                    <input class="form-check-input" type="radio" name="userType" id="userTypeServiceUser"
-                        [value]="userType.ServiceUser" [(ngModel)]="type">
-                    <label class="form-check-label" for="userTypeServiceUser">
-                        {{'serviceUser' | i18n}}
-                        <small>{{'serviceUserDesc' | i18n}}</small>
-                    </label>
-                </div>
-                <div class="form-check mt-2 form-check-block">
-                    <input class="form-check-input" type="radio" name="userType" id="userTypeProviderAdmin"
-                        [value]="userType.ProviderAdmin" [(ngModel)]="type">
-                    <label class="form-check-label" for="userTypeProviderAdmin">
-                        {{'providerAdmin' | i18n}}
-                        <small>{{'providerAdminDesc' | i18n}}</small>
-                    </label>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
-                    <span>{{'save' | i18n}}</span>
-                </button>
-                <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
-                    {{'cancel' | i18n}}
-                </button>
-                <div class="ml-auto">
-                    <button #deleteBtn type="button" (click)="delete()" class="btn btn-outline-danger"
-                        appA11yTitle="{{'delete' | i18n}}" *ngIf="editMode" [disabled]="deleteBtn.loading"
-                        [appApiAction]="deletePromise">
-                        <i class="fa fa-trash-o fa-lg fa-fw" [hidden]="deleteBtn.loading" aria-hidden="true"></i>
-                        <i class="fa fa-spinner fa-spin fa-lg fa-fw" [hidden]="!deleteBtn.loading"
-                            title="{{'loading' | i18n}}" aria-hidden="true"></i>
-                    </button>
-                </div>
-            </div>
-        </form>
-    </div>
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="userAddEditTitle">
+  <div class="modal-dialog modal-dialog-scrollable modal-lg" role="document">
+    <form
+      class="modal-content"
+      #form
+      (ngSubmit)="submit()"
+      [appApiAction]="formPromise"
+      ngNativeValidate
+    >
+      <div class="modal-header">
+        <h2 class="modal-title" id="userAddEditTitle">
+          {{ title }}
+          <small class="text-muted" *ngIf="name">{{ name }}</small>
+        </h2>
+        <button
+          type="button"
+          class="close"
+          data-dismiss="modal"
+          appA11yTitle="{{ 'close' | i18n }}"
+        >
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body" *ngIf="loading">
+        <i
+          class="bwi bwi-spinner bwi-spin text-muted"
+          title="{{ 'loading' | i18n }}"
+          aria-hidden="true"
+        ></i>
+        <span class="sr-only">{{ "loading" | i18n }}</span>
+      </div>
+      <div class="modal-body" *ngIf="!loading">
+        <ng-container *ngIf="!editMode">
+          <p>{{ "providerInviteUserDesc" | i18n }}</p>
+          <div class="form-group mb-4">
+            <label for="emails">{{ "email" | i18n }}</label>
+            <input
+              id="emails"
+              class="form-control"
+              type="text"
+              name="Emails"
+              [(ngModel)]="emails"
+              required
+              appAutoFocus
+            />
+            <small class="text-muted">{{ "inviteMultipleEmailDesc" | i18n: "20" }}</small>
+          </div>
+        </ng-container>
+        <h3>
+          {{ "userType" | i18n }}
+          <a
+            target="_blank"
+            rel="noopener"
+            appA11yTitle="{{ 'learnMore' | i18n }}"
+            href="https://bitwarden.com/help/provider-users/"
+          >
+            <i class="bwi bwi-question-circle" aria-hidden="true"></i>
+          </a>
+        </h3>
+        <div class="form-check mt-2 form-check-block">
+          <input
+            class="form-check-input"
+            type="radio"
+            name="userType"
+            id="userTypeServiceUser"
+            [value]="userType.ServiceUser"
+            [(ngModel)]="type"
+          />
+          <label class="form-check-label" for="userTypeServiceUser">
+            {{ "serviceUser" | i18n }}
+            <small>{{ "serviceUserDesc" | i18n }}</small>
+          </label>
+        </div>
+        <div class="form-check mt-2 form-check-block">
+          <input
+            class="form-check-input"
+            type="radio"
+            name="userType"
+            id="userTypeProviderAdmin"
+            [value]="userType.ProviderAdmin"
+            [(ngModel)]="type"
+          />
+          <label class="form-check-label" for="userTypeProviderAdmin">
+            {{ "providerAdmin" | i18n }}
+            <small>{{ "providerAdminDesc" | i18n }}</small>
+          </label>
+        </div>
+      </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>
+          <span>{{ "save" | i18n }}</span>
+        </button>
+        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
+          {{ "cancel" | i18n }}
+        </button>
+        <div class="ml-auto">
+          <button
+            #deleteBtn
+            type="button"
+            (click)="delete()"
+            class="btn btn-outline-danger"
+            appA11yTitle="{{ 'delete' | i18n }}"
+            *ngIf="editMode"
+            [disabled]="deleteBtn.loading"
+            [appApiAction]="deletePromise"
+          >
+            <i
+              class="bwi bwi-trash bwi-lg bwi-fw"
+              [hidden]="deleteBtn.loading"
+              aria-hidden="true"
+            ></i>
+            <i
+              class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
+              [hidden]="!deleteBtn.loading"
+              title="{{ 'loading' | i18n }}"
+              aria-hidden="true"
+            ></i>
+          </button>
+        </div>
+      </div>
+    </form>
+  </div>
 </div>

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

@@ -1,104 +1,118 @@
-import {
-    Component,
-    EventEmitter,
-    Input,
-    OnInit,
-    Output,
-} from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
 
-import { ToasterService } from 'angular2-toaster';
-
-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 { 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';
+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 { ProviderUserUpdateRequest } from "jslib-common/models/request/provider/providerUserUpdateRequest";
 
 @Component({
-    selector: 'provider-user-add-edit',
-    templateUrl: 'user-add-edit.component.html',
+  selector: "provider-user-add-edit",
+  templateUrl: "user-add-edit.component.html",
 })
 export class UserAddEditComponent implements OnInit {
-    @Input() name: string;
-    @Input() providerUserId: string;
-    @Input() providerId: string;
-    @Output() onSavedUser = new EventEmitter();
-    @Output() onDeletedUser = new EventEmitter();
+  @Input() name: string;
+  @Input() providerUserId: string;
+  @Input() providerId: string;
+  @Output() onSavedUser = new EventEmitter();
+  @Output() onDeletedUser = new EventEmitter();
 
-    loading = true;
-    editMode: boolean = false;
-    title: string;
-    emails: string;
-    type: ProviderUserType = ProviderUserType.ServiceUser;
-    permissions = new PermissionsApi();
-    showCustom = false;
-    access: 'all' | 'selected' = 'selected';
-    formPromise: Promise<any>;
-    deletePromise: Promise<any>;
-    userType = ProviderUserType;
+  loading = true;
+  editMode = false;
+  title: string;
+  emails: string;
+  type: ProviderUserType = ProviderUserType.ServiceUser;
+  permissions = new PermissionsApi();
+  showCustom = false;
+  access: "all" | "selected" = "selected";
+  formPromise: Promise<any>;
+  deletePromise: Promise<any>;
+  userType = ProviderUserType;
 
-    constructor(private apiService: ApiService, private i18nService: I18nService,
-        private toasterService: ToasterService, private platformUtilsService: PlatformUtilsService) { }
+  constructor(
+    private apiService: ApiService,
+    private i18nService: I18nService,
+    private platformUtilsService: PlatformUtilsService,
+    private logService: LogService
+  ) {}
 
-    async ngOnInit() {
-        this.editMode = this.loading = this.providerUserId != null;
+  async ngOnInit() {
+    this.editMode = this.loading = this.providerUserId != null;
 
-        if (this.editMode) {
-            this.editMode = true;
-            this.title = this.i18nService.t('editUser');
-            try {
-                const user = await this.apiService.getProviderUser(this.providerId, this.providerUserId);
-                this.type = user.type;
-            } catch { }
-        } else {
-            this.title = this.i18nService.t('inviteUser');
-        }
-
-        this.loading = false;
+    if (this.editMode) {
+      this.editMode = true;
+      this.title = this.i18nService.t("editUser");
+      try {
+        const user = await this.apiService.getProviderUser(this.providerId, this.providerUserId);
+        this.type = user.type;
+      } catch (e) {
+        this.logService.error(e);
+      }
+    } else {
+      this.title = this.i18nService.t("inviteUser");
     }
 
-    async submit() {
-        try {
-            if (this.editMode) {
-                const request = new ProviderUserUpdateRequest();
-                request.type = this.type;
-                this.formPromise = this.apiService.putProviderUser(this.providerId, this.providerUserId, request);
-            } else {
-                const request = new ProviderUserInviteRequest();
-                request.emails = this.emails.trim().split(/\s*,\s*/);
-                request.type = this.type;
-                this.formPromise = this.apiService.postProviderUserInvite(this.providerId, request);
-            }
-            await this.formPromise;
-            this.toasterService.popAsync('success', null,
-                this.i18nService.t(this.editMode ? 'editedUserId' : 'invitedUsers', this.name));
-            this.onSavedUser.emit();
-        } catch { }
+    this.loading = false;
+  }
+
+  async submit() {
+    try {
+      if (this.editMode) {
+        const request = new ProviderUserUpdateRequest();
+        request.type = this.type;
+        this.formPromise = this.apiService.putProviderUser(
+          this.providerId,
+          this.providerUserId,
+          request
+        );
+      } else {
+        const request = new ProviderUserInviteRequest();
+        request.emails = this.emails.trim().split(/\s*,\s*/);
+        request.type = this.type;
+        this.formPromise = this.apiService.postProviderUserInvite(this.providerId, request);
+      }
+      await this.formPromise;
+      this.platformUtilsService.showToast(
+        "success",
+        null,
+        this.i18nService.t(this.editMode ? "editedUserId" : "invitedUsers", this.name)
+      );
+      this.onSavedUser.emit();
+    } catch (e) {
+      this.logService.error(e);
+    }
+  }
+
+  async delete() {
+    if (!this.editMode) {
+      return;
     }
 
-    async delete() {
-        if (!this.editMode) {
-            return;
-        }
-
-        const confirmed = await this.platformUtilsService.showDialog(
-            this.i18nService.t('removeUserConfirmation'), this.name,
-            this.i18nService.t('yes'), this.i18nService.t('no'), 'warning');
-        if (!confirmed) {
-            return false;
-        }
-
-        try {
-            this.deletePromise = this.apiService.deleteProviderUser(this.providerId, this.providerUserId);
-            await this.deletePromise;
-            this.toasterService.popAsync('success', null, this.i18nService.t('removedUserId', this.name));
-            this.onDeletedUser.emit();
-        } catch { }
+    const confirmed = await this.platformUtilsService.showDialog(
+      this.i18nService.t("removeUserConfirmation"),
+      this.name,
+      this.i18nService.t("yes"),
+      this.i18nService.t("no"),
+      "warning"
+    );
+    if (!confirmed) {
+      return false;
     }
 
+    try {
+      this.deletePromise = this.apiService.deleteProviderUser(this.providerId, this.providerUserId);
+      await this.deletePromise;
+      this.platformUtilsService.showToast(
+        "success",
+        null,
+        this.i18nService.t("removedUserId", this.name)
+      );
+      this.onDeletedUser.emit();
+    } catch (e) {
+      this.logService.error(e);
+    }
+  }
 }

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

@@ -1,44 +1,44 @@
 <app-navbar></app-navbar>
 <div class="org-nav" *ngIf="provider">
-    <div class="container d-flex">
-        <div class="d-flex flex-column">
-            <div class="my-auto d-flex align-items-center pl-1">
-                <app-avatar [data]="provider.name" size="45" [circle]="true"></app-avatar>
-                <div class="org-name ml-3">
-                    <span>{{provider.name}}</span>
-                    <small class="text-muted">{{'provider' | i18n}}</small>
-                </div>
-                <div class="ml-3 card border-danger text-danger bg-transparent" *ngIf="!provider.enabled">
-                    <div class="card-body py-2">
-                        <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
-                        {{'providerIsDisabled' | i18n}}
-                    </div>
-                </div>
-            </div>
-            <ul class="nav nav-tabs" *ngIf="showMenuBar">
-                <li class="nav-item">
-                    <a class="nav-link" routerLink="clients" routerLinkActive="active">
-                        <i class="fa fa-university" aria-hidden="true"></i>
-                        {{'clients' | i18n}}
-                    </a>
-                </li>
-                <li class="nav-item" *ngIf="showManageTab">
-                    <a class="nav-link" [routerLink]="manageRoute" routerLinkActive="active">
-                        <i class="fa fa-sliders" aria-hidden="true"></i>
-                        {{'manage' | i18n}}
-                    </a>
-                </li>
-                <li class="nav-item" *ngIf="showSettingsTab">
-                    <a class="nav-link" routerLink="settings" routerLinkActive="active">
-                        <i class="fa fa-cogs" aria-hidden="true"></i>
-                        {{'settings' | i18n}}
-                    </a>
-                </li>
-            </ul>
+  <div class="container d-flex">
+    <div class="d-flex flex-column">
+      <div class="my-auto d-flex align-items-center pl-1">
+        <app-avatar [data]="provider.name" size="45" [circle]="true"></app-avatar>
+        <div class="org-name ml-3">
+          <span>{{ provider.name }}</span>
+          <small class="text-muted">{{ "provider" | i18n }}</small>
         </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>
+            {{ "providerIsDisabled" | i18n }}
+          </div>
+        </div>
+      </div>
+      <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>
+            {{ "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>
+            {{ "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>
+            {{ "settings" | i18n }}
+          </a>
+        </li>
+      </ul>
     </div>
+  </div>
 </div>
 <div class="container page-content">
-    <router-outlet></router-outlet>
+  <router-outlet></router-outlet>
 </div>
 <app-footer></app-footer>

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

@@ -1,51 +1,49 @@
-import { Component } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { Component } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
 
-import { UserService } from 'jslib-common/abstractions/user.service';
-
-import { Provider } from 'jslib-common/models/domain/provider';
+import { ProviderService } from "jslib-common/abstractions/provider.service";
+import { Provider } from "jslib-common/models/domain/provider";
 
 @Component({
-    selector: 'providers-layout',
-    templateUrl: 'providers-layout.component.html',
+  selector: "providers-layout",
+  templateUrl: "providers-layout.component.html",
 })
 export class ProvidersLayoutComponent {
+  provider: Provider;
+  private providerId: string;
 
-    provider: Provider;
-    private providerId: string;
+  constructor(private route: ActivatedRoute, private providerService: ProviderService) {}
 
-    constructor(private route: ActivatedRoute, private userService: UserService) { }
+  ngOnInit() {
+    document.body.classList.remove("layout_frontend");
+    this.route.params.subscribe(async (params) => {
+      this.providerId = params.providerId;
+      await this.load();
+    });
+  }
 
-    ngOnInit() {
-        document.body.classList.remove('layout_frontend');
-        this.route.params.subscribe(async params => {
-            this.providerId = params.providerId;
-            await this.load();
-        });
-    }
-
-    async load() {
-        this.provider = await this.userService.getProvider(this.providerId);
-    }
-
-    get showMenuBar() {
-        return this.showManageTab || this.showSettingsTab;
-    }
-
-    get showManageTab() {
-        return this.provider.canManageUsers || this.provider.canAccessEventLogs;
-    }
-
-    get showSettingsTab() {
-        return this.provider.isProviderAdmin;
-    }
-
-    get manageRoute(): string {
-        switch (true) {
-            case this.provider.canManageUsers:
-                return 'manage/people';
-            case this.provider.canAccessEventLogs:
-                return 'manage/events';
-        }
+  async load() {
+    this.provider = await this.providerService.get(this.providerId);
+  }
+
+  get showMenuBar() {
+    return this.showManageTab || this.showSettingsTab;
+  }
+
+  get showManageTab() {
+    return this.provider.canManageUsers || this.provider.canAccessEventLogs;
+  }
+
+  get showSettingsTab() {
+    return this.provider.isProviderAdmin;
+  }
+
+  get manageRoute(): string {
+    switch (true) {
+      case this.provider.canManageUsers:
+        return "manage/people";
+      case this.provider.canAccessEventLogs:
+        return "manage/events";
     }
+  }
 }

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

@@ -1,123 +1,121 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+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 { AuthGuard } from "jslib-angular/guards/auth.guard";
+import { Permissions } from "jslib-common/enums/permissions";
 
-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 { EventsComponent } from './manage/events.component';
-import { ManageComponent } from './manage/manage.component';
-import { PeopleComponent } from './manage/people.component';
-import { ProvidersLayoutComponent } from './providers-layout.component';
-import { SettingsComponent } from './settings/settings.component';
-import { SetupProviderComponent } from './setup/setup-provider.component';
-import { SetupComponent } from './setup/setup.component';
+import { FrontendLayoutComponent } from "src/app/layouts/frontend-layout.component";
+import { ProvidersComponent } from "src/app/providers/providers.component";
 
-import { FrontendLayoutComponent } from 'src/app/layouts/frontend-layout.component';
-
-import { ProvidersComponent } from 'src/app/providers/providers.component';
-import { ProviderGuardService } from './services/provider-guard.service';
-import { ProviderTypeGuardService } from './services/provider-type-guard.service';
-import { AccountComponent } from './settings/account.component';
+import { ClientsComponent } from "./clients/clients.component";
+import { CreateOrganizationComponent } from "./clients/create-organization.component";
+import { PermissionsGuard } from "./guards/provider-type.guard";
+import { ProviderGuard } from "./guards/provider.guard";
+import { AcceptProviderComponent } from "./manage/accept-provider.component";
+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 { AccountComponent } from "./settings/account.component";
+import { SettingsComponent } from "./settings/settings.component";
+import { SetupProviderComponent } from "./setup/setup-provider.component";
+import { SetupComponent } from "./setup/setup.component";
 
 const routes: Routes = [
-    {
-        path: '',
-        canActivate: [AuthGuardService],
-        component: ProvidersComponent,
-    },
-    {
-        path: '',
-        component: FrontendLayoutComponent,
+  {
+    path: "",
+    canActivate: [AuthGuard],
+    component: ProvidersComponent,
+  },
+  {
+    path: "",
+    component: FrontendLayoutComponent,
+    children: [
+      {
+        path: "setup-provider",
+        component: SetupProviderComponent,
+        data: { titleId: "setupProvider" },
+      },
+      {
+        path: "accept-provider",
+        component: AcceptProviderComponent,
+        data: { titleId: "acceptProvider" },
+      },
+    ],
+  },
+  {
+    path: "",
+    canActivate: [AuthGuard],
+    children: [
+      {
+        path: "setup",
+        component: SetupComponent,
+      },
+      {
+        path: ":providerId",
+        component: ProvidersLayoutComponent,
+        canActivate: [ProviderGuard],
         children: [
-            {
-                path: 'setup-provider',
-                component: SetupProviderComponent,
-                data: { titleId: 'setupProvider' },
-            },
-            {
-                path: 'accept-provider',
-                component: AcceptProviderComponent,
-                data: { titleId: 'acceptProvider' },
-            },
+          { path: "", pathMatch: "full", redirectTo: "clients" },
+          { path: "clients/create", component: CreateOrganizationComponent },
+          { path: "clients", component: ClientsComponent, data: { titleId: "clients" } },
+          {
+            path: "manage",
+            component: ManageComponent,
+            children: [
+              {
+                path: "",
+                pathMatch: "full",
+                redirectTo: "people",
+              },
+              {
+                path: "people",
+                component: PeopleComponent,
+                canActivate: [PermissionsGuard],
+                data: {
+                  titleId: "people",
+                  permissions: [Permissions.ManageUsers],
+                },
+              },
+              {
+                path: "events",
+                component: EventsComponent,
+                canActivate: [PermissionsGuard],
+                data: {
+                  titleId: "eventLogs",
+                  permissions: [Permissions.AccessEventLogs],
+                },
+              },
+            ],
+          },
+          {
+            path: "settings",
+            component: SettingsComponent,
+            children: [
+              {
+                path: "",
+                pathMatch: "full",
+                redirectTo: "account",
+              },
+              {
+                path: "account",
+                component: AccountComponent,
+                canActivate: [PermissionsGuard],
+                data: {
+                  titleId: "myProvider",
+                  permissions: [Permissions.ManageProvider],
+                },
+              },
+            ],
+          },
         ],
-    },
-    {
-        path: '',
-        canActivate: [AuthGuardService],
-        children: [
-            {
-                path: 'setup',
-                component: SetupComponent,
-            },
-            {
-                path: ':providerId',
-                component: ProvidersLayoutComponent,
-                canActivate: [ProviderGuardService],
-                children: [
-                    { path: '', pathMatch: 'full', redirectTo: 'clients' },
-                    { path: 'clients/create', component: CreateOrganizationComponent },
-                    { path: 'clients', component: ClientsComponent, data: { titleId: 'clients' } },
-                    {
-                        path: 'manage',
-                        component: ManageComponent,
-                        children: [
-                            {
-                                path: '',
-                                pathMatch: 'full',
-                                redirectTo: 'people',
-                            },
-                            {
-                                path: 'people',
-                                component: PeopleComponent,
-                                canActivate: [ProviderTypeGuardService],
-                                data: {
-                                    titleId: 'people',
-                                    permissions: [Permissions.ManageUsers],
-                                },
-                            },
-                            {
-                                path: 'events',
-                                component: EventsComponent,
-                                canActivate: [ProviderTypeGuardService],
-                                data: {
-                                    titleId: 'eventLogs',
-                                    permissions: [Permissions.AccessEventLogs],
-                                },
-                            },
-                        ],
-                    },
-                    {
-                        path: 'settings',
-                        component: SettingsComponent,
-                        children: [
-                            {
-                                path: '',
-                                pathMatch: 'full',
-                                redirectTo: 'account',
-                            },
-                            {
-                                path: 'account',
-                                component: AccountComponent,
-                                canActivate: [ProviderTypeGuardService],
-                                data: {
-                                    titleId: 'myProvider',
-                                    permissions: [Permissions.ManageProvider],
-                                },
-                            },
-                        ],
-                    },
-                ],
-            },
-        ],
-    },
+      },
+    ],
+  },
 ];
 
 @NgModule({
-    imports: [RouterModule.forChild(routes)],
-    exports: [RouterModule],
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
 })
-export class ProvidersRoutingModule { }
+export class ProvidersRoutingModule {}

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

@@ -1,69 +1,58 @@
-import { CommonModule } from '@angular/common';
-import { ComponentFactoryResolver } from '@angular/core';
-import { NgModule } from '@angular/core';
-import { FormsModule } from '@angular/forms';
+import { CommonModule } from "@angular/common";
+import { ComponentFactoryResolver, NgModule } from "@angular/core";
+import { FormsModule } from "@angular/forms";
 
-import { ModalService } from 'jslib-angular/services/modal.service';
+import { JslibModule } from "jslib-angular/jslib.module";
+import { ModalService } from "jslib-angular/services/modal.service";
 
-import { ProviderGuardService } from './services/provider-guard.service';
-import { ProviderTypeGuardService } from './services/provider-type-guard.service';
-import { ProviderService } from './services/provider.service';
+import { OssModule } from "src/app/oss.module";
 
-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';
-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 { 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';
+import { AddOrganizationComponent } from "./clients/add-organization.component";
+import { ClientsComponent } from "./clients/clients.component";
+import { CreateOrganizationComponent } from "./clients/create-organization.component";
+import { PermissionsGuard } from "./guards/provider-type.guard";
+import { ProviderGuard } from "./guards/provider.guard";
+import { AcceptProviderComponent } from "./manage/accept-provider.component";
+import { BulkConfirmComponent } from "./manage/bulk/bulk-confirm.component";
+import { BulkRemoveComponent } from "./manage/bulk/bulk-remove.component";
+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 { 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";
 
 @NgModule({
-    imports: [
-        CommonModule,
-        FormsModule,
-        OssModule,
-        ProvidersRoutingModule,
-    ],
-    declarations: [
-        AcceptProviderComponent,
-        AccountComponent,
-        AddOrganizationComponent,
-        BulkConfirmComponent,
-        BulkRemoveComponent,
-        ClientsComponent,
-        CreateOrganizationComponent,
-        EventsComponent,
-        ManageComponent,
-        PeopleComponent,
-        ProvidersLayoutComponent,
-        SettingsComponent,
-        SetupComponent,
-        SetupProviderComponent,
-        UserAddEditComponent,
-    ],
-    providers: [
-        ProviderService,
-        ProviderGuardService,
-        ProviderTypeGuardService,
-    ],
+  imports: [CommonModule, FormsModule, OssModule, JslibModule, ProvidersRoutingModule],
+  declarations: [
+    AcceptProviderComponent,
+    AccountComponent,
+    AddOrganizationComponent,
+    BulkConfirmComponent,
+    BulkRemoveComponent,
+    ClientsComponent,
+    CreateOrganizationComponent,
+    EventsComponent,
+    ManageComponent,
+    PeopleComponent,
+    ProvidersLayoutComponent,
+    SettingsComponent,
+    SetupComponent,
+    SetupProviderComponent,
+    UserAddEditComponent,
+  ],
+  providers: [WebProviderService, ProviderGuard, PermissionsGuard],
 })
 export class ProvidersModule {
-    constructor(modalService: ModalService, componentFactoryResolver: ComponentFactoryResolver) {
-        modalService.registerComponentFactoryResolver(AddOrganizationComponent, componentFactoryResolver);
-    }
+  constructor(modalService: ModalService, componentFactoryResolver: ComponentFactoryResolver) {
+    modalService.registerComponentFactoryResolver(
+      AddOrganizationComponent,
+      componentFactoryResolver
+    );
+  }
 }

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

@@ -1,32 +0,0 @@
-import { Injectable } from '@angular/core';
-import {
-    ActivatedRouteSnapshot,
-    CanActivate,
-    Router,
-} from '@angular/router';
-
-import { ToasterService } from 'angular2-toaster';
-
-import { I18nService } from 'jslib-common/abstractions/i18n.service';
-import { UserService } from 'jslib-common/abstractions/user.service';
-
-@Injectable()
-export class ProviderGuardService implements CanActivate {
-    constructor(private userService: UserService, private router: Router,
-        private toasterService: ToasterService, private i18nService: I18nService) { }
-
-    async canActivate(route: ActivatedRouteSnapshot) {
-        const provider = await this.userService.getProvider(route.params.providerId);
-        if (provider == null) {
-            this.router.navigate(['/']);
-            return false;
-        }
-        if (!provider.isProviderAdmin && !provider.enabled) {
-            this.toasterService.popAsync('error', null, this.i18nService.t('providerIsDisabled'));
-            this.router.navigate(['/']);
-            return false;
-        }
-
-        return true;
-    }
-}

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

@@ -1,31 +0,0 @@
-import { Injectable } from '@angular/core';
-import {
-    ActivatedRouteSnapshot,
-    CanActivate,
-    Router,
-} from '@angular/router';
-
-import { UserService } from 'jslib-common/abstractions/user.service';
-
-import { Permissions } from 'jslib-common/enums/permissions';
-
-@Injectable()
-export class ProviderTypeGuardService implements CanActivate {
-    constructor(private userService: UserService, private router: Router) { }
-
-    async canActivate(route: ActivatedRouteSnapshot) {
-        const provider = await this.userService.getProvider(route.params.providerId);
-        const permissions = route.data == null ? null : route.data.permissions as Permissions[];
-
-        if (
-            (permissions.indexOf(Permissions.AccessEventLogs) !== -1 && provider.canAccessEventLogs) ||
-            (permissions.indexOf(Permissions.ManageProvider) !== -1 && provider.isProviderAdmin) ||
-            (permissions.indexOf(Permissions.ManageUsers) !== -1 && provider.canManageUsers)
-        ) {
-            return true;
-        }
-
-        this.router.navigate(['/providers', provider.id]);
-        return false;
-    }
-}

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

@@ -1,32 +0,0 @@
-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()
-export class ProviderService {
-    constructor(private cryptoService: CryptoService, private syncService: SyncService, private apiService: ApiService) {}
-
-    async addOrganizationToProvider(providerId: string, organizationId: string) {
-        const orgKey = await this.cryptoService.getOrgKey(organizationId);
-        const providerKey = await this.cryptoService.getProviderKey(providerId);
-
-        const encryptedOrgKey = await this.cryptoService.encrypt(orgKey.key, providerKey);
-
-        const request = new ProviderAddOrganizationRequest();
-        request.organizationId = organizationId;
-        request.key = encryptedOrgKey.encryptedString;
-
-        const response = await this.apiService.postProviderAddOrganization(providerId, request);
-        await this.syncService.fullSync(true);
-        return response;
-    }
-
-    async detachOrganizastion(providerId: string, organizationId: string): Promise<any> {
-        await this.apiService.deleteProviderOrganization(providerId, organizationId);
-        await this.syncService.fullSync(true);
-    }
-}

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

@@ -0,0 +1,35 @@
+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()
+export class WebProviderService {
+  constructor(
+    private cryptoService: CryptoService,
+    private syncService: SyncService,
+    private apiService: ApiService
+  ) {}
+
+  async addOrganizationToProvider(providerId: string, organizationId: string) {
+    const orgKey = await this.cryptoService.getOrgKey(organizationId);
+    const providerKey = await this.cryptoService.getProviderKey(providerId);
+
+    const encryptedOrgKey = await this.cryptoService.encrypt(orgKey.key, providerKey);
+
+    const request = new ProviderAddOrganizationRequest();
+    request.organizationId = organizationId;
+    request.key = encryptedOrgKey.encryptedString;
+
+    const response = await this.apiService.postProviderAddOrganization(providerId, request);
+    await this.syncService.fullSync(true);
+    return response;
+  }
+
+  async detachOrganizastion(providerId: string, organizationId: string): Promise<any> {
+    await this.apiService.deleteProviderOrganization(providerId, organizationId);
+    await this.syncService.fullSync(true);
+  }
+}

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

@@ -1,30 +1,52 @@
 <div class="page-header">
-    <h1>{{'myProvider' | i18n}}</h1>
+  <h1>{{ "myProvider" | i18n }}</h1>
 </div>
 <div *ngIf="loading">
-    <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}" aria-hidden="true"></i>
-    <span class="sr-only">{{'loading' | i18n}}</span>
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
+  <span class="sr-only">{{ "loading" | i18n }}</span>
 </div>
-<form *ngIf="provider && !loading" #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
-    <div class="row">
-        <div class="col-6">
-            <div class="form-group">
-                <label for="name">{{'providerName' | i18n}}</label>
-                <input id="name" class="form-control" type="text" name="Name" [(ngModel)]="provider.name"
-                    [disabled]="selfHosted">
-            </div>
-            <div class="form-group">
-                <label for="billingEmail">{{'billingEmail' | i18n}}</label>
-                <input id="billingEmail" class="form-control" type="text" name="BillingEmail"
-                    [(ngModel)]="provider.billingEmail" [disabled]="selfHosted">
-            </div>
-        </div>
-        <div class="col-6">
-            <app-avatar data="{{provider.name}}" dynamic="true" size="75" fontSize="35"></app-avatar>
-        </div>
+<form
+  *ngIf="provider && !loading"
+  #form
+  (ngSubmit)="submit()"
+  [appApiAction]="formPromise"
+  ngNativeValidate
+>
+  <div class="row">
+    <div class="col-6">
+      <div class="form-group">
+        <label for="name">{{ "providerName" | i18n }}</label>
+        <input
+          id="name"
+          class="form-control"
+          type="text"
+          name="Name"
+          [(ngModel)]="provider.name"
+          [disabled]="selfHosted"
+        />
+      </div>
+      <div class="form-group">
+        <label for="billingEmail">{{ "billingEmail" | i18n }}</label>
+        <input
+          id="billingEmail"
+          class="form-control"
+          type="text"
+          name="BillingEmail"
+          [(ngModel)]="provider.billingEmail"
+          [disabled]="selfHosted"
+        />
+      </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>{{'save' | i18n}}</span>
-    </button>
+    <div class="col-6">
+      <app-avatar data="{{ provider.name }}" dynamic="true" size="75" fontSize="35"></app-avatar>
+    </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>
+    <span>{{ "save" | i18n }}</span>
+  </button>
 </form>

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

@@ -1,62 +1,63 @@
-import { Component } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { ToasterService } from 'angular2-toaster';
+import { Component } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
 
-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 { 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';
+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 { 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({
-    selector: 'provider-account',
-    templateUrl: 'account.component.html',
+  selector: "provider-account",
+  templateUrl: "account.component.html",
 })
 export class AccountComponent {
-    selfHosted = false;
-    loading = true;
-    provider: ProviderResponse;
-    formPromise: Promise<any>;
-    taxFormPromise: Promise<any>;
+  selfHosted = false;
+  loading = true;
+  provider: ProviderResponse;
+  formPromise: Promise<any>;
+  taxFormPromise: Promise<any>;
 
-    private providerId: string;
+  private providerId: string;
 
-    constructor(private apiService: ApiService, private i18nService: I18nService,
-        private toasterService: ToasterService, private route: ActivatedRoute,
-        private syncService: SyncService, private platformUtilsService: PlatformUtilsService,
-        private logService: LogService) { }
+  constructor(
+    private apiService: ApiService,
+    private i18nService: I18nService,
+    private route: ActivatedRoute,
+    private syncService: SyncService,
+    private platformUtilsService: PlatformUtilsService,
+    private logService: LogService
+  ) {}
 
-    async ngOnInit() {
-        this.selfHosted = this.platformUtilsService.isSelfHost();
-        this.route.parent.parent.params.subscribe(async params => {
-            this.providerId = params.providerId;
-            try {
-                this.provider = await this.apiService.getProvider(this.providerId);
-            } catch (e) {
-                this.logService.error(`Handled exception: ${e}`);
-            }
-        });
-        this.loading = false;
-    }
-
-    async submit() {
-        try {
-            const request = new ProviderUpdateRequest();
-            request.name = this.provider.name;
-            request.businessName = this.provider.businessName;
-            request.billingEmail = this.provider.billingEmail;
-
-            this.formPromise = this.apiService.putProvider(this.providerId, request).then(() => {
-                return this.syncService.fullSync(true);
-            });
-            await this.formPromise;
-            this.toasterService.popAsync('success', null, this.i18nService.t('providerUpdated'));
-        } catch (e) {
-            this.logService.error(`Handled exception: ${e}`);
-        }
+  async ngOnInit() {
+    this.selfHosted = this.platformUtilsService.isSelfHost();
+    this.route.parent.parent.params.subscribe(async (params) => {
+      this.providerId = params.providerId;
+      try {
+        this.provider = await this.apiService.getProvider(this.providerId);
+      } catch (e) {
+        this.logService.error(`Handled exception: ${e}`);
+      }
+    });
+    this.loading = false;
+  }
+
+  async submit() {
+    try {
+      const request = new ProviderUpdateRequest();
+      request.name = this.provider.name;
+      request.businessName = this.provider.businessName;
+      request.billingEmail = this.provider.billingEmail;
+
+      this.formPromise = this.apiService.putProvider(this.providerId, request).then(() => {
+        return this.syncService.fullSync(true);
+      });
+      await this.formPromise;
+      this.platformUtilsService.showToast("success", null, this.i18nService.t("providerUpdated"));
+    } catch (e) {
+      this.logService.error(`Handled exception: ${e}`);
     }
+  }
 }

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

@@ -1,17 +1,17 @@
 <div class="container page-content">
-    <div class="row">
-        <div class="col-3">
-            <div class="card">
-                <div class="card-header">{{'settings' | i18n}}</div>
-                <div class="list-group list-group-flush">
-                    <a routerLink="account" class="list-group-item" routerLinkActive="active">
-                        {{'myProvider' | i18n}}
-                    </a>
-                </div>
-            </div>
-        </div>
-        <div class="col-9">
-            <router-outlet></router-outlet>
+  <div class="row">
+    <div class="col-3">
+      <div class="card">
+        <div class="card-header">{{ "settings" | i18n }}</div>
+        <div class="list-group list-group-flush">
+          <a routerLink="account" class="list-group-item" routerLinkActive="active">
+            {{ "myProvider" | i18n }}
+          </a>
         </div>
+      </div>
     </div>
+    <div class="col-9">
+      <router-outlet></router-outlet>
+    </div>
+  </div>
 </div>

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

@@ -1,20 +1,18 @@
-import { Component } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { Component } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
 
-import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
-import { UserService } from 'jslib-common/abstractions/user.service';
+import { ProviderService } from "jslib-common/abstractions/provider.service";
 
 @Component({
-    selector: 'provider-settings',
-    templateUrl: 'settings.component.html',
+  selector: "provider-settings",
+  templateUrl: "settings.component.html",
 })
 export class SettingsComponent {
-    constructor(private route: ActivatedRoute, private userService: UserService,
-        private platformUtilsService: PlatformUtilsService) { }
+  constructor(private route: ActivatedRoute, private providerService: ProviderService) {}
 
-    ngOnInit() {
-        this.route.parent.params.subscribe(async params => {
-            const provider = await this.userService.getProvider(params.providerId);
-        });
-    }
+  ngOnInit() {
+    this.route.parent.params.subscribe(async (params) => {
+      await this.providerService.get(params.providerId);
+    });
+  }
 }

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

@@ -1,27 +1,35 @@
 <div class="mt-5 d-flex justify-content-center" *ngIf="loading">
-    <div>
-        <img class="mb-4 logo logo-themed" alt="Bitwarden">
-        <p class="text-center">
-            <i class="fa fa-spinner fa-spin fa-2x text-muted" title="{{'loading' | i18n}}" aria-hidden="true"></i>
-            <span class="sr-only">{{'loading' | i18n}}</span>
-        </p>
-    </div>
+  <div>
+    <img class="mb-4 logo logo-themed" alt="Bitwarden" />
+    <p class="text-center">
+      <i
+        class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
+        title="{{ 'loading' | i18n }}"
+        aria-hidden="true"
+      ></i>
+      <span class="sr-only">{{ "loading" | i18n }}</span>
+    </p>
+  </div>
 </div>
 <div class="container" *ngIf="!loading && !authed">
-    <div class="row justify-content-md-center mt-5">
-        <div class="col-5">
-            <p class="lead text-center mb-4">{{'setupProvider' | i18n}}</p>
-            <div class="card d-block">
-                <div class="card-body">
-                    <p>{{'setupProviderLoginDesc' | i18n}}</p>
-                    <hr>
-                    <div class="d-flex">
-                        <a routerLink="/" [queryParams]="{email: email}" class="btn btn-primary btn-block">
-                            {{'logIn' | i18n}}
-                        </a>
-                    </div>
-                </div>
-            </div>
+  <div class="row justify-content-md-center mt-5">
+    <div class="col-5">
+      <p class="lead text-center mb-4">{{ "setupProvider" | i18n }}</p>
+      <div class="card d-block">
+        <div class="card-body">
+          <p>{{ "setupProviderLoginDesc" | i18n }}</p>
+          <hr />
+          <div class="d-flex">
+            <a
+              routerLink="/login"
+              [queryParams]="{ email: email }"
+              class="btn btn-primary btn-block"
+            >
+              {{ "logIn" | i18n }}
+            </a>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 </div>

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

@@ -1,22 +1,22 @@
-import { Component } from '@angular/core';
+import { Component } from "@angular/core";
 
-import { BaseAcceptComponent } from 'src/app/common/base.accept.component';
+import { BaseAcceptComponent } from "src/app/common/base.accept.component";
 
 @Component({
-    selector: 'app-setup-provider',
-    templateUrl: 'setup-provider.component.html',
+  selector: "app-setup-provider",
+  templateUrl: "setup-provider.component.html",
 })
 export class SetupProviderComponent extends BaseAcceptComponent {
+  failedShortMessage = "inviteAcceptFailedShort";
+  failedMessage = "inviteAcceptFailed";
 
-    failedShortMessage = 'inviteAcceptFailedShort';
-    failedMessage = 'inviteAcceptFailed';
+  requiredParameters = ["providerId", "email", "token"];
 
-    requiredParameters = ['providerId', 'email', 'token'];
+  async authedHandler(qParams: any) {
+    this.router.navigate(["/providers/setup"], { queryParams: qParams });
+  }
 
-    async authedHandler(qParams: any) {
-        this.router.navigate(['/providers/setup'], {queryParams: qParams});
-    }
-
-    // tslint:disable-next-line
-    async unauthedHandler(qParams: any) {}
+  async unauthedHandler(qParams: any) {
+    // Empty
+  }
 }

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

@@ -1,32 +1,39 @@
 <app-navbar></app-navbar>
 <div class="container page-content">
-    <div class="page-header">
-        <h1>{{'setupProvider' | i18n}}</h1>
+  <div class="page-header">
+    <h1>{{ "setupProvider" | i18n }}</h1>
+  </div>
+  <p>{{ "setupProviderDesc" | i18n }}</p>
+
+  <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate *ngIf="loading">
+    <h2 class="mt-5">{{ "generalInformation" | i18n }}</h2>
+    <div class="row">
+      <div class="form-group col-6">
+        <label for="name">{{ "providerName" | i18n }}</label>
+        <input id="name" class="form-control" type="text" name="Name" [(ngModel)]="name" required />
+      </div>
+      <div class="form-group col-6">
+        <label for="billingEmail">{{ "billingEmail" | i18n }}</label>
+        <input
+          id="billingEmail"
+          class="form-control"
+          type="text"
+          name="BillingEmail"
+          [(ngModel)]="billingEmail"
+          required
+        />
+      </div>
     </div>
-    <p>{{'setupProviderDesc' | i18n}}</p>
 
-    <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate *ngIf="loading">
-        <h2 class="mt-5">{{'generalInformation' | i18n}}</h2>
-        <div class="row">
-            <div class="form-group col-6">
-                <label for="name">{{'providerName' | i18n}}</label>
-                <input id="name" class="form-control" type="text" name="Name" [(ngModel)]="name" required>
-            </div>
-            <div class="form-group col-6">
-                <label for="billingEmail">{{'billingEmail' | i18n}}</label>
-                <input id="billingEmail" class="form-control" type="text" name="BillingEmail" [(ngModel)]="billingEmail" required>
-            </div>
-        </div>
-
-        <div class="mt-4">
-            <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-                <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
-                <span>{{'submit' | i18n}}</span>
-            </button>
-            <button type="button" class="btn btn-outline-secondary" (click)="cancel()" *ngIf="showCancel">
-                {{'cancel' | i18n}}
-            </button>
-        </div>
-    </form>
+    <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>
+        <span>{{ "submit" | i18n }}</span>
+      </button>
+      <button type="button" class="btn btn-outline-secondary" (click)="cancel()" *ngIf="showCancel">
+        {{ "cancel" | i18n }}
+      </button>
+    </div>
+  </form>
 </div>
 <app-footer></app-footer>

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

@@ -1,106 +1,97 @@
-import {
-    Component,
-    OnInit,
-} from '@angular/core';
-import {
-    ActivatedRoute,
-    Router,
-} from '@angular/router';
-import {
-    Toast,
-    ToasterService,
-} from 'angular2-toaster';
+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 { CryptoService } from 'jslib-common/abstractions/crypto.service';
-
-import { ValidationService } from 'jslib-angular/services/validation.service';
-import { I18nService } from 'jslib-common/abstractions/i18n.service';
-import { SyncService } from 'jslib-common/abstractions/sync.service';
-import { ProviderSetupRequest } from 'jslib-common/models/request/provider/providerSetupRequest';
+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";
+import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
+import { SyncService } from "jslib-common/abstractions/sync.service";
+import { ProviderSetupRequest } from "jslib-common/models/request/provider/providerSetupRequest";
 
 @Component({
-    selector: 'provider-setup',
-    templateUrl: 'setup.component.html',
+  selector: "provider-setup",
+  templateUrl: "setup.component.html",
 })
 export class SetupComponent implements OnInit {
-    loading = true;
-    authed = false;
-    email: string;
-    formPromise: Promise<any>;
+  loading = true;
+  authed = false;
+  email: string;
+  formPromise: Promise<any>;
 
-    providerId: string;
-    token: string;
-    name: string;
-    billingEmail: string;
+  providerId: string;
+  token: string;
+  name: string;
+  billingEmail: string;
 
-    constructor(private router: Router, private toasterService: ToasterService,
-        private i18nService: I18nService, private route: ActivatedRoute,
-        private cryptoService: CryptoService, private apiService: ApiService,
-        private syncService: SyncService, private validationService: ValidationService) { }
+  constructor(
+    private router: Router,
+    private platformUtilsService: PlatformUtilsService,
+    private i18nService: I18nService,
+    private route: ActivatedRoute,
+    private cryptoService: CryptoService,
+    private apiService: ApiService,
+    private syncService: SyncService,
+    private validationService: ValidationService
+  ) {}
 
-    ngOnInit() {
-        document.body.classList.remove('layout_frontend');
-        let fired = false;
-        this.route.queryParams.subscribe(async qParams => {
-            if (fired) {
-                return;
-            }
-            fired = true;
-            const error = qParams.providerId == null || qParams.email == null || qParams.token == null;
+  ngOnInit() {
+    document.body.classList.remove("layout_frontend");
+    this.route.queryParams.pipe(first()).subscribe(async (qParams) => {
+      const error = qParams.providerId == null || qParams.email == null || qParams.token == null;
 
-            if (error) {
-                const toast: Toast = {
-                    type: 'error',
-                    title: null,
-                    body: this.i18nService.t('emergencyInviteAcceptFailed'),
-                    timeout: 10000,
-                };
-                this.toasterService.popAsync(toast);
-                this.router.navigate(['/']);
-                return;
-            }
+      if (error) {
+        this.platformUtilsService.showToast(
+          "error",
+          null,
+          this.i18nService.t("emergencyInviteAcceptFailed"),
+          { timeout: 10000 }
+        );
+        this.router.navigate(["/"]);
+        return;
+      }
 
-            this.providerId = qParams.providerId;
-            this.token = qParams.token;
+      this.providerId = qParams.providerId;
+      this.token = qParams.token;
 
-            // Check if provider exists, redirect if it does
-            try {
-                const provider = await this.apiService.getProvider(this.providerId);
-                if (provider.name != null) {
-                    this.router.navigate(['/providers', provider.id], { replaceUrl: true });
-                }
-            } catch (e) {
-                this.validationService.showError(e);
-                this.router.navigate(['/']);
-            }
-        });
-    }
-
-    async submit() {
-        this.formPromise = this.doSubmit();
-        await this.formPromise;
-        this.formPromise = null;
-    }
-
-    async doSubmit() {
-        try {
-            const shareKey = await this.cryptoService.makeShareKey();
-            const key = shareKey[0].encryptedString;
-
-            const request = new ProviderSetupRequest();
-            request.name = this.name;
-            request.billingEmail = this.billingEmail;
-            request.token = this.token;
-            request.key = key;
-
-            const provider = await this.apiService.postProviderSetup(this.providerId, request);
-            this.toasterService.popAsync('success', null, this.i18nService.t('providerSetup'));
-            await this.syncService.fullSync(true);
-
-            this.router.navigate(['/providers', provider.id]);
-        } catch (e) {
-            this.validationService.showError(e);
+      // Check if provider exists, redirect if it does
+      try {
+        const provider = await this.apiService.getProvider(this.providerId);
+        if (provider.name != null) {
+          this.router.navigate(["/providers", provider.id], { replaceUrl: true });
         }
+      } catch (e) {
+        this.validationService.showError(e);
+        this.router.navigate(["/"]);
+      }
+    });
+  }
+
+  async submit() {
+    this.formPromise = this.doSubmit();
+    await this.formPromise;
+    this.formPromise = null;
+  }
+
+  async doSubmit() {
+    try {
+      const shareKey = await this.cryptoService.makeShareKey();
+      const key = shareKey[0].encryptedString;
+
+      const request = new ProviderSetupRequest();
+      request.name = this.name;
+      request.billingEmail = this.billingEmail;
+      request.token = this.token;
+      request.key = key;
+
+      const provider = await this.apiService.postProviderSetup(this.providerId, request);
+      this.platformUtilsService.showToast("success", null, this.i18nService.t("providerSetup"));
+      await this.syncService.fullSync(true);
+
+      this.router.navigate(["/providers", provider.id]);
+    } catch (e) {
+      this.validationService.showError(e);
     }
+  }
 }

bitwarden_license/webpack.config.js

@@ -1,12 +1,12 @@
-const AngularCompilerPlugin = require('@ngtools/webpack').AngularCompilerPlugin;
+const { AngularWebpackPlugin } = require("@ngtools/webpack");
 
-const webpackConfig = require('../webpack.config');
+const webpackConfig = require("../webpack.config");
 
-webpackConfig.entry['app/main'] = './bitwarden_license/src/app/main.ts';
-webpackConfig.plugins[webpackConfig.plugins.length -1] = new AngularCompilerPlugin({
-    tsConfigPath: 'tsconfig.json',
-    entryModule: 'bitwarden_license/src/app/app.module#AppModule',
-    sourceMap: true,
+webpackConfig.entry["app/main"] = "./bitwarden_license/src/app/main.ts";
+webpackConfig.plugins[webpackConfig.plugins.length - 1] = new AngularWebpackPlugin({
+  tsConfigPath: "tsconfig.json",
+  entryModule: "bitwarden_license/src/app/app.module#AppModule",
+  sourceMap: true,
 });
 
 module.exports = webpackConfig;

config.js

@@ -1,32 +1,36 @@
 function load(envName) {
-    return {
-        ...require('./config/base.json'),
-        ...loadConfig(envName),
-        ...loadConfig('local'),
-    };
+  return {
+    ...require("./config/base.json"),
+    ...loadConfig(envName),
+    ...loadConfig("local"),
+    dev: {
+      ...require("./config/base.json").dev,
+      ...loadConfig(envName).dev,
+      ...loadConfig("local").dev,
+    },
+  };
 }
 
 function log(configObj) {
-    const repeatNum = 50;
-    console.log(`${"=".repeat(repeatNum)}\nenvConfig`);
-    console.log(JSON.stringify(configObj, null, 2));
-    console.log(`${"=".repeat(repeatNum)}`);
+  const repeatNum = 50;
+  console.log(`${"=".repeat(repeatNum)}\nenvConfig`);
+  console.log(JSON.stringify(configObj, null, 2));
+  console.log(`${"=".repeat(repeatNum)}`);
 }
 
 function loadConfig(configName) {
-    try {
-        return require(`./config/${configName}.json`);
-    } catch (e) {
-        if (e instanceof Error && e.code === "MODULE_NOT_FOUND") {
-            return {};
-        }
-        else {
-            throw e;
-        }
+  try {
+    return require(`./config/${configName}.json`);
+  } catch (e) {
+    if (e instanceof Error && e.code === "MODULE_NOT_FOUND") {
+      return {};
+    } else {
+      throw e;
     }
+  }
 }
 
 module.exports = {
-    load,
-    log
+  load,
+  log,
 };

config/base.json

@@ -1,9 +1,13 @@
 {
-    "urls": {},
-    "stripeKey": "pk_test_KPoCfZXu7mznb9uSCPZ2JpTD",
-    "braintreeKey": "sandbox_r72q8jq6_9pnxkwm75f87sdc2",
-    "paypal": {
-        "businessId": "AD3LAUZSNVPJY",
-        "buttonAction": "https://www.sandbox.paypal.com/cgi-bin/webscr"
-    }
+  "urls": {},
+  "stripeKey": "pk_test_KPoCfZXu7mznb9uSCPZ2JpTD",
+  "braintreeKey": "sandbox_r72q8jq6_9pnxkwm75f87sdc2",
+  "paypal": {
+    "businessId": "AD3LAUZSNVPJY",
+    "buttonAction": "https://www.sandbox.paypal.com/cgi-bin/webscr"
+  },
+  "dev": {
+    "port": 8080,
+    "allowedHosts": "auto"
+  }
 }

config/cloud.json

@@ -1,12 +1,17 @@
 {
-    "urls": {
-        "icons": "https://icons.bitwarden.net",
-        "notifications": "https://notifications.bitwarden.com"
-    },
-    "stripeKey": "pk_live_bpN0P37nMxrMQkcaHXtAybJk",
-    "braintreeKey": "production_qfbsv8kc_njj2zjtyngtjmbjd",
-    "paypal": {
-        "businessId": "4ZDA7DLUUJGMN",
-        "buttonAction": "https://www.paypal.com/cgi-bin/webscr"
-    }
+  "urls": {
+    "icons": "https://icons.bitwarden.net",
+    "notifications": "https://notifications.bitwarden.com"
+  },
+  "stripeKey": "pk_live_bpN0P37nMxrMQkcaHXtAybJk",
+  "braintreeKey": "production_qfbsv8kc_njj2zjtyngtjmbjd",
+  "paypal": {
+    "businessId": "4ZDA7DLUUJGMN",
+    "buttonAction": "https://www.paypal.com/cgi-bin/webscr"
+  },
+  "dev": {
+    "proxyApi": "https://api.bitwarden.com",
+    "proxyIdentity": "https://identity.bitwarden.com",
+    "proxyEvents": "https://events.bitwarden.com"
+  }
 }

config/development.json

@@ -1,10 +1,11 @@
 {
+  "urls": {
+    "notifications": "http://localhost:61840"
+  },
+  "dev": {
     "proxyApi": "http://localhost:4000",
     "proxyIdentity": "http://localhost:33656",
     "proxyEvents": "http://localhost:46273",
-    "proxyNotifications": "http://localhost:61840",
-    "allowedHosts": [],
-    "urls": {
-        "notifications": "http://localhost:61840"
-    }
+    "proxyNotifications": "http://localhost:61840"
+  }
 }

config/qa.json

@@ -1,6 +1,11 @@
 {
-    "urls": {
-        "icons": "https://icons.qa.bitwarden.pw",
-        "notifications": "https://notifications.qa.bitwarden.pw"
-    }
+  "urls": {
+    "icons": "https://icons.qa.bitwarden.pw",
+    "notifications": "https://notifications.qa.bitwarden.pw"
+  },
+  "dev": {
+    "proxyApi": "https://api.qa.bitwarden.pw",
+    "proxyIdentity": "https://identity.qa.bitwarden.pw",
+    "proxyEvents": "https://events.qa.bitwarden.pw"
+  }
 }

config/self-hosted.json

@@ -1 +0,0 @@
-{}

config/selfhosted.json

@@ -0,0 +1,9 @@
+{
+  "dev": {
+    "proxyApi": "http://localhost:4001",
+    "proxyIdentity": "http://localhost:33657",
+    "proxyEvents": "http://localhost:46274",
+    "proxyNotifications": "http://localhost:61841",
+    "port": 8081
+  }
+}

crowdin.yml

@@ -1,7 +1,9 @@
 project_id_env: _CROWDIN_PROJECT_ID
 api_token_env: CROWDIN_API_TOKEN
+preserve_hierarchy: true
 files:
   - source: /src/locales/en/messages.json
+    dest: /src/locales/en/%file_name%.%file_extension%
     translation: /src/locales/%two_letters_code%/%original_file_name%
     update_option: update_as_unapproved
     languages_mapping:

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "bitwarden-web",
-  "version": "2.23.0",
+  "name": "@bitwarden/web-vault",
+  "version": "2.28.1",
   "license": "GPL-3.0",
   "repository": "https://github.com/bitwarden/web",
   "scripts": {
@@ -29,60 +29,91 @@
     "dist:bit:selfhost": "npm run build:bit:selfhost:prod",
     "deploy": "npm run dist:bit && gh-pages -d build",
     "deploy:dev": "npm run dist:bit && gh-pages -d build -r git@github.com:kspearrin/bitwarden-web-dev.git",
-    "lint": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts' || true",
-    "lint:fix": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts' --fix"
+    "lint": "eslint . && prettier --check .",
+    "lint:fix": "eslint . --fix",
+    "prettier": "prettier --write .",
+    "prepare": "husky install"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "^11.2.11",
-    "@ngtools/webpack": "^11.2.10",
+    "@angular/compiler-cli": "^12.2.13",
+    "@ngtools/webpack": "^12.2.13",
     "@types/jquery": "^3.5.5",
-    "@types/node": "^14.17.2",
+    "@types/node": "^16.11.12",
     "@types/webcrypto": "^0.0.28",
-    "@types/webpack": "^4.4.27",
-    "clean-webpack-plugin": "^3.0.0",
-    "copy-webpack-plugin": "^6.4.0",
+    "@types/webpack": "^5.28.0",
+    "@typescript-eslint/eslint-plugin": "^5.10.1",
+    "@typescript-eslint/parser": "^5.10.1",
+    "autoprefixer": "^10.4.2",
+    "buffer": "^6.0.3",
+    "clean-webpack-plugin": "^4.0.0",
+    "copy-webpack-plugin": "^10.0.0",
     "cross-env": "^7.0.3",
-    "css-loader": "^5.2.3",
-    "del": "^6.0.0",
-    "file-loader": "^6.2.0",
+    "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": "^1.3.2",
+    "html-loader": "^3.0.1",
     "html-webpack-injector": "1.1.4",
-    "html-webpack-plugin": "^4.5.1",
-    "mini-css-extract-plugin": "^1.5.0",
+    "html-webpack-plugin": "^5.5.0",
+    "husky": "^7.0.4",
+    "lint-staged": "^12.1.2",
+    "mini-css-extract-plugin": "^2.4.5",
+    "postcss": "^8.4.6",
+    "postcss-loader": "^6.2.1",
+    "prettier": "2.5.1",
+    "process": "^0.11.10",
+    "rimraf": "^3.0.2",
     "sass": "^1.32.10",
-    "sass-loader": "^10.1.1",
-    "style-loader": "^2.0.0",
-    "tapable": "^1.1.3",
-    "terser-webpack-plugin": "^4.2.3",
-    "ts-loader": "^8.1.0",
-    "tslint": "^6.1.3",
-    "tslint-loader": "^3.5.4",
-    "typescript": "4.1.5",
-    "webpack": "^4.46.0",
-    "webpack-cli": "^4.6.0",
-    "webpack-dev-server": "^3.11.2"
+    "sass-loader": "^12.4.0",
+    "style-loader": "^3.3.1",
+    "tailwindcss": "^3.0.18",
+    "terser-webpack-plugin": "^5.2.5",
+    "ts-loader": "^9.2.5",
+    "typescript": "4.3.5",
+    "util": "^0.12.4",
+    "webpack": "^5.64.4",
+    "webpack-cli": "^4.9.1",
+    "webpack-dev-server": "^4.6.0"
   },
   "dependencies": {
+    "@angular/animations": "^12.2.13",
+    "@angular/cdk": "^12.2.13",
+    "@angular/common": "^12.2.13",
+    "@angular/compiler": "^12.2.13",
+    "@angular/core": "^12.2.13",
+    "@angular/forms": "^12.2.13",
+    "@angular/platform-browser": "^12.2.13",
+    "@angular/platform-browser-dynamic": "^12.2.13",
+    "@angular/router": "^12.2.13",
     "@bitwarden/jslib-angular": "file:jslib/angular",
     "@bitwarden/jslib-common": "file:jslib/common",
-    "angular2-toaster": "11.0.1",
     "bootstrap": "4.6.0",
-    "braintree-web-drop-in": "1.30.1",
+    "braintree-web-drop-in": "1.33.1",
     "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": "^1.3.1",
     "popper.js": "1.16.1",
     "qrious": "4.0.2",
+    "rxjs": "^7.4.0",
     "sweetalert2": "^10.16.6",
     "webcrypto-shim": "0.1.7",
-    "whatwg-fetch": "3.6.2"
+    "whatwg-fetch": "3.6.2",
+    "zone.js": "0.11.4"
   },
   "engines": {
-    "node": "~14",
-    "npm": "~7"
+    "node": "~16",
+    "npm": "~8"
+  },
+  "lint-staged": {
+    "./!(jslib)**": "prettier --ignore-unknown --write",
+    "*.ts": "eslint --fix",
+    "*.png": "node scripts/optimize.js"
   }
 }

postcss.config.js

@@ -0,0 +1,4 @@
+/* eslint-disable no-undef */
+module.exports = {
+  plugins: [require("tailwindcss"), require("autoprefixer"), require("postcss-nested")],
+};

scripts/optimize.js

@@ -0,0 +1,21 @@
+const child_process = require("child_process");
+const path = require("path");
+
+const images = process.argv.slice(2);
+
+images.forEach((img) => {
+  switch (img.split(".").pop()) {
+    case "png":
+      child_process.execSync(
+        `npx @squoosh/cli --oxipng {} --output-dir "${path.dirname(img)}" "${img}"`
+      );
+      break;
+    case "jpg":
+      child_process.execSync(
+        `npx @squoosh/cli --mozjpeg {"quality":85,"baseline":false,"arithmetic":false,"progressive":true,"optimize_coding":true,"smoothing":0,"color_space":3,"quant_table":3,"trellis_multipass":false,"trellis_opt_zero":false,"trellis_opt_table":false,"trellis_loops":1,"auto_subsample":true,"chroma_subsample":2,"separate_chroma_quality":false,"chroma_quality":75} --output-dir "${path.dirname(
+          img
+        )}" "${img}"`
+      );
+      break;
+  }
+});

src/404.html

@@ -1,50 +1,52 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-        <link href="/404/bootstrap.min.css" rel="stylesheet" type="text/css"
-            integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l">
-        <link href="/404/font-awesome.min.css" rel="stylesheet" type="text/css"
-            integrity="sha512-SfTiTlX6kk+qitfevl/7LibUOeJWlt9rbyDn92a1DqWOw9vWG2MFoays0sgObmWazO5BQPiFucnnEAjpAB+/Sw==">
-        <link href="/404/styles.css" rel="stylesheet" type="text/css">
+    <link
+      href="/404/bootstrap.min.css"
+      rel="stylesheet"
+      type="text/css"
+      integrity="sha384-hA/ESrxp2b05ywLtD9YwM6m+pNyLRY4+ruk6dWK00SM4k6SQs0bfrITJVSf6uZyH"
+    />
+    <link href="/404/styles.css" rel="stylesheet" type="text/css" />
 
-        <link rel="apple-touch-icon" sizes="180x180" href="/images/icons/apple-touch-icon.png">
-        <link rel="icon" type="image/png" sizes="32x32" href="/images/icons/favicon-32x32.png">
-        <link rel="icon" type="image/png" sizes="16x16" href="/images/icons/favicon-16x16.png">
-        <link rel="mask-icon" href="/images/icons/safari-pinned-tab.svg" color="#175DDC">
-        <link rel="manifest" href="/manifest.json">
+    <link rel="apple-touch-icon" sizes="180x180" href="/images/icons/apple-touch-icon.png" />
+    <link rel="icon" type="image/png" sizes="32x32" href="/images/icons/favicon-32x32.png" />
+    <link rel="icon" type="image/png" sizes="16x16" href="/images/icons/favicon-16x16.png" />
+    <link rel="mask-icon" href="/images/icons/safari-pinned-tab.svg" color="#175DDC" />
+    <link rel="manifest" href="/manifest.json" />
 
-        <title>Page not found!</title>
-        <meta name="description" content="404 Page Not Found">
-    </head>
+    <title>Page not found!</title>
+    <meta name="description" content="404 Page Not Found" />
+  </head>
 
-    <body>
-        <div class="banner">
-            <div class="container inner banner">
-                <div class="row align-items-center">
-                    <div class="col brand">
-                        <i class="fa fa-shield"></i>&nbsp;
-                        <strong>bit</strong>warden</span>
-                    </div>
-                </div>
-            </div>
+  <body>
+    <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>
-        <div class="container inner content">
-            <h2>Page not found!</h2>
-            <p>Sorry, but the page you were looking for could not be found.</p>
-            <p>
-                <a href="/">
-                    <img src="/images/404.png" class="img-fluid" alt="404 image" width="80%"/>
-                </a>
-            </p>
-            <p>You can <a href="/">return to the web vault</a>, check our <a href="https://status.bitwarden.com/">status page</a>
-                or <a href="https://bitwarden.com/contact/">contact us</a>.</p>
-        </div>
-        <div class="container footer text-muted content">
-            © Copyright 2021 Bitwarden, Inc.
-        </div>
-    </body>
+      </div>
+    </div>
+    <div class="container inner content">
+      <h2>Page not found!</h2>
+      <p>Sorry, but the page you were looking for could not be found.</p>
+      <p>
+        <a href="/">
+          <img src="/images/404.png" class="img-fluid" alt="404 image" width="80%" />
+        </a>
+      </p>
+      <p>
+        You can <a href="/">return to the web vault</a>, check our
+        <a href="https://status.bitwarden.com/">status page</a> or
+        <a href="https://bitwarden.com/contact/">contact us</a>.
+      </p>
+    </div>
+    <div class="container footer text-muted content">© Copyright 2022 Bitwarden, Inc.</div>
+  </body>
 </html>

src/404/styles.css

@@ -1,119 +1,151 @@
 @font-face {
-	font-family: 'Open Sans';
-	font-style: italic;
-	font-weight: 300;
-	src: url(../fonts/Open_Sans-italic-300.woff) format('woff');
-	unicode-range: U+0-10FFFF;
+  font-family: "Open Sans";
+  font-style: italic;
+  font-weight: 300;
+  src: url(../fonts/Open_Sans-italic-300.woff) format("woff");
+  unicode-range: U+0-10FFFF;
 }
 
 @font-face {
-	font-family: 'Open Sans';
-	font-style: italic;
-	font-weight: 400;
-	src: url(../fonts/Open_Sans-italic-400.woff) format('woff');
-	unicode-range: U+0-10FFFF;
+  font-family: "Open Sans";
+  font-style: italic;
+  font-weight: 400;
+  src: url(../fonts/Open_Sans-italic-400.woff) format("woff");
+  unicode-range: U+0-10FFFF;
 }
 
 @font-face {
-	font-family: 'Open Sans';
-	font-style: italic;
-	font-weight: 600;
-	src: url(../fonts/Open_Sans-italic-600.woff) format('woff');
-	unicode-range: U+0-10FFFF;
+  font-family: "Open Sans";
+  font-style: italic;
+  font-weight: 600;
+  src: url(../fonts/Open_Sans-italic-600.woff) format("woff");
+  unicode-range: U+0-10FFFF;
 }
 
 @font-face {
-	font-family: 'Open Sans';
-	font-style: italic;
-	font-weight: 700;
-	src: url(../fonts/Open_Sans-italic-700.woff) format('woff');
-	unicode-range: U+0-10FFFF;
+  font-family: "Open Sans";
+  font-style: italic;
+  font-weight: 700;
+  src: url(../fonts/Open_Sans-italic-700.woff) format("woff");
+  unicode-range: U+0-10FFFF;
 }
 
 @font-face {
-	font-family: 'Open Sans';
-	font-style: italic;
-	font-weight: 800;
-	src: url(../fonts/Open_Sans-italic-800.woff) format('woff');
-	unicode-range: U+0-10FFFF;
+  font-family: "Open Sans";
+  font-style: italic;
+  font-weight: 800;
+  src: url(../fonts/Open_Sans-italic-800.woff) format("woff");
+  unicode-range: U+0-10FFFF;
 }
 
 @font-face {
-	font-family: 'Open Sans';
-	font-style: normal;
-	font-weight: 300;
-	src: url(../fonts/Open_Sans-normal-300.woff) format('woff');
-	unicode-range: U+0-10FFFF;
+  font-family: "Open Sans";
+  font-style: normal;
+  font-weight: 300;
+  src: url(../fonts/Open_Sans-normal-300.woff) format("woff");
+  unicode-range: U+0-10FFFF;
 }
 
 @font-face {
-	font-family: 'Open Sans';
-	font-style: normal;
-	font-weight: 400;
-	src: url(../fonts/Open_Sans-normal-400.woff) format('woff');
-	unicode-range: U+0-10FFFF;
+  font-family: "Open Sans";
+  font-style: normal;
+  font-weight: 400;
+  src: url(../fonts/Open_Sans-normal-400.woff) format("woff");
+  unicode-range: U+0-10FFFF;
 }
 
 @font-face {
-	font-family: 'Open Sans';
-	font-style: normal;
-	font-weight: 600;
-	src: url(../fonts/Open_Sans-normal-600.woff) format('woff');
-	unicode-range: U+0-10FFFF;
+  font-family: "Open Sans";
+  font-style: normal;
+  font-weight: 600;
+  src: url(../fonts/Open_Sans-normal-600.woff) format("woff");
+  unicode-range: U+0-10FFFF;
 }
 
 @font-face {
-	font-family: 'Open Sans';
-	font-style: normal;
-	font-weight: 700;
-	src: url(../fonts/Open_Sans-normal-700.woff) format('woff');
-	unicode-range: U+0-10FFFF;
+  font-family: "Open Sans";
+  font-style: normal;
+  font-weight: 700;
+  src: url(../fonts/Open_Sans-normal-700.woff) format("woff");
+  unicode-range: U+0-10FFFF;
 }
 
 @font-face {
-	font-family: 'Open Sans';
-	font-style: normal;
-	font-weight: 800;
-	src: url(../fonts/Open_Sans-normal-800.woff) format('woff');
-	unicode-range: U+0-10FFFF;
+  font-family: "Open Sans";
+  font-style: normal;
+  font-weight: 800;
+  src: url(../fonts/Open_Sans-normal-800.woff) format("woff");
+  unicode-range: U+0-10FFFF;
 }
 
 body {
-    font-family: 'Open Sans';
+  font-family: "Open Sans";
 }
 
-html, body, .row {
-    height: 100%;
-    -webkit-font-smoothing: antialiased;
+html,
+body,
+.row {
+  height: 100%;
+  -webkit-font-smoothing: antialiased;
 }
 
 h2 {
-    font-size: 25px;
-    margin-bottom: 12.5px;
-    font-weight: 500;
-    line-height: 1.1;
+  font-size: 25px;
+  margin-bottom: 12.5px;
+  font-weight: 500;
+  line-height: 1.1;
 }
 
 .brand {
   font-size: 23px;
   line-height: 25px;
   color: #fff;
-  font-family: "Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 
 .banner {
-    background-color: #175DDC;
-    height: 56px;
+  background-color: #175ddc;
+  height: 56px;
 }
 
 .content {
-    padding-top: 20px;
-    padding-bottom: 20px;
-    padding-left: 15px;
-    padding-right: 15px;
+  padding-top: 20px;
+  padding-bottom: 20px;
+  padding-left: 15px;
+  padding-right: 15px;
 }
 
 .footer {
-    padding: 40px 0 40px 0;
-    border-top: 1px solid #dee2e6;
+  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

@@ -0,0 +1,9 @@
+import { StateService as BaseStateService } from "jslib-common/abstractions/state.service";
+import { StorageOptions } from "jslib-common/models/domain/storageOptions";
+
+import { Account } from "src/models/account";
+
+export abstract class StateService extends BaseStateService<Account> {
+  getRememberEmail: (options?: StorageOptions) => Promise<boolean>;
+  setRememberEmail: (value: boolean, options?: StorageOptions) => Promise<void>;
+}

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

@@ -1,34 +1,45 @@
 <div class="mt-5 d-flex justify-content-center" *ngIf="loading">
-    <div>
-        <img class="mb-4 logo logo-themed" alt="Bitwarden">
-        <p class="text-center">
-            <i class="fa fa-spinner fa-spin fa-2x text-muted" title="{{'loading' | i18n}}" aria-hidden="true"></i>
-            <span class="sr-only">{{'loading' | i18n}}</span>
-        </p>
-    </div>
+  <div>
+    <img class="mb-4 logo logo-themed" alt="Bitwarden" />
+    <p class="text-center">
+      <i
+        class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
+        title="{{ 'loading' | i18n }}"
+        aria-hidden="true"
+      ></i>
+      <span class="sr-only">{{ "loading" | i18n }}</span>
+    </p>
+  </div>
 </div>
 <div class="container" *ngIf="!loading && !authed">
-    <div class="row justify-content-md-center mt-5">
-        <div class="col-5">
-            <p class="lead text-center mb-4">{{'emergencyAccess' | i18n}}</p>
-            <div class="card d-block">
-                <div class="card-body">
-                    <p class="text-center">
-                        {{name}}
-                    </p>
-                    <p>{{'acceptEmergencyAccess' | i18n}}</p>
-                    <hr>
-                    <div class="d-flex">
-                        <a routerLink="/" [queryParams]="{email: email}" class="btn btn-primary btn-block">
-                            {{'logIn' | i18n}}
-                        </a>
-                        <a routerLink="/register" [queryParams]="{email: email}"
-                            class="btn btn-primary btn-block ml-2 mt-0">
-                            {{'createAccount' | i18n}}
-                        </a>
-                    </div>
-                </div>
-            </div>
+  <div class="row justify-content-md-center mt-5">
+    <div class="col-5">
+      <p class="lead text-center mb-4">{{ "emergencyAccess" | i18n }}</p>
+      <div class="card d-block">
+        <div class="card-body">
+          <p class="text-center">
+            {{ name }}
+          </p>
+          <p>{{ "acceptEmergencyAccess" | i18n }}</p>
+          <hr />
+          <div class="d-flex">
+            <a
+              routerLink="/login"
+              [queryParams]="{ email: email }"
+              class="btn btn-primary btn-block"
+            >
+              {{ "logIn" | i18n }}
+            </a>
+            <a
+              routerLink="/register"
+              [queryParams]="{ email: email }"
+              class="btn btn-primary btn-block ml-2 mt-0"
+            >
+              {{ "createAccount" | i18n }}
+            </a>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 </div>

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

@@ -1,60 +1,55 @@
-import { Component } from '@angular/core';
-import {
-    ActivatedRoute,
-    Router,
-} from '@angular/router';
+import { Component } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
 
-import {
-    Toast,
-    ToasterService,
-} from 'angular2-toaster';
+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 { EmergencyAccessAcceptRequest } from "jslib-common/models/request/emergencyAccessAcceptRequest";
 
-import { ApiService } from 'jslib-common/abstractions/api.service';
-import { I18nService } from 'jslib-common/abstractions/i18n.service';
-import { StateService } from 'jslib-common/abstractions/state.service';
-import { UserService } from 'jslib-common/abstractions/user.service';
-import { EmergencyAccessAcceptRequest } from 'jslib-common/models/request/emergencyAccessAcceptRequest';
-import { BaseAcceptComponent } from '../common/base.accept.component';
+import { BaseAcceptComponent } from "../common/base.accept.component";
 
 @Component({
-    selector: 'app-accept-emergency',
-    templateUrl: 'accept-emergency.component.html',
+  selector: "app-accept-emergency",
+  templateUrl: "accept-emergency.component.html",
 })
 export class AcceptEmergencyComponent extends BaseAcceptComponent {
+  name: string;
 
-    name: string;
+  protected requiredParameters: string[] = ["id", "name", "email", "token"];
+  protected failedShortMessage = "emergencyInviteAcceptFailedShort";
+  protected failedMessage = "emergencyInviteAcceptFailed";
 
-    protected requiredParameters: string[] = ['id', 'name', 'email', 'token'];
-    protected failedShortMessage = 'emergencyInviteAcceptFailedShort';
-    protected failedMessage = 'emergencyInviteAcceptFailed';
+  constructor(
+    router: Router,
+    platformUtilsService: PlatformUtilsService,
+    i18nService: I18nService,
+    route: ActivatedRoute,
+    private apiService: ApiService,
+    stateService: StateService
+  ) {
+    super(router, platformUtilsService, i18nService, route, stateService);
+  }
 
-    constructor(router: Router, toasterService: ToasterService,
-        i18nService: I18nService, route: ActivatedRoute,
-        private apiService: ApiService, userService: UserService,
-        stateService: StateService) {
-        super(router, toasterService, i18nService, route, userService, stateService);
-    }
-
-    async authedHandler(qParams: any): Promise<void> {
-        const request = new EmergencyAccessAcceptRequest();
-        request.token = qParams.token;
-        this.actionPromise = this.apiService.postEmergencyAccessAccept(qParams.id, request);
-        await this.actionPromise;
-        const toast: Toast = {
-            type: 'success',
-            title: this.i18nService.t('inviteAccepted'),
-            body: this.i18nService.t('emergencyInviteAcceptedDesc'),
-            timeout: 10000,
-        };
-        this.toasterService.popAsync(toast);
-        this.router.navigate(['/vault']);
-    }
-
-    async unauthedHandler(qParams: any): Promise<void> {
-        this.name = qParams.name;
-        if (this.name != null) {
-            // Fix URL encoding of space issue with Angular
-            this.name = this.name.replace(/\+/g, ' ');
-        }
+  async authedHandler(qParams: any): Promise<void> {
+    const request = new EmergencyAccessAcceptRequest();
+    request.token = qParams.token;
+    this.actionPromise = this.apiService.postEmergencyAccessAccept(qParams.id, request);
+    await this.actionPromise;
+    this.platformUtilService.showToast(
+      "success",
+      this.i18nService.t("inviteAccepted"),
+      this.i18nService.t("emergencyInviteAcceptedDesc"),
+      { timeout: 10000 }
+    );
+    this.router.navigate(["/vault"]);
+  }
+
+  async unauthedHandler(qParams: any): Promise<void> {
+    this.name = qParams.name;
+    if (this.name != null) {
+      // Fix URL encoding of space issue with Angular
+      this.name = this.name.replace(/\+/g, " ");
     }
+  }
 }

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

@@ -1,35 +1,46 @@
 <div class="mt-5 d-flex justify-content-center" *ngIf="loading">
-    <div>
-        <img src="../../images/logo-dark@2x.png" class="mb-4 logo" alt="Bitwarden">
-        <p class="text-center">
-            <i class="fa fa-spinner fa-spin fa-2x text-muted" title="{{'loading' | i18n}}" aria-hidden="true"></i>
-            <span class="sr-only">{{'loading' | i18n}}</span>
-        </p>
-    </div>
+  <div>
+    <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"
+        title="{{ 'loading' | i18n }}"
+        aria-hidden="true"
+      ></i>
+      <span class="sr-only">{{ "loading" | i18n }}</span>
+    </p>
+  </div>
 </div>
 <div class="container" *ngIf="!loading && !authed">
-    <div class="row justify-content-md-center mt-5">
-        <div class="col-5">
-            <p class="lead text-center mb-4">{{'joinOrganization' | i18n}}</p>
-            <div class="card d-block">
-                <div class="card-body">
-                    <p class="text-center">
-                        {{orgName}}
-                        <strong class="d-block mt-2">{{email}}</strong>
-                    </p>
-                    <p>{{'joinOrganizationDesc' | i18n}}</p>
-                    <hr>
-                    <div class="d-flex">
-                        <a routerLink="/" [queryParams]="{email: email}" class="btn btn-primary btn-block">
-                            {{'logIn' | i18n}}
-                        </a>
-                        <a routerLink="/register" [queryParams]="{email: email}"
-                            class="btn btn-primary btn-block ml-2 mt-0">
-                            {{'createAccount' | i18n}}
-                        </a>
-                    </div>
-                </div>
-            </div>
+  <div class="row justify-content-md-center mt-5">
+    <div class="col-5">
+      <p class="lead text-center mb-4">{{ "joinOrganization" | i18n }}</p>
+      <div class="card d-block">
+        <div class="card-body">
+          <p class="text-center">
+            {{ orgName }}
+            <strong class="d-block mt-2">{{ email }}</strong>
+          </p>
+          <p>{{ "joinOrganizationDesc" | i18n }}</p>
+          <hr />
+          <div class="d-flex">
+            <a
+              routerLink="/login"
+              [queryParams]="{ email: email }"
+              class="btn btn-primary btn-block"
+            >
+              {{ "logIn" | i18n }}
+            </a>
+            <a
+              routerLink="/register"
+              [queryParams]="{ email: email }"
+              class="btn btn-primary btn-block ml-2 mt-0"
+            >
+              {{ "createAccount" | i18n }}
+            </a>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 </div>

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

@@ -1,114 +1,126 @@
-import { Component } from '@angular/core';
-import {
-    ActivatedRoute,
-    Router,
-} from '@angular/router';
+import { Component } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
 
-import {
-    Toast,
-    ToasterService,
-} from 'angular2-toaster';
+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 { 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 { ApiService } from 'jslib-common/abstractions/api.service';
-import { CryptoService } from 'jslib-common/abstractions/crypto.service';
-import { I18nService } from 'jslib-common/abstractions/i18n.service';
-import { PolicyService } from 'jslib-common/abstractions/policy.service';
-import { StateService } from 'jslib-common/abstractions/state.service';
-import { UserService } from 'jslib-common/abstractions/user.service';
-
-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';
+import { BaseAcceptComponent } from "../common/base.accept.component";
 
 @Component({
-    selector: 'app-accept-organization',
-    templateUrl: 'accept-organization.component.html',
+  selector: "app-accept-organization",
+  templateUrl: "accept-organization.component.html",
 })
 export class AcceptOrganizationComponent extends BaseAcceptComponent {
-    orgName: string;
+  orgName: string;
 
-    protected requiredParameters: string[] = ['organizationId', 'organizationUserId', 'token'];
+  protected requiredParameters: string[] = ["organizationId", "organizationUserId", "token"];
 
-    constructor(router: Router, toasterService: ToasterService,
-        i18nService: I18nService, route: ActivatedRoute,
-        private apiService: ApiService, userService: UserService,
-        stateService: StateService, private cryptoService: CryptoService,
-        private policyService: PolicyService) {
-        super(router, toasterService, i18nService, route, userService, stateService);
+  constructor(
+    router: Router,
+    platformUtilsService: PlatformUtilsService,
+    i18nService: I18nService,
+    route: ActivatedRoute,
+    private apiService: ApiService,
+    stateService: StateService,
+    private cryptoService: CryptoService,
+    private policyService: PolicyService,
+    private logService: LogService
+  ) {
+    super(router, platformUtilsService, i18nService, route, stateService);
+  }
+
+  async authedHandler(qParams: any): Promise<void> {
+    const request = new OrganizationUserAcceptRequest();
+    request.token = qParams.token;
+    if (await this.performResetPasswordAutoEnroll(qParams)) {
+      this.actionPromise = this.apiService
+        .postOrganizationUserAccept(qParams.organizationId, qParams.organizationUserId, request)
+        .then(() => {
+          // Retrieve Public Key
+          return this.apiService.getOrganizationKeys(qParams.organizationId);
+        })
+        .then(async (response) => {
+          if (response == null) {
+            throw new Error(this.i18nService.t("resetPasswordOrgKeysError"));
+          }
+
+          const publicKey = Utils.fromB64ToArray(response.publicKey);
+
+          // RSA Encrypt user's encKey.key with organization public key
+          const encKey = await this.cryptoService.getEncKey();
+          const encryptedKey = await this.cryptoService.rsaEncrypt(encKey.key, publicKey.buffer);
+
+          // Create request and execute enrollment
+          const resetRequest = new OrganizationUserResetPasswordEnrollmentRequest();
+          resetRequest.resetPasswordKey = encryptedKey.encryptedString;
+
+          return this.apiService.putOrganizationUserResetPasswordEnrollment(
+            qParams.organizationId,
+            await this.stateService.getUserId(),
+            resetRequest
+          );
+        });
+    } else {
+      this.actionPromise = this.apiService.postOrganizationUserAccept(
+        qParams.organizationId,
+        qParams.organizationUserId,
+        request
+      );
     }
 
-    async authedHandler(qParams: any): Promise<void> {
-        const request = new OrganizationUserAcceptRequest();
-        request.token = qParams.token;
-        if (await this.performResetPasswordAutoEnroll(qParams)) {
-            this.actionPromise = this.apiService.postOrganizationUserAccept(qParams.organizationId,
-                qParams.organizationUserId, request).then(() => {
-                    // Retrieve Public Key
-                    return this.apiService.getOrganizationKeys(qParams.organizationId);
-                }).then(async response => {
-                    if (response == null) {
-                        throw new Error(this.i18nService.t('resetPasswordOrgKeysError'));
-                    }
+    await this.actionPromise;
+    this.platformUtilService.showToast(
+      "success",
+      this.i18nService.t("inviteAccepted"),
+      this.i18nService.t("inviteAcceptedDesc"),
+      { timeout: 10000 }
+    );
 
-                    const publicKey = Utils.fromB64ToArray(response.publicKey);
+    await this.stateService.setOrganizationInvitation(null);
+    this.router.navigate(["/vault"]);
+  }
 
-                    // RSA Encrypt user's encKey.key with organization public key
-                    const encKey = await this.cryptoService.getEncKey();
-                    const encryptedKey = await this.cryptoService.rsaEncrypt(encKey.key, publicKey.buffer);
+  async unauthedHandler(qParams: any): Promise<void> {
+    this.orgName = qParams.organizationName;
+    if (this.orgName != null) {
+      // Fix URL encoding of space issue with Angular
+      this.orgName = this.orgName.replace(/\+/g, " ");
+    }
+    await this.stateService.setOrganizationInvitation(qParams);
+  }
 
-                    // Create request and execute enrollment
-                    const resetRequest = new OrganizationUserResetPasswordEnrollmentRequest();
-                    resetRequest.resetPasswordKey = encryptedKey.encryptedString;
-
-                    // Get User Id
-                    const userId = await this.userService.getUserId();
-
-                    return this.apiService.putOrganizationUserResetPasswordEnrollment(qParams.organizationId, userId, resetRequest);
-                });
-        } else {
-            this.actionPromise = this.apiService.postOrganizationUserAccept(qParams.organizationId,
-                qParams.organizationUserId, request);
-        }
-
-        await this.actionPromise;
-        const toast: Toast = {
-            type: 'success',
-            title: this.i18nService.t('inviteAccepted'),
-            body: this.i18nService.t('inviteAcceptedDesc'),
-            timeout: 10000,
-        };
-        this.toasterService.popAsync(toast);
-
-        await this.stateService.remove('orgInvitation');
-        this.router.navigate(['/vault']);
+  private async performResetPasswordAutoEnroll(qParams: any): Promise<boolean> {
+    let policyList: Policy[] = null;
+    try {
+      const policies = await this.apiService.getPoliciesByToken(
+        qParams.organizationId,
+        qParams.token,
+        qParams.email,
+        qParams.organizationUserId
+      );
+      policyList = this.policyService.mapPoliciesFromToken(policies);
+    } catch (e) {
+      this.logService.error(e);
     }
 
-    async unauthedHandler(qParams: any): Promise<void> {
-        this.orgName = qParams.organizationName;
-        if (this.orgName != null) {
-            // Fix URL encoding of space issue with Angular
-            this.orgName = this.orgName.replace(/\+/g, ' ');
-        }
-        await this.stateService.save('orgInvitation', qParams);
+    if (policyList != null) {
+      const result = this.policyService.getResetPasswordPolicyOptions(
+        policyList,
+        qParams.organizationId
+      );
+      // Return true if policy enabled and auto-enroll enabled
+      return result[1] && result[0].autoEnrollEnabled;
     }
 
-    private async performResetPasswordAutoEnroll(qParams: any): Promise<boolean> {
-        let policyList: Policy[] = null;
-        try {
-            const policies = await this.apiService.getPoliciesByToken(qParams.organizationId, qParams.token,
-                qParams.email, qParams.organizationUserId);
-            policyList = this.policyService.mapPoliciesFromToken(policies);
-        } catch { }
-
-        if (policyList != null) {
-            const result = this.policyService.getResetPasswordPolicyOptions(policyList, qParams.organizationId);
-            // Return true if policy enabled and auto-enroll enabled
-            return result[1] && result[0].autoEnrollEnabled;
-        }
-
-        return false;
-    }
+    return false;
+  }
 }