reverting the Chinese translations that got swapped (#1150)

(cherry picked from commit c7de347cec)

.editorconfig

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

.git-blame-ignore-revs

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

.gitattributes

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

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,93 +0,0 @@
-name: Bug Report
-description: File a bug report
-labels: [bug]
-body:
-  - type: markdown
-    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
-    attributes:
-      label: Steps To Reproduce
-      description: How can we reproduce the behavior.
-      value: |
-        1. Go to '...'
-        2. Click on '....'
-        3. Scroll down to '....'
-        4. Click on '...'
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected Result
-      description: A clear and concise description of what you expected to happen.
-    validations:
-      required: true
-  - type: textarea
-    id: actual
-    attributes:
-      label: Actual Result
-      description: A clear and concise description of what is happening.
-    validations:
-      required: true
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: Screenshots or Videos
-      description: If applicable, add screenshots and/or a short video to help explain your problem.
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional Context
-      description: Add any other context about the problem here.
-  - type: dropdown
-    id: os
-    attributes:
-      label: Operating System
-      description: What operating system are you seeing the problem on?
-      multiple: true
-      options:
-        - Windows
-        - macOS
-        - Linux
-        - Android
-        - iOS
-    validations:
-      required: true
-  - type: input
-    id: os-version
-    attributes:
-      label: Operating System Version
-      description: What version of the operating system(s) are you seeing the problem on?
-  - type: dropdown
-    id: browsers
-    attributes:
-      label: Web Browser
-      description: What browser(s) are you seeing the problem on?
-      multiple: true
-      options:
-        - Chrome
-        - Safari
-        - Microsoft Edge
-        - Firefox
-        - Opera
-        - Brave
-        - Vivaldi
-    validations:
-      required: true
-  - type: input
-    id: browser-version
-    attributes:
-      label: Browser Version
-      description: What version of the browser(s) are you seeing the problem on?
-  - type: input
-    id: version
-    attributes:
-      label: Build Version
-      description: What version of our software are you running? (Bottom of the page)
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,14 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Feature Requests
-    url: https://community.bitwarden.com/c/feature-requests/
-    about: Request new features using the Community Forums. Please search existing feature requests before making a new one.
-  - name: Bitwarden Community Forums
-    url: https://community.bitwarden.com
-    about: Please visit the community forums for general community discussion, support and the development roadmap.
-  - name: Customer Support
-    url: https://bitwarden.com/contact/
-    about: Please contact our customer support for account issues and general customer support.
-  - name: Security Issues
-    url: https://hackerone.com/bitwarden
-    about: We use HackerOne to manage security disclosures.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,32 +0,0 @@
-## 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-->
-
-## Testing requirements
-
-<!--What functionality requires testing by QA? This includes testing new behavior and regression testing-->
-
-## 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

@@ -1,4 +1,3 @@
----
 name: Build
 
 on:
@@ -9,13 +8,13 @@ on:
         required: false
   push:
     branches-ignore:
-      - "l10n_master"
-      - "gh-pages"
+      - 'l10n_master'
+      - 'gh-pages'
 
 jobs:
   cloc:
     name: CLOC
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
@@ -28,131 +27,26 @@ jobs:
       - name: Print lines of code
         run: cloc --include-lang TypeScript,JavaScript,HTML,Sass,CSS --vcs git
 
-  setup:
-    name: Setup
-    runs-on: ubuntu-20.04
-    outputs:
-      version: ${{ steps.version.outputs.value }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
-      - name: Get GitHub sha as version
-        id: version
-        run: echo "::set-output name=value::${GITHUB_SHA:0:7}"
-
-  build-oss-selfhost:
-    name: Build OSS zip
-    runs-on: ubuntu-20.04
-    needs: setup
-    env:
-      _VERSION: ${{ needs.setup.outputs.version }}
-    steps:
-      - name: Set up Node
-        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
-        with:
-          node-version: "16"
-
-      - name: Cache npm
-        id: npm-cache
-        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353  # v2.1.6
-        with:
-          path: "~/.npm"
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
-
-      - name: Print environment
-        run: |
-          whoami
-          node --version
-          npm --version
-          gulp --version
-          docker --version
-          echo "GitHub ref: $GITHUB_REF"
-          echo "GitHub event: $GITHUB_EVENT"
-
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build OSS selfhost
-        run: |
-          npm run dist:oss:selfhost
-          zip -r web-$_VERSION-selfhosted-open-source.zip build
-
-      - name: Upload build artifact
-        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.3
-        with:
-          name: web-${{ env._VERSION }}-selfhosted-open-source.zip
-          path: ./web-${{ env._VERSION }}-selfhosted-open-source.zip
-          if-no-files-found: error
-
-  build-cloud:
-    name: Build Cloud zip
-    runs-on: ubuntu-20.04
-    needs: setup
-    env:
-      _VERSION: ${{ needs.setup.outputs.version }}
-    steps:
-      - name: Set up Node
-        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
-        with:
-          node-version: "16"
-
-      - name: Cache npm
-        id: npm-cache
-        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353  # v2.1.6
-        with:
-          path: "~/.npm"
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
-
-      - name: Print environment
-        run: |
-          whoami
-          node --version
-          npm --version
-          gulp --version
-          docker --version
-          echo "GitHub ref: $GITHUB_REF"
-          echo "GitHub event: $GITHUB_EVENT"
-
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build Cloud
-        run: |
-          npm run dist:bit:cloud
-          zip -r web-$_VERSION-cloud-COMMERCIAL.zip build
-
-      - name: Upload build artifact
-        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.3
-        with:
-          name: web-${{ env._VERSION }}-cloud-COMMERCIAL.zip
-          path: ./web-${{ env._VERSION }}-cloud-COMMERCIAL.zip
-          if-no-files-found: error
-
-  build-commercial-selfhost:
+  build-selfhost:
     name: Build SelfHost Docker image
-    runs-on: ubuntu-20.04
-    needs: setup
-    env:
-      _VERSION: ${{ needs.setup.outputs.version }}
+    runs-on: ubuntu-latest
     steps:
       - name: Set up Node
         uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
         with:
-          node-version: "16"
+          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
+        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353 # v2.1.6
         with:
-          path: "~/.npm"
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+          path: '~/.npm'
+          key: ${{ runner.os }}-${{ github.run_id }}-npm-${{ hashFiles('**/package-lock.json') }}
 
       - name: Print environment
         run: |
@@ -164,13 +58,39 @@ jobs:
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
 
-      - name: Setup DCT
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix'
-        id: setup-dct
-        uses: bitwarden/gh-actions/setup-docker-trust@a8c384a05a974c05c48374c818b004be221d43ff
+      - name: Login to Azure
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
+        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
         with:
-          azure-creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
-          azure-keyvault-name: "bitwarden-prod-kv"
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
+
+      - name: Retrieve secrets
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
+        id: retrieve-secrets
+        uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403
+        with:
+          keyvault: "bitwarden-prod-kv"
+          secrets: "docker-password, 
+                    docker-username,
+                    dct-delegate-2-repo-passphrase,
+                    dct-delegate-2-key"
+
+      - name: Log into Docker
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
+        run: echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+        env:
+          DOCKER_USERNAME: ${{ steps.retrieve-secrets.outputs.docker-username }}
+          DOCKER_PASSWORD: ${{ steps.retrieve-secrets.outputs.docker-password }}
+
+      - name: Setup Docker Trust
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
+        run: |
+          mkdir -p ~/.docker/trust/private
+
+          echo "$DCT_DELEGATE_KEY" > ~/.docker/trust/private/$DCT_DELEGATION_KEY_ID.key
+        env:
+          DCT_DELEGATION_KEY_ID: "c9bde8ec820701516491e5e03d3a6354e7bd66d05fa3df2b0062f68b116dc59c"
+          DCT_DELEGATE_KEY: ${{ steps.retrieve-secrets.outputs.dct-delegate-2-key }}
 
       - name: Checkout repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
@@ -179,26 +99,15 @@ jobs:
         run: dotnet tool restore
 
       - name: Install dependencies
-        run: npm ci
+        run: npm install
 
       - name: Build
         run: |
           echo -e "# Building Web\n"
           echo "Building app"
           echo "npm version $(npm --version)"
+          npm run dist:selfhost
 
-          npm run dist:bit:selfhost
-          zip -r web-$_VERSION-selfhosted-COMMERCIAL.zip build
-
-      - name: Upload build artifact
-        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.3
-        with:
-          name: web-${{ env._VERSION }}-selfhosted-COMMERCIAL.zip
-          path: ./web-${{ env._VERSION }}-selfhosted-COMMERCIAL.zip
-          if-no-files-found: error
-
-      - name: Build Docker image
-        run: |
           echo -e "\nBuilding Docker image"
           docker --version
           docker build -t bitwarden/web .
@@ -211,54 +120,48 @@ 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'
-        run: docker tag bitwarden/web bitwarden/web:hotfix
-
       - name: List Docker images
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
         run: docker images
 
-      - name: Push rc image
+      - name: Push rc images
         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 }}
+          DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.retrieve-secrets.outputs.dct-delegate-2-repo-passphrase }}
 
-      - name: Push dev image
+      - name: Push dev images
         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'
-        run: docker push bitwarden/web:hotfix
-        env:
-          DOCKER_CONTENT_TRUST: 1
-          DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.setup-dct.outputs.dct-delegate-repo-passphrase }}
+          DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.retrieve-secrets.outputs.dct-delegate-2-repo-passphrase }}
 
       - name: Log out of Docker
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix'
+        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
+    name: Build QA Docker image
+    runs-on: ubuntu-latest
     steps:
       - name: Set up Node
         uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
         with:
-          node-version: "16"
+          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
+        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353 # v2.1.6
         with:
-          path: "~/.npm"
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+          path: '~/.npm'
+          key: ${{ runner.os }}-${{ github.run_id }}-npm-${{ hashFiles('**/package-lock.json') }}
 
       - name: Print environment
         run: |
@@ -292,23 +195,17 @@ jobs:
           echo -e "# Building Web\n"
           echo "Building app"
           echo "npm version $(npm --version)"
-          VERSION=$( jq -r ".version" package.json)
-          jq --arg version "$VERSION - ${GITHUB_SHA:0:7}" '.version = $version' package.json > package.json.tmp
-          mv package.json.tmp package.json
-
-          npm run build:bit:qa
-
-          echo "{\"commit_hash\": \"$GITHUB_SHA\", \"ref\": \"$GITHUB_REF\"}" | jq . > build/info.json
+          npm run build:qa
 
           echo -e "\nBuilding Docker image"
           docker --version
           docker build -t bitwardenqa.azurecr.io/web .
 
       - name: Get image tag
-        id: image-tag
+        id: image_tag
         run: |
-          IMAGE_TAG=$(echo "${GITHUB_REF:11}" | sed "s#/#-#g")
-          TAG_EXTENSION=${{ github.event.inputs.custom_tag_extension }}
+          IMAGE_TAG=$(echo "$GITHUB_REF" | awk '{split($0, a, "/"); print a[3];}')
+          TAG_EXTENSION=${{ github.events.inputs.custom_tag_extension }}
 
           if [[ $TAG_EXTENSION ]]; then
             IMAGE_TAG=$IMAGE_TAG-$TAG_EXTENSION
@@ -317,7 +214,7 @@ jobs:
 
       - name: Tag image
         env:
-          IMAGE_TAG: ${{ steps.image-tag.outputs.value }}
+          IMAGE_TAG: ${{ steps.image_tag.outputs.value }}
         run: docker tag bitwardenqa.azurecr.io/web "bitwardenqa.azurecr.io/web:$IMAGE_TAG"
 
       - name: Tag dev
@@ -329,7 +226,7 @@ jobs:
 
       - name: Push image
         env:
-          IMAGE_TAG: ${{ steps.image-tag.outputs.value }}
+          IMAGE_TAG: ${{ steps.image_tag.outputs.value }}
         run: docker push "bitwardenqa.azurecr.io/web:$IMAGE_TAG"
 
       - name: Push dev images
@@ -339,29 +236,27 @@ jobs:
       - name: Log out of Docker
         run: docker logout
 
+
   windows:
     name: Test code on Windows
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
       - name: Set up NuGet
         uses: nuget/setup-nuget@04b0c2b8d1b97922f67eca497d7cf0bf17b8ffe1
         with:
-          nuget-version: "latest"
+          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') }}
-
       - name: Set up Node
         uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
         with:
-          node-version: "16"
+          node-version: '14'
+
+      - name: Update NPM
+        run: |
+          npm install -g npm@7
 
       - name: Print environment
         run: |
@@ -379,115 +274,9 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
-      - name: Install dependencies
-        run: npm ci
+      - name: npm install
+        run: npm install
 
-      - name: Run linter
-        run: npm run lint
+      - name: npm build
+        run: npm run build:prod
 
-      - 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
-      - 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 }}
-          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 [ "$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,49 +0,0 @@
----
-name: Crowdin Pull
-
-on:
-  workflow_dispatch:
-    inputs: {}
-  schedule:
-    - cron: "0 0 * * 5"
-
-jobs:
-  crowdin-pull:
-    name: Pull
-    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: Download translations
-        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: false
-          upload_translations: false
-          download_translations: true
-          github_user_name: "github-actions"
-          github_user_email: "<>"
-          commit_message: "Autosync the updated translations"
-          localization_branch_name: crowdin-auto-sync
-          create_pull_request: true
-          pull_request_title: "Autosync Crowdin Translations"
-          pull_request_body: "Autosync the updated translations"

.github/workflows/crowdin-sync.yml

@@ -0,0 +1,133 @@
+name: Crowdin Sync
+
+on:
+  workflow_dispatch:
+    inputs: {}
+  #schedule:
+  #  - cron: '0 0 * * *'
+
+jobs:
+  crowdin-sync:
+    name: Autosync
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
+
+      - name: Setup git config
+        run: |
+          git config user.name = "GitHub Action Bot"
+          git config user.email = "<>"
+
+      - name: Get Crowndin Sync Branch
+        id: branch
+        run: |
+          BRANCH_NAME=crowdin-auto-sync
+          BRANCH_EXISTED=true
+
+          git fetch -a
+          git switch master
+          if [ $(git branch -a | egrep "remotes/origin/${BRANCH_NAME}$" | wc -l) -eq 0 ]; then
+            BRANCH_EXISTED=false
+            git switch -c $BRANCH_NAME
+          else
+            git switch $BRANCH_NAME
+          fi
+          git branch
+
+          echo "::set-output name=branch-existed::${BRANCH_EXISTED}"
+          echo "::set-output name=branch-name::${BRANCH_NAME}"
+
+      - 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: Get Crowdin updates
+        env:
+          CROWDIN_BASE_URL="https://api.crowdin.com/api/v2/projects"
+          CROWDIN_PROJECT_ID="308189"
+        run: |
+          # Step 1: GET master branchId
+          BRANCH_ID=$(
+              curl -s -H "Authorization: Bearer $CROWDIN_API_TOKEN" \
+              $CROWDIN_BASE_URL/$CROWDIN_PROJECT_ID/branches | jq -r '.data[0].data.id'
+          )
+
+          # Step 2: POST Build the translations and get store build id
+          BUILD_ID=$(
+              curl -X POST -s \
+              -H "Authorization: Bearer $CROWDIN_API_TOKEN" \
+              -H "Content-Type: application/json" \
+              $CROWDIN_BASE_URL/$CROWDIN_PROJECT_ID/translations/builds \
+              -d "{\"branchId\": $BRANCH_ID}" | jq -r '.data.id'
+          )
+
+          MAX_TRIES=12
+          for try in {1..$MAX_TRIES}; do
+              BRANCH_STATUS=$(
+                  curl -s -H "Authorization: Bearer $CROWDIN_API_TOKEN" \
+                  $CROWDIN_BASE_URL/$CROWDIN_PROJECT_ID/translations/builds/$BUILD_ID | jq -r '.data.status'
+              )
+              echo "[*] Build status: $BRANCH_STATUS"
+              if [[ "$BRANCH_STATUS" == "finished" ]]; then
+                  break
+              fi
+
+              if [[ $try -eq $MAX_TRIES ]]; then
+                  echo "[!] Exceeded tries: $try"
+                  exit 1
+              else
+                  sleep 5
+              fi
+          done
+
+          # Step 4: when build is finished, get download url
+          DOWNLOAD_URL=$(
+              curl -s -H "Authorization: Bearer $CROWDIN_API_TOKEN" \
+              $CROWDIN_BASE_URL/$CROWDIN_PROJECT_ID/translations/builds/$BUILD_ID/download | jq -r '.data.url'
+          )
+
+          # Step 5: download the translations via the download url
+          SAVE_FILE=translations.zip
+          curl -s $DOWNLOAD_URL --output $SAVE_FILE
+          echo "[*]    Saved to: $SAVE_FILE"
+
+          # Step 6: Unzip and cleanup
+          unzip -o $SAVE_FILE
+          rm $SAVE_FILE
+
+      - name: Commit changes
+        env:
+          BRANCH_NAME: ${{ steps.branch.outputs.branch-name }}
+        run: |
+          echo "[*] Adding new translations"
+          git add .
+          echo "=====Translations Changed====="
+          git status
+          echo "=============================="
+          echo "[*] Committing"
+          git commit -m "Autosync Crowdin translations"
+          echo "[*] Pushing"
+          git push -u origin $BRANCH_NAME
+
+      - name: Create/Update PR
+        env:
+          BRANCH_NAME: ${{ steps.cherry-pick.outputs.branch-name }}
+          BRANCH_EXISTED: ${{ steps.cherry-pick.outputs.branch-existed }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          if [ "$BRANCH_EXISTED" == "false" ]; then
+            echo "[*] Creating PR"
+            gh pr create --title "Autosync Crowdin Translations" \
+            --body "Autosync the updated translations"
+          else
+            echo "[*] Existing PR updated"
+          fi

.github/workflows/deploy.yml

@@ -0,0 +1,73 @@
+name: Deploy
+
+on: 
+  workflow_dispatch:
+    inputs:
+      release_version:
+        description: "Release Tag Version <vX.X.X>"
+        required: true
+  release:
+    types:
+      - published
+
+
+jobs:
+  deploy:
+    name: Deploy Web Vault
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
+        with:
+          ref: gh-pages
+
+      - name: Get release version
+        id: release-version
+        run: |
+          if [[ "${{ github.event_name }}" == "release" ]]; then
+              echo "::set-output name=version::${{ github.event.release.tag_name }}"
+          else
+              echo "::set-output name=version::${{ github.event.inputs.release_version }}"
+          fi
+
+      - name: Create deploy branch
+        run: |
+          git switch -c deploy-${{ steps.release-version.outputs.version }}
+          git push -u origin deploy-${{ steps.release-version.outputs.version }}
+
+      - name: Checkout Repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
+        with:
+          ref: rc
+
+      - name: setup git config
+        run: |
+          git config user.name = "GitHub Action Bot"
+          git config user.email = "<>"
+          git config --global url."https://github.com/".insteadOf ssh://git@github.com/
+          git config --global url."https://".insteadOf ssh://
+
+      - name: Install and Build
+        run: |
+          npm run sub:init
+          npm ci
+          npm run dist
+
+      - name: Deploy GitHub Pages
+        uses: crazy-max/ghaction-github-pages@db4476a01402e1a7ce05f41832040eef16d14925  # v2.5.0
+        with:
+          target_branch: deploy-${{ steps.release-version.outputs.version }}
+          build_dir: build
+          keep_history: true
+          commit_message: "Staging deploy ${{ steps.release-version.outputs.version }}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create Deploy PR
+        run: |
+          gh pr create --title "Deploy $VERSION" --body "Deploying $VERSION" --base gh-pages --head "$PR_BRANCH"
+        env:
+          VERSION: ${{ steps.release-version.outputs.version }}
+          PR_BRANCH: deploy-${{ steps.release-version.outputs.version }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

.github/workflows/qa-deploy.yml

@@ -1,4 +1,3 @@
----
 name: QA Deploy
 
 on: 
@@ -9,21 +8,22 @@ on:
         required: false
 
 env:
-  _QA_CLUSTER_RESOURCE_GROUP: "bw-env-qa"
-  _QA_CLUSTER_NAME: "bw-aks-qa"
-  _QA_K8S_NAMESPACE: "bw-qa"
-  _QA_K8S_APP_NAME: "bw-web"
+  QA_CLUSTER_RESOURCE_GROUP: "bitwarden-devops"
+  QA_CLUSTER_NAME: "dev-aks"
+  QA_K8S_NAMESPACE: "bw-qa"
+  QA_K8S_APP_NAME: "bw-web"
 
 jobs:
   deploy:
     name: Deploy QA Web
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
+        uses: actions/checkout@v2
 
       - name: Setup
-        run: export PATH=$PATH:~/work/web/web
+        run:
+          export PATH=$PATH:~/work/web/web
 
       - name: Login to Azure
         uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
@@ -35,27 +35,27 @@ jobs:
         uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403
         with:
           keyvault: "bitwarden-qa-kv"
-          secrets: "qa-aks-kubectl-credentials"
+          secrets: "dev-aks-kubectl-credentials"
 
-      - name: Login with qa-aks-kubectl-credentials SP
+      - name: Login to dev-aks-kubectl SP
         uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
         with:
-          creds: ${{ env.qa-aks-kubectl-credentials }}
+          creds: ${{ env.dev-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
           echo "---az get-creds---"
-          az aks get-credentials -n $_QA_CLUSTER_NAME -g $_QA_CLUSTER_RESOURCE_GROUP
+          az aks get-credentials -n $QA_CLUSTER_NAME -g $QA_CLUSTER_RESOURCE_GROUP
 
       - name: Get image tag
         id: image_tag
         run: |
-          IMAGE_TAG=$(echo "${GITHUB_REF:11}" | sed "s#/#-#g")
-          TAG_EXTENSION=${{ github.event.inputs.image_extension }}
+          IMAGE_TAG=$(echo "$GITHUB_REF" | awk '{split($0, a, "/"); print a[3];}')
+          TAG_EXTENSION=${{ github.events.inputs.image_extension }}
 
           if [[ $TAG_EXTENSION ]]; then
             IMAGE_TAG=$IMAGE_TAG-$TAG_EXTENSION
@@ -66,6 +66,5 @@ jobs:
         env:
           IMAGE_TAG: ${{ steps.image_tag.outputs.value }}
         run: |
-          kubectl set image -n $_QA_K8S_NAMESPACE deployment/web web=bitwardenqa.azurecr.io/web:$IMAGE_TAG --record
-          kubectl rollout restart -n $_QA_K8S_NAMESPACE deployment/web
-          kubectl rollout status deployment/web -n $_QA_K8S_NAMESPACE
+          kubectl set image -n $QA_K8S_NAMESPACE deployment/web web=bitwardenqa.azurecr.io/web:$IMAGE_TAG --record
+          kubectl rollout status deployment/web -n $QA_K8S_NAMESPACE

.github/workflows/release.yml

@@ -1,32 +1,25 @@
----
 name: Release
 
 on:
   workflow_dispatch:
     inputs:
-      release_type:
-        description: 'Release Options'
+      release_tag_name_input:
+        description: "Release Tag Name <X.X.X>"
         required: true
-        default: 'Initial Release'
-        type: choice
-        options:
-          - Initial Release
-          - Redeploy
 
 jobs:
   setup:
-    name: Setup
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     outputs:
-      release_version: ${{ steps.version.outputs.package }}
-      tag_version: ${{ steps.version.outputs.tag }}
-      branch-name: ${{ steps.branch.outputs.branch-name }}
+      release_upload_url: ${{ steps.create_release.outputs.upload_url }}
+      release_version: ${{ steps.create_tags.outputs.package_version }}
+      tag_version: ${{ steps.create_tags.outputs.tag_version }}
     steps:
       - name: Branch check
         run: |
-          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix" ]]; then
+          if [[ "$GITHUB_REF" != "refs/heads/rc" ]]; then
             echo "==================================="
-            echo "[!] Can only release from the 'rc' or 'hotfix' branches"
+            echo "[!] Can only release from rc branch"
             echo "==================================="
             exit 1
           fi
@@ -34,168 +27,131 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # 2.3.4
 
-      - name: Check Release Version
-        id: version
+      - name: Create Release Vars
+        id: create_tags
         run: |
-          version=$( jq -r ".version" package.json)
-          previous_release_tag_version=$(
-            curl -sL https://api.github.com/repos/$GITHUB_REPOSITORY/releases/latest | jq -r ".tag_name"
-          )
+          case "${RELEASE_TAG_NAME_INPUT:0:1}" in
+            v)
+              echo "RELEASE_NAME=${RELEASE_TAG_NAME_INPUT:1}" >> $GITHUB_ENV
+              echo "RELEASE_TAG_NAME=$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
+              echo "::set-output name=package_version::${RELEASE_TAG_NAME_INPUT:1}"
+              echo "::set-output name=tag_version::$RELEASE_TAG_NAME_INPUT"
+              ;;
+            [0-9])
+              echo "RELEASE_NAME=$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
+              echo "RELEASE_TAG_NAME=v$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
+              echo "::set-output name=package_version::$RELEASE_TAG_NAME_INPUT"
+              echo "::set-output name=tag_version::v$RELEASE_TAG_NAME_INPUT"
+              ;;
+            *)
+              exit 1
+              ;;
+          esac
+        env:
+          RELEASE_TAG_NAME_INPUT: ${{ github.event.inputs.release_tag_name_input }}
 
-          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
+      - name: Create Draft Release
+        id: create_release
+        uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e  # 1.1.4 - Repo Archived
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.RELEASE_TAG_NAME }}
+          release_name: Version ${{ env.RELEASE_NAME }}
+          draft: true
+          prerelease: false
 
-          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: Release self-host docker
-    runs-on: ubuntu-20.04
+  ubuntu:
+    runs-on: ubuntu-latest
     needs: setup
     env:
-      _BRANCH_NAME: ${{ needs.setup.outputs.branch-name }}
-      _RELEASE_VERSION: ${{ needs.setup.outputs.release_version }}
+      RELEASE_VERSION: ${{ needs.setup.outputs.release_version }}
     steps:
+      - name: Set up Node
+        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
+        with:
+          node-version: '14'
+
+      - name: Update NPM
+        run: |
+          npm install -g npm@7
+
       - name: Print environment
         run: |
           whoami
+          node --version
+          npm --version
+          gulp --version
           docker --version
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
 
-      - name: Setup DCT
-        id: setup-dct
-        uses: bitwarden/gh-actions/setup-docker-trust@a8c384a05a974c05c48374c818b004be221d43ff
+      - name: Login to Azure
+        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
         with:
-          azure-creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
-          azure-keyvault-name: "bitwarden-prod-kv"
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
+
+      - name: Retrieve secrets
+        id: retrieve-secrets
+        uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403
+        with:
+          keyvault: "bitwarden-prod-kv"
+          secrets: "docker-password, 
+                    docker-username,
+                    dct-delegate-2-repo-passphrase,
+                    dct-delegate-2-key"
+
+      - name: Log into Docker
+        run: echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+        env:
+          DOCKER_USERNAME: ${{ steps.retrieve-secrets.outputs.docker-username }}
+          DOCKER_PASSWORD: ${{ steps.retrieve-secrets.outputs.docker-password }}
+
+      - name: Setup Docker Trust
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release' || github.ref == 'refs/heads/rc'
+        run: |
+          mkdir -p ~/.docker/trust/private
+
+          echo "$DCT_DELEGATE_KEY" > ~/.docker/trust/private/$DCT_DELEGATION_KEY_ID.key
+        env:
+          DCT_DELEGATION_KEY_ID: "c9bde8ec820701516491e5e03d3a6354e7bd66d05fa3df2b0062f68b116dc59c"
+          DCT_DELEGATE_KEY: ${{ steps.retrieve-secrets.outputs.dct-delegate-2-key }}
 
       - name: Checkout repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
-      - name: Pull latest selfhost image
-        run: docker pull bitwarden/web:$_BRANCH_NAME
+      - name: Restore
+        run: dotnet tool restore
 
-      - name: Tag version and latest
+      - name: Build
         run: |
-          docker tag bitwarden/web:$_BRANCH_NAME bitwarden/web:$_RELEASE_VERSION
-          docker tag bitwarden/web:$_BRANCH_NAME bitwarden/web:latest
+          echo -e "# Building Web\n"
+          echo "Building app"
+          echo "npm version $(npm --version)"
+          npm install
+          npm run dist:selfhost
+
+          echo -e "\nBuilding Docker image"
+          docker --version
+          docker build -t bitwarden/web .
+
+      - name: Tag version
+        run: docker tag bitwarden/web bitwarden/web:$RELEASE_VERSION
 
       - name: List Docker images
         run: docker images
 
-      - name: Push version and latest image
+      - name: Push latest images
+        run: docker push bitwarden/web:latest
         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
+          DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.retrieve-secrets.outputs.dct-delegate-2-repo-passphrase }}
+
+      - name: Push version images
+        run: docker push bitwarden/web:$RELEASE_VERSION
+        env:
+          DOCKER_CONTENT_TRUST: 1
+          DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.retrieve-secrets.outputs.dct-delegate-2-repo-passphrase }}
 
       - name: Log out of Docker
         run: docker logout
-
-  ghpages-deploy:
-    name: Deploy Web Vault
-    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@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
-        with:
-          ref: gh-pages
-
-      - name: Create deploy branch
-        run: |
-          git switch -c deploy-$_TAG_VERSION
-          git push -u origin deploy-$_TAG_VERSION
-
-      - name: Checkout Repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
-
-      - name: Setup git config
-        run: |
-          git config user.name = "GitHub Action Bot"
-          git config user.email = "<>"
-          git config --global url."https://github.com/".insteadOf ssh://git@github.com/
-          git config --global url."https://".insteadOf ssh://
-
-      - name: Download latest cloud asset
-        uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
-        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: Deploy GitHub Pages
-        uses: crazy-max/ghaction-github-pages@db4476a01402e1a7ce05f41832040eef16d14925  # v2.5.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          target_branch: deploy-${{ needs.setup.outputs.tag_version }}
-          build_dir: build
-          keep_history: true
-          commit_message: "Staging deploy ${{ needs.setup.outputs.release_version }}"
-
-      - name: Create Deploy PR
-        env:
-          PR_BRANCH: deploy-${{ env._TAG_VERSION }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh pr create --title "Deploy $_RELEASE_VERSION" \
-            --body "Deploying $_RELEASE_VERSION" \
-            --base gh-pages \
-            --head "$PR_BRANCH"
-
-  release:
-    name: Create GitHub Release
-    runs-on: ubuntu-20.04
-    needs:
-      - setup
-      - self-host
-      - ghpages-deploy
-    steps:
-      - name: Download latest build artifacts
-        uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
-        with:
-          workflow: build.yml
-          workflow_conclusion: success
-          branch: ${{ needs.setup.outputs.branch-name }}
-          artifacts: "web-*-selfhosted-COMMERCIAL.zip,
-            web-*-selfhosted-open-source.zip"
-
-      - name: Rename assets
-        run: |
-          mv web-*-selfhosted-COMMERCIAL.zip web-${{ needs.setup.outputs.release_version }}-selfhosted-COMMERCIAL.zip
-          mv web-*-selfhosted-open-source.zip web-${{ needs.setup.outputs.release_version }}-selfhosted-open-source.zip
-
-      - name: Create release
-        uses: ncipollo/release-action@95215a3cb6e6a1908b3c44e00b4fdb15548b1e09
-        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"
-          token: ${{ secrets.GITHUB_TOKEN }}
-          draft: true

.github/workflows/version-bump.yml

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

.gitignore

@@ -12,4 +12,4 @@ dist/
 *.swp
 build/
 !dev-server.shared.pem
-config/local.json
+config/development.json

.husky/pre-commit

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

.prettierignore

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

.prettierrc.json

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

CONTRIBUTING.md

@@ -6,12 +6,17 @@ 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 [User-to-User Support category](https://community.bitwarden.com/c/support/) on the Community Forums
+  
+* **Translate:** See the localization (l10n) section below
 
 ## Contributor Agreement
 
@@ -19,9 +24,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)
 

ISSUE_TEMPLATE.md

@@ -0,0 +1,52 @@
+<!--
+Please do not submit feature requests. The [Community Forums][1] has a
+section for submitting, voting for, and discussing product feature requests.
+[1]: https://community.bitwarden.com
+-->
+
+## Describe the Bug
+
+<!-- Comment:
+A clear and concise description of what the bug is.
+-->
+
+## Steps To Reproduce
+
+<!-- Comment:
+How can we reproduce the behavior:
+-->
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. Click on '...'
+
+## Expected Result
+
+<!-- Comment:
+A clear and concise description of what you expected to happen.
+-->
+
+## Actual Result
+
+<!-- Comment:
+A clear and concise description of what is happening.
+-->
+
+## Screenshots or Videos
+
+<!-- Comment:
+If applicable, add screenshots and/or a short video to help explain your problem.
+-->
+
+## Environment
+
+- Operating system: [e.g. Windows 10, Mac OS Catalina]
+- Browser: [e.g. Firefox 73.0.1]
+- Build Version (Bottom of the page): [2.13.0]
+
+## Additional Context
+
+<!-- Comment:
+Add any other context about the problem here.
+-->

README.md

@@ -23,8 +23,8 @@
 
 ### Requirements
 
-- [Node.js](https://nodejs.org) v16.13.1 or greater
-- NPM v8
+- [Node.js](https://nodejs.org) v14.17 or greater
+- NPM v7
 
 ### Run the app
 
@@ -32,7 +32,7 @@ For local development, run the app with:
 
 ```
 npm install
-npm run build:oss:watch
+npm run build:watch
 ```
 
 You can now access the web vault in your browser at `https://localhost:8080`.
@@ -41,48 +41,30 @@ If you want to point the development web vault to the production APIs, you can r
 
 ```
 npm install
-ENV=cloud npm run build:oss:watch
+ENV=production npm run build:watch
 ```
 
-You can also manually adjusting your API endpoint settings by adding `config/local.json` overriding any of the following values:
+You can also manually adjusting your API endpoint settings by adding `config/development.json` overriding any of the values in `config/base.json`. For example:
 
-```json
+```typescript
 {
-  "dev": {
     "proxyApi": "http://your-api-url",
     "proxyIdentity": "http://your-identity-url",
     "proxyEvents": "http://your-events-url",
     "proxyNotifications": "http://your-notifications-url",
+    "proxyPortal": "http://your-portal-url",
     "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).
+To pick up the overrides in the newly created `config/development.json` file, run the app with:
+
+```
+npm run build:dev:watch
+```
 
 ## 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
-```

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

bitwarden_license/src/app/app.module.ts

@@ -1,48 +1,30 @@
-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 { InfiniteScrollModule } from "ngx-infinite-scroll";
+import { ToasterModule } from 'angular2-toaster';
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 
-import { BitwardenToastModule } from "jslib-angular/components/toastr.component";
+import { DragDropModule } from '@angular/cdk/drag-drop';
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
-import { 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 { AppRoutingModule } from './app-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 { AppComponent } from 'src/app/app.component';
+import { OssRoutingModule } from 'src/app/oss-routing.module';
+import { OssModule } from 'src/app/oss.module';
+import { ServicesModule } from 'src/app/services/services.module';
 
 @NgModule({
-  imports: [
-    OssModule,
-    BrowserAnimationsModule,
-    FormsModule,
-    ReactiveFormsModule,
-    ServicesModule,
-    BitwardenToastModule.forRoot({
-      maxOpened: 5,
-      autoDismiss: true,
-      closeButton: true,
-    }),
-    InfiniteScrollModule,
-    DragDropModule,
-    AppRoutingModule,
-    OssRoutingModule,
-    OrganizationsModule,
-    RouterModule,
-    WildcardRoutingModule, // Needs to be last to catch all non-existing routes
-  ],
-  declarations: [
-    AppComponent,
-    MaximumVaultTimeoutPolicyComponent,
-    DisablePersonalVaultExportPolicyComponent,
-  ],
-  bootstrap: [AppComponent],
+    imports: [
+        OssModule,
+        BrowserAnimationsModule,
+        FormsModule,
+        ServicesModule,
+        ToasterModule.forRoot(),
+        InfiniteScrollModule,
+        DragDropModule,
+        AppRoutingModule,
+        OssRoutingModule,
+    ],
+    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');
 
-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/manage/sso.component.html

@@ -1,488 +0,0 @@
-<div class="page-header d-flex">
-  <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>
-</ng-container>
-
-<form
-  #form
-  (ngSubmit)="submit()"
-  [formGroup]="data"
-  [appApiAction]="formPromise"
-  *ngIf="!loading"
-  ngNativeValidate
->
-  <p>
-    {{ "ssoPolicyHelpStart" | i18n }}
-    <a routerLink="../policies">{{ "ssoPolicyHelpLink" | i18n }}</a>
-    {{ "ssoPolicyHelpEnd" | i18n }}
-    <br />
-    {{ "ssoPolicyHelpKeyConnector" | i18n }}
-  </p>
-
-  <div class="form-group">
-    <div class="form-check">
-      <input
-        class="form-check-input"
-        type="checkbox"
-        id="enabled"
-        [formControl]="enabled"
-        name="Enabled"
-      />
-      <label class="form-check-label" for="enabled">{{ "allowSso" | i18n }}</label>
-    </div>
-    <small class="form-text text-muted">{{ "allowSsoDesc" | i18n }}</small>
-  </div>
-
-  <div class="form-group">
-    <label>{{ "memberDecryptionOption" | i18n }}</label>
-    <div class="form-check form-check-block">
-      <input
-        class="form-check-input"
-        type="radio"
-        id="memberDecryptionPass"
-        [value]="false"
-        formControlName="keyConnectorEnabled"
-      />
-      <label class="form-check-label" for="memberDecryptionPass">
-        {{ "masterPass" | i18n }}
-        <small>{{ "memberDecryptionPassDesc" | i18n }}</small>
-      </label>
-    </div>
-    <div class="form-check mt-2 form-check-block">
-      <input
-        class="form-check-input"
-        type="radio"
-        id="memberDecryptionKey"
-        [value]="true"
-        formControlName="keyConnectorEnabled"
-        [attr.disabled]="!organization.useKeyConnector || null"
-      />
-      <label class="form-check-label" for="memberDecryptionKey">
-        {{ "keyConnector" | i18n }}
-        <a
-          target="_blank"
-          rel="noopener"
-          appA11yTitle="{{ 'learnMore' | i18n }}"
-          href="https://bitwarden.com/help/article/about-key-connector/"
-        >
-          <i class="fa fa-question-circle-o" aria-hidden="true"></i>
-        </a>
-        <small>{{ "memberDecryptionKeyConnectorDesc" | i18n }}</small>
-      </label>
-    </div>
-  </div>
-
-  <ng-container *ngIf="data.value.keyConnectorEnabled">
-    <app-callout type="warning" [useAlertRole]="true">
-      {{ "keyConnectorWarning" | i18n }}
-    </app-callout>
-
-    <div class="form-group">
-      <label for="keyConnectorUrl">{{ "keyConnectorUrl" | i18n }}</label>
-      <div class="input-group">
-        <input
-          class="form-control"
-          formControlName="keyConnectorUrl"
-          id="keyConnectorUrl"
-          required
-        />
-        <div class="input-group-append">
-          <button
-            type="button"
-            class="btn btn-outline-secondary"
-            (click)="validateKeyConnectorUrl()"
-            [disabled]="!enableTestKeyConnector"
-          >
-            <i
-              class="fa fa-spinner fa-spin"
-              title="{{ 'loading' | i18n }}"
-              aria-hidden="true"
-              *ngIf="keyConnectorUrl.pending"
-            ></i>
-            <span *ngIf="!keyConnectorUrl.pending">
-              {{ "keyConnectorTest" | i18n }}
-            </span>
-          </button>
-        </div>
-      </div>
-      <ng-container *ngIf="keyConnectorUrl.pristine && !keyConnectorUrl.pending">
-        <div class="text-danger" *ngIf="keyConnectorUrl.hasError('invalidUrl')" role="alert">
-          <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
-          {{ "keyConnectorTestFail" | i18n }}
-        </div>
-        <div class="text-success" *ngIf="!keyConnectorUrl.hasError('invalidUrl')" role="alert">
-          <i class="fa fa-check-circle-o" aria-hidden="true"></i>
-          {{ "keyConnectorTestSuccess" | i18n }}
-        </div>
-      </ng-container>
-    </div>
-  </ng-container>
-
-  <div class="form-group">
-    <label for="type">{{ "type" | i18n }}</label>
-    <select class="form-control" id="type" formControlName="configType">
-      <option [ngValue]="0" disabled>{{ "selectType" | i18n }}</option>
-      <option [ngValue]="1">OpenID Connect</option>
-      <option [ngValue]="2">SAML 2.0</option>
-    </select>
-  </div>
-
-  <!-- OIDC -->
-  <div *ngIf="data.value.configType == 1">
-    <div class="config-section">
-      <h2>{{ "openIdConnectConfig" | i18n }}</h2>
-      <div class="form-group">
-        <label>{{ "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(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(signedOutCallbackPath)"
-            >
-              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
-            </button>
-          </div>
-        </div>
-      </div>
-      <div class="form-group">
-        <label for="authority">{{ "authority" | i18n }}</label>
-        <input class="form-control" formControlName="authority" id="authority" />
-      </div>
-      <div class="form-group">
-        <label for="clientId">{{ "clientId" | i18n }}</label>
-        <input class="form-control" formControlName="clientId" id="clientId" />
-      </div>
-      <div class="form-group">
-        <label for="clientSecret">{{ "clientSecret" | i18n }}</label>
-        <input class="form-control" formControlName="clientSecret" id="clientSecret" />
-      </div>
-      <div class="form-group">
-        <label for="metadataAddress">{{ "metadataAddress" | i18n }}</label>
-        <input class="form-control" formControlName="metadataAddress" id="metadataAddress" />
-      </div>
-      <div class="form-group">
-        <label for="redirectBehavior">{{ "oidcRedirectBehavior" | i18n }}</label>
-        <select class="form-control" formControlName="redirectBehavior" id="redirectBehavior">
-          <option [ngValue]="0">Redirect GET</option>
-          <option [ngValue]="1">Form POST</option>
-        </select>
-      </div>
-      <div class="form-group">
-        <div class="form-check">
-          <input
-            class="form-check-input"
-            type="checkbox"
-            id="getClaimsFromUserInfoEndpoint"
-            formControlName="getClaimsFromUserInfoEndpoint"
-          />
-          <label class="form-check-label" for="getClaimsFromUserInfoEndpoint">
-            {{ "getClaimsFromUserInfoEndpoint" | i18n }}
-          </label>
-        </div>
-      </div>
-      <div class="form-group">
-        <label for="additionalScopes">{{ "additionalScopes" | i18n }}</label>
-        <input class="form-control" formControlName="additionalScopes" id="additionalScopes" />
-      </div>
-      <div class="form-group">
-        <label for="additionalUserIdClaimTypes">{{ "additionalUserIdClaimTypes" | i18n }}</label>
-        <input
-          class="form-control"
-          formControlName="additionalUserIdClaimTypes"
-          id="additionalUserIdClaimTypes"
-        />
-      </div>
-      <div class="form-group">
-        <label for="additionalEmailClaimTypes">{{ "additionalEmailClaimTypes" | i18n }}</label>
-        <input
-          class="form-control"
-          formControlName="additionalEmailClaimTypes"
-          id="additionalEmailClaimTypes"
-        />
-      </div>
-      <div class="form-group">
-        <label for="additionalNameClaimTypes">{{ "additionalNameClaimTypes" | i18n }}</label>
-        <input
-          class="form-control"
-          formControlName="additionalNameClaimTypes"
-          id="additionalNameClaimTypes"
-        />
-      </div>
-      <div class="form-group">
-        <label for="acrValues">{{ "acrValues" | i18n }}</label>
-        <input class="form-control" formControlName="acrValues" id="acrValues" />
-      </div>
-      <div class="form-group">
-        <label for="expectedReturnAcrValue">{{ "expectedReturnAcrValue" | i18n }}</label>
-        <input
-          class="form-control"
-          formControlName="expectedReturnAcrValue"
-          id="expectedReturnAcrValue"
-        />
-      </div>
-    </div>
-  </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(spEntityId)"
-            >
-              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
-            </button>
-          </div>
-        </div>
-      </div>
-      <div class="form-group">
-        <label>{{ "spMetadataUrl" | i18n }}</label>
-        <div class="input-group">
-          <input class="form-control" readonly [value]="spMetadataUrl" />
-          <div class="input-group-append">
-            <button
-              type="button"
-              class="btn btn-outline-secondary"
-              appA11yTitle="{{ 'launch' | i18n }}"
-              (click)="launchUri(spMetadataUrl)"
-            >
-              <i class="fa fa-lg fa-external-link" aria-hidden="true"></i>
-            </button>
-            <button
-              type="button"
-              class="btn btn-outline-secondary"
-              appA11yTitle="{{ 'copyValue' | i18n }}"
-              (click)="copy(spMetadataUrl)"
-            >
-              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
-            </button>
-          </div>
-        </div>
-      </div>
-      <div class="form-group">
-        <label>{{ "spAcsUrl" | i18n }}</label>
-        <div class="input-group">
-          <input class="form-control" readonly [value]="spAcsUrl" />
-          <div class="input-group-append">
-            <button
-              type="button"
-              class="btn btn-outline-secondary"
-              appA11yTitle="{{ 'copyValue' | i18n }}"
-              (click)="copy(spAcsUrl)"
-            >
-              <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
-            </button>
-          </div>
-        </div>
-      </div>
-      <div class="form-group">
-        <label for="spNameIdFormat">{{ "spNameIdFormat" | i18n }}</label>
-        <select class="form-control" formControlName="spNameIdFormat" id="spNameIdFormat">
-          <option value="0">Not Configured</option>
-          <option value="1">Unspecified</option>
-          <option value="2">Email Address</option>
-          <option value="3">X.509 Subject Name</option>
-          <option value="4">Windows Domain Qualified Name</option>
-          <option value="5">Kerberos Principal Name</option>
-          <option value="6">Entity Identifier</option>
-          <option value="7">Persistent</option>
-          <option value="8">Transient</option>
-        </select>
-      </div>
-      <div class="form-group">
-        <label for="spOutboundSigningAlgorithm">{{ "spOutboundSigningAlgorithm" | i18n }}</label>
-        <select
-          class="form-control"
-          formControlName="spOutboundSigningAlgorithm"
-          id="spOutboundSigningAlgorithm"
-        >
-          <option *ngFor="let o of samlSigningAlgorithms" [ngValue]="o">{{ o }}</option>
-        </select>
-      </div>
-      <div class="form-group">
-        <label for="spSigningBehavior">{{ "spSigningBehavior" | i18n }}</label>
-        <select class="form-control" formControlName="spSigningBehavior" id="spSigningBehavior">
-          <option value="0">If IdP Wants Authn Requests Signed</option>
-          <option value="1">Always</option>
-          <option value="3">Never</option>
-        </select>
-      </div>
-      <div class="form-group">
-        <label for="spMinIncomingSigningAlgorithm">{{
-          "spMinIncomingSigningAlgorithm" | i18n
-        }}</label>
-        <select
-          class="form-control"
-          formControlName="spMinIncomingSigningAlgorithm"
-          id="spMinIncomingSigningAlgorithm"
-        >
-          <option *ngFor="let o of samlSigningAlgorithms" [ngValue]="o">{{ o }}</option>
-        </select>
-      </div>
-      <div class="form-group">
-        <div class="form-check">
-          <input
-            class="form-check-input"
-            type="checkbox"
-            id="spWantAssertionsSigned"
-            formControlName="spWantAssertionsSigned"
-          />
-          <label class="form-check-label" for="spWantAssertionsSigned">
-            {{ "spWantAssertionsSigned" | i18n }}
-          </label>
-        </div>
-      </div>
-      <div class="form-group">
-        <div class="form-check">
-          <input
-            class="form-check-input"
-            type="checkbox"
-            id="spValidateCertificates"
-            formControlName="spValidateCertificates"
-          />
-          <label class="form-check-label" for="spValidateCertificates">
-            {{ "spValidateCertificates" | i18n }}
-          </label>
-        </div>
-      </div>
-    </div>
-
-    <!-- SAML2 IDP -->
-    <div class="config-section">
-      <h2>{{ "samlIdpConfig" | i18n }}</h2>
-
-      <div class="form-group">
-        <label for="idpEntityId">{{ "idpEntityId" | i18n }}</label>
-        <input class="form-control" formControlName="idpEntityId" id="idpEntityId" />
-      </div>
-      <div class="form-group">
-        <label for="idpBindingType">{{ "idpBindingType" | i18n }}</label>
-        <select class="form-control" formControlName="idpBindingType" id="idpBindingType">
-          <option value="1">Redirect</option>
-          <option value="2">HTTP POST</option>
-          <option value="4">Artifact</option>
-        </select>
-      </div>
-      <div class="form-group">
-        <label for="idpSingleSignOnServiceUrl">{{ "idpSingleSignOnServiceUrl" | i18n }}</label>
-        <input
-          class="form-control"
-          formControlName="idpSingleSignOnServiceUrl"
-          id="idpSingleSignOnServiceUrl"
-        />
-      </div>
-      <div class="form-group">
-        <label for="idpSingleLogoutServiceUrl">{{ "idpSingleLogoutServiceUrl" | i18n }}</label>
-        <input
-          class="form-control"
-          formControlName="idpSingleLogoutServiceUrl"
-          id="idpSingleLogoutServiceUrl"
-        />
-      </div>
-      <div class="form-group">
-        <label for="idpArtifactResolutionServiceUrl">{{
-          "idpArtifactResolutionServiceUrl" | i18n
-        }}</label>
-        <input
-          class="form-control"
-          formControlName="idpArtifactResolutionServiceUrl"
-          id="idpArtifactResolutionServiceUrl"
-        />
-      </div>
-      <div class="form-group">
-        <label for="idpX509PublicCert">{{ "idpX509PublicCert" | i18n }}</label>
-        <textarea
-          formControlName="idpX509PublicCert"
-          class="form-control form-control-sm text-monospace"
-          rows="6"
-          id="idpX509PublicCert"
-        ></textarea>
-      </div>
-      <div class="form-group">
-        <label for="idpOutboundSigningAlgorithm">{{ "idpOutboundSigningAlgorithm" | i18n }}</label>
-        <select
-          class="form-control"
-          formControlName="idpOutboundSigningAlgorithm"
-          id="idpOutboundSigningAlgorithm"
-        >
-          <option *ngFor="let o of samlSigningAlgorithms" [ngValue]="o">{{ o }}</option>
-        </select>
-      </div>
-      <div class="form-group">
-        <div class="form-check">
-          <input
-            class="form-check-input"
-            type="checkbox"
-            id="idpAllowUnsolicitedAuthnResponse"
-            formControlName="idpAllowUnsolicitedAuthnResponse"
-          />
-          <label class="form-check-label" for="idpAllowUnsolicitedAuthnResponse">
-            {{ "idpAllowUnsolicitedAuthnResponse" | i18n }}
-          </label>
-        </div>
-      </div>
-      <div class="form-group">
-        <div class="form-check">
-          <input
-            class="form-check-input"
-            type="checkbox"
-            id="idpDisableOutboundLogoutRequests"
-            formControlName="idpDisableOutboundLogoutRequests"
-          />
-          <label class="form-check-label" for="idpDisableOutboundLogoutRequests">
-            {{ "idpDisableOutboundLogoutRequests" | i18n }}
-          </label>
-        </div>
-      </div>
-      <div class="form-group">
-        <div class="form-check">
-          <input
-            class="form-check-input"
-            type="checkbox"
-            id="idpWantAuthnRequestsSigned"
-            formControlName="idpWantAuthnRequestsSigned"
-          />
-          <label class="form-check-label" for="idpWantAuthnRequestsSigned">
-            {{ "idpWantAuthnRequestsSigned" | i18n }}
-          </label>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-    <i class="fa fa-spinner fa-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
-    <span>{{ "save" | i18n }}</span>
-  </button>
-</form>

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

@@ -1,183 +0,0 @@
-import { Component, OnInit } from "@angular/core";
-import { FormBuilder } 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 { OrganizationService } from "jslib-common/abstractions/organization.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-
-import { Organization } from "jslib-common/models/domain/organization";
-
-import { OrganizationSsoRequest } from "jslib-common/models/request/organization/organizationSsoRequest";
-
-@Component({
-  selector: "app-org-manage-sso",
-  templateUrl: "sso.component.html",
-})
-export class SsoComponent implements OnInit {
-  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",
-  ];
-
-  loading = true;
-  organizationId: string;
-  organization: Organization;
-  formPromise: Promise<any>;
-
-  callbackPath: string;
-  signedOutCallbackPath: string;
-  spEntityId: string;
-  spMetadataUrl: string;
-  spAcsUrl: string;
-
-  enabled = this.formBuilder.control(false);
-  data = this.formBuilder.group({
-    configType: [],
-
-    keyConnectorEnabled: [],
-    keyConnectorUrl: [],
-
-    // OpenId
-    authority: [],
-    clientId: [],
-    clientSecret: [],
-    metadataAddress: [],
-    redirectBehavior: [],
-    getClaimsFromUserInfoEndpoint: [],
-    additionalScopes: [],
-    additionalUserIdClaimTypes: [],
-    additionalEmailClaimTypes: [],
-    additionalNameClaimTypes: [],
-    acrValues: [],
-    expectedReturnAcrValue: [],
-
-    // SAML
-    spNameIdFormat: [],
-    spOutboundSigningAlgorithm: [],
-    spSigningBehavior: [],
-    spMinIncomingSigningAlgorithm: [],
-    spWantAssertionsSigned: [],
-    spValidateCertificates: [],
-
-    idpEntityId: [],
-    idpBindingType: [],
-    idpSingleSignOnServiceUrl: [],
-    idpSingleLogoutServiceUrl: [],
-    idpArtifactResolutionServiceUrl: [],
-    idpX509PublicCert: [],
-    idpOutboundSigningAlgorithm: [],
-    idpAllowUnsolicitedAuthnResponse: [],
-    idpDisableOutboundLogoutRequests: [],
-    idpWantAuthnRequestsSigned: [],
-  });
-
-  constructor(
-    private formBuilder: FormBuilder,
-    private route: ActivatedRoute,
-    private apiService: ApiService,
-    private platformUtilsService: PlatformUtilsService,
-    private i18nService: I18nService,
-    private organizationService: OrganizationService
-  ) {}
-
-  async ngOnInit() {
-    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.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.keyConnectorUrl.markAsDirty();
-
-    this.loading = false;
-  }
-
-  copy(value: string) {
-    this.platformUtilsService.copyToClipboard(value);
-  }
-
-  launchUri(url: string) {
-    this.platformUtilsService.launchUri(url);
-  }
-
-  async submit() {
-    this.formPromise = this.postData();
-
-    try {
-      const response = await this.formPromise;
-
-      this.data.patchValue(response.data);
-      this.enabled.setValue(response.enabled);
-
-      this.platformUtilsService.showToast("success", null, this.i18nService.t("ssoSettingsSaved"));
-    } catch {
-      // Logged by appApiAction, do nothing
-    }
-
-    this.formPromise = null;
-  }
-
-  async postData() {
-    if (this.data.get("keyConnectorEnabled").value) {
-      await this.validateKeyConnectorUrl();
-
-      if (this.keyConnectorUrl.hasError("invalidUrl")) {
-        throw new Error(this.i18nService.t("keyConnectorTestFail"));
-      }
-    }
-
-    const request = new OrganizationSsoRequest();
-    request.enabled = this.enabled.value;
-    request.data = this.data.value;
-
-    return this.apiService.postOrganizationSso(this.organizationId, request);
-  }
-
-  async validateKeyConnectorUrl() {
-    if (this.keyConnectorUrl.pristine) {
-      return;
-    }
-
-    this.keyConnectorUrl.markAsPending();
-
-    try {
-      await this.apiService.getKeyConnectorAlive(this.keyConnectorUrl.value);
-      this.keyConnectorUrl.updateValueAndValidity();
-    } catch {
-      this.keyConnectorUrl.setErrors({
-        invalidUrl: true,
-      });
-    }
-
-    this.keyConnectorUrl.markAsPristine();
-  }
-
-  get enableTestKeyConnector() {
-    return (
-      this.data.get("keyConnectorEnabled").value &&
-      this.keyConnectorUrl != null &&
-      this.keyConnectorUrl.value !== ""
-    );
-  }
-
-  get keyConnectorUrl() {
-    return this.data.get("keyConnectorUrl");
-  }
-}

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

@@ -1,54 +0,0 @@
-import { NgModule } from "@angular/core";
-import { RouterModule, Routes } from "@angular/router";
-
-import { AuthGuardService } from "jslib-angular/services/auth-guard.service";
-
-import { Permissions } from "jslib-common/enums/permissions";
-
-import { OrganizationLayoutComponent } from "src/app/layouts/organization-layout.component";
-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";
-
-const routes: Routes = [
-  {
-    path: "organizations/:organizationId",
-    component: OrganizationLayoutComponent,
-    canActivate: [AuthGuardService, OrganizationGuardService],
-    children: [
-      {
-        path: "manage",
-        component: ManageComponent,
-        canActivate: [OrganizationTypeGuardService],
-        data: {
-          permissions: [
-            Permissions.CreateNewCollections,
-            Permissions.EditAnyCollection,
-            Permissions.DeleteAnyCollection,
-            Permissions.EditAssignedCollections,
-            Permissions.DeleteAssignedCollections,
-            Permissions.AccessEventLogs,
-            Permissions.ManageGroups,
-            Permissions.ManageUsers,
-            Permissions.ManagePolicies,
-            Permissions.ManageSso,
-          ],
-        },
-        children: [
-          {
-            path: "sso",
-            component: SsoComponent,
-          },
-        ],
-      },
-    ],
-  },
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class OrganizationsRoutingModule {}

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

@@ -1,14 +0,0 @@
-import { CommonModule } from "@angular/common";
-import { NgModule } from "@angular/core";
-import { FormsModule, ReactiveFormsModule } from "@angular/forms";
-
-import { OssModule } from "src/app/oss.module";
-
-import { SsoComponent } from "./manage/sso.component";
-import { OrganizationsRoutingModule } from "./organizations-routing.module";
-
-@NgModule({
-  imports: [CommonModule, FormsModule, ReactiveFormsModule, OssModule, OrganizationsRoutingModule],
-  declarations: [SsoComponent],
-})
-export class OrganizationsModule {}

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

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

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

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

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

@@ -1,47 +0,0 @@
-<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>
-
-<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>
-</div>

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

@@ -1,72 +0,0 @@
-import { Component } from "@angular/core";
-import { FormBuilder } from "@angular/forms";
-
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-
-import { PolicyType } from "jslib-common/enums/policyType";
-
-import { PolicyRequest } from "jslib-common/models/request/policyRequest";
-
-import {
-  BasePolicy,
-  BasePolicyComponent,
-} from "src/app/organizations/policies/base-policy.component";
-
-export class MaximumVaultTimeoutPolicy extends BasePolicy {
-  name = "maximumVaultTimeout";
-  description = "maximumVaultTimeoutDesc";
-  type = PolicyType.MaximumVaultTimeout;
-  component = MaximumVaultTimeoutPolicyComponent;
-}
-
-@Component({
-  selector: "policy-maximum-timeout",
-  templateUrl: "maximum-vault-timeout.component.html",
-})
-export class MaximumVaultTimeoutPolicyComponent extends BasePolicyComponent {
-  data = this.formBuilder.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,
-    });
-  }
-
-  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,
-    };
-  }
-
-  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);
-  }
-}

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

@@ -1,46 +1,35 @@
-<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="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
+<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>
-              </td>
-            </tr>
-          </table>
-        </ng-container>
-      </div>
+            </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>
     </div>
-  </div>
 </div>

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

@@ -1,86 +1,83 @@
-import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
+import {
+    Component,
+    EventEmitter,
+    Input,
+    OnInit,
+    Output
+} from '@angular/core';
+import { ToasterService } from 'angular2-toaster';
 
-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 { 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 { ValidationService } from 'jslib-angular/services/validation.service';
 
-import { WebProviderService } from "../services/webProvider.service";
+import { ProviderService } from '../services/provider.service';
 
-import { Organization } from "jslib-common/models/domain/organization";
-import { Provider } from "jslib-common/models/domain/provider";
+import { Organization } from 'jslib-common/models/domain/organization';
+import { Provider } from 'jslib-common/models/domain/provider';
+
+import { PlanType } from 'jslib-common/enums/planType';
 
 @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();
 
-  provider: Provider;
-  formPromise: Promise<any>;
-  loading = true;
+    @Input() providerId: string;
+    @Input() organizations: Organization[];
+    @Output() onAddedOrganization = new EventEmitter();
 
-  constructor(
-    private providerService: ProviderService,
-    private webProviderService: WebProviderService,
-    private i18nService: I18nService,
-    private platformUtilsService: PlatformUtilsService,
-    private validationService: ValidationService
-  ) {}
+    provider: Provider;
+    formPromise: Promise<any>;
+    loading = true;
 
-  async ngOnInit() {
-    await this.load();
-  }
+    constructor(private userService: UserService, private providerService: ProviderService,
+        private toasterService: ToasterService, private i18nService: I18nService,
+        private platformUtilsService: PlatformUtilsService, private validationService: ValidationService,
+        private apiService: ApiService) { }
 
-  async load() {
-    if (this.providerId == null) {
-      return;
+    async ngOnInit() {
+        await this.load();
     }
 
-    this.provider = await this.providerService.get(this.providerId);
+    async load() {
+        if (this.providerId == null) {
+            return;
+        }
 
-    this.loading = false;
-  }
+        this.provider = await this.userService.getProvider(this.providerId);
 
-  async add(organization: Organization) {
-    if (this.formPromise) {
-      return;
+        this.loading = false;
     }
 
-    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"
-    );
+    async add(organization: Organization) {
+        if (this.formPromise) {
+            return;
+        }
 
-    if (!confirmed) {
-      return false;
+        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();
     }
-
-    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,86 +1,62 @@
 <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 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>
-    <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>
 </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="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}" aria-hidden="true"></i>
+    <span class="sr-only">{{'loading' | i18n}}</span>
 </ng-container>
 
 <ng-container
-  *ngIf="!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="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>
 </ng-container>
 
 <ng-template #add></ng-template>

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

@@ -1,183 +1,169 @@
-import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
+import {
+    Component,
+    ComponentFactoryResolver,
+    OnInit,
+    ViewChild,
+    ViewContainerRef
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { ToasterService } from 'angular2-toaster';
 
-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 { 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 { ModalService } from "jslib-angular/services/modal.service";
-import { ValidationService } from "jslib-angular/services/validation.service";
+import { ValidationService } from 'jslib-angular/services/validation.service';
 
-import { PlanType } from "jslib-common/enums/planType";
-import { ProviderUserType } from "jslib-common/enums/providerUserType";
+import {
+    ProviderOrganizationOrganizationDetailsResponse
+} from 'jslib-common/models/response/provider/providerOrganizationResponse';
+import { Organization } from 'jslib-common/models/domain/organization';
 
-import { Organization } from "jslib-common/models/domain/organization";
-import { ProviderOrganizationOrganizationDetailsResponse } from "jslib-common/models/response/provider/providerOrganizationResponse";
+import { ModalComponent } from 'src/app/modal.component';
 
-import { WebProviderService } from "../services/webProvider.service";
+import { ProviderService } from '../services/provider.service';
 
-import { AddOrganizationComponent } from "./add-organization.component";
+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;
 
-  providerId: any;
-  searchText: string;
-  addableOrganizations: Organization[];
-  loading = true;
-  manageOrganizations = false;
-  showAddExisting = false;
+    @ViewChild('add', { read: ViewContainerRef, static: true }) addModalRef: ViewContainerRef;
 
-  clients: ProviderOrganizationOrganizationDetailsResponse[];
-  pagedClients: ProviderOrganizationOrganizationDetailsResponse[];
+    providerId: any;
+    searchText: string;
+    addableOrganizations: Organization[];
+    loading = true;
+    manageOrganizations = false;
+    showAddExisting = false;
 
-  protected didScroll = false;
-  protected pageSize = 100;
-  protected actionPromise: Promise<any>;
-  private pagedClientsCount = 0;
+    clients: ProviderOrganizationOrganizationDetailsResponse[];
+    pagedClients: ProviderOrganizationOrganizationDetailsResponse[];
+    modal: ModalComponent;
 
-  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
-  ) {}
+    protected didScroll = false;
+    protected pageSize = 100;
+    protected actionPromise: Promise<any>;
+    private pagedClientsCount = 0;
 
-  async ngOnInit() {
-    this.route.parent.params.subscribe(async (params) => {
-      this.providerId = params.providerId;
+    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 componentFactoryResolver: ComponentFactoryResolver,
+        private logService: LogService) { }
 
-      await this.load();
+    async ngOnInit() {
+        this.route.parent.params.subscribe(async params => {
+            this.providerId = params.providerId;
 
-      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();
-            modal.close();
-          } catch (e) {
-            this.logService.error(`Handled exception: ${e}`);
-          }
+
+            const queryParamsSub = this.route.queryParams.subscribe(async qParams => {
+                this.searchText = qParams.search;
+                if (queryParamsSub != null) {
+                    queryParamsSub.unsubscribe();
+                }
+            });
         });
-      }
-    );
-  }
-
-  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.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);
+    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.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;
+    }
+
+    addExistingOrganization() {
+        const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent);
+        this.modal = this.addModalRef.createComponent(factory).instance;
+        const childComponent = this.modal.show<AddOrganizationComponent>(AddOrganizationComponent, this.addModalRef);
+
+        childComponent.providerId = this.providerId;
+        childComponent.organizations = this.addableOrganizations;
+        childComponent.onAddedOrganization.subscribe(async () => {
+            try {
+                await this.load();
+                this.modal.close();
+            } catch (e) {
+                this.logService.error(`Handled exception: ${e}`);
+            }
+        });
+
+        this.modal.onClosed.subscribe(() => {
+            this.modal = null;
+        });
+    }
+
+    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 = 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,23 +1,26 @@
-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/manage/accept-provider.component.html

@@ -1,42 +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 src="/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>
 <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 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>
-      </div>
     </div>
-  </div>
 </div>

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

@@ -1,56 +1,48 @@
-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 { BaseAcceptComponent } from "src/app/common/base.accept.component";
+import { BaseAcceptComponent } from 'src/app/common/base.accept.component';
 
-import { ApiService } from "jslib-common/abstractions/api.service";
+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 { 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';
 
 @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,
-    i18nService: I18nService,
-    route: ActivatedRoute,
-    stateService: StateService,
-    private apiService: ApiService,
-    platformUtilService: PlatformUtilsService
-  ) {
-    super(router, platformUtilService, i18nService, route, stateService);
-  }
+    constructor(router: Router, toasterService: ToasterService, i18nService: I18nService, route: ActivatedRoute,
+        userService: UserService, stateService: StateService, private apiService: ApiService) {
+        super(router, toasterService, i18nService, route, userService, 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
-    );
-    this.platformUtilService.showToast(
-      "success",
-      this.i18nService.t("inviteAccepted"),
-      this.i18nService.t("providerInviteAcceptedDesc"),
-      { timeout: 10000 }
-    );
-    this.router.navigate(["/vault"]);
-  }
+        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']);
+    }
 
-  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,34 +1,38 @@
-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 { 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 { 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;
 
-  protected isAccepted(user: BulkUserDetails) {
-    return user.status === ProviderUserStatusType.Accepted;
-  }
+    @Input() providerId: string;
 
-  protected async getPublicKeys() {
-    const request = new ProviderUserBulkRequest(this.filteredUsers.map((user) => user.id));
-    return await this.apiService.postProviderUsersPublicKey(this.providerId, request);
-  }
+    protected isAccepted(user: BulkUserDetails) {
+        return user.status === ProviderUserStatusType.Accepted;
+    }
 
-  protected getCryptoKey() {
-    return this.cryptoService.getProviderKey(this.providerId);
-  }
+    protected async getPublicKeys() {
+        const request = new ProviderUserBulkRequest(this.filteredUsers.map(user => user.id));
+        return await this.apiService.postProviderUsersPublicKey(this.providerId, request);
+    }
 
-  protected async postConfirmRequest(userIdsWithKeys: any[]) {
-    const request = new ProviderUserBulkConfirmRequest(userIdsWithKeys);
-    return await this.apiService.postProviderUserBulkConfirm(this.providerId, request);
-  }
+    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);
+    }
 }

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

@@ -1,17 +1,21 @@
-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;
 
-  async deleteUsers() {
-    const request = new ProviderUserBulkRequest(this.users.map((user) => user.id));
-    return await this.apiService.deleteManyProviderUsers(this.providerId, request);
-  }
+    @Input() providerId: string;
+
+    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,103 +1,68 @@
 <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"
-      />
+    <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>
     </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>
-  </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="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}" aria-hidden="true"></i>
+    <span class="sr-only">{{'loading' | i18n}}</span>
 </ng-container>
 <ng-container *ngIf="loaded">
-  <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 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>
 </ng-container>

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

@@ -1,82 +1,71 @@
-import { Component, OnInit } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
+import {
+    Component,
+    OnInit,
+} from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ToasterService } from 'angular2-toaster';
 
-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 { 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 { UserNamePipe } from 'jslib-angular/pipes/user-name.pipe';
 
-import { EventResponse } from "jslib-common/models/response/eventResponse";
+import { EventResponse } from 'jslib-common/models/response/eventResponse';
 
-import { EventService } from "src/app/services/event.service";
+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';
 
 @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: string = '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,
-    private providerService: ProviderService,
-    exportService: ExportService,
-    platformUtilsService: PlatformUtilsService,
-    private router: Router,
-    logService: LogService,
-    private userNamePipe: UserNamePipe
-  ) {
-    super(eventService, i18nService, exportService, platformUtilsService, logService);
-  }
+    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);
+    }
 
-  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 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 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,30 +1,22 @@
 <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 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>
-    <div class="col-9">
-      <router-outlet></router-outlet>
-    </div>
-  </div>
 </div>

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

@@ -1,24 +1,27 @@
-import { Component, OnInit } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
+import {
+    Component,
+    OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 
-import { ProviderService } from "jslib-common/abstractions/provider.service";
+import { UserService } from 'jslib-common/abstractions/user.service';
 
-import { Provider } from "jslib-common/models/domain/provider";
+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 providerService: ProviderService) {}
+    constructor(private route: ActivatedRoute, private userService: UserService) { }
 
-  ngOnInit() {
-    this.route.parent.params.subscribe(async (params) => {
-      this.provider = await this.providerService.get(params.providerId);
-      this.accessEvents = this.provider.useEvents;
-    });
-  }
+    ngOnInit() {
+        this.route.parent.params.subscribe(async params => {
+            this.provider = await this.userService.getProvider(params.providerId);
+            this.accessEvents = this.provider.useEvents;
+        });
+    }
 }

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

@@ -1,220 +1,145 @@
 <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>
+    <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>
     </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>
-  </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="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}" aria-hidden="true"></i>
+    <span class="sr-only">{{'loading' | i18n}}</span>
 </ng-container>
 <ng-container
-  *ngIf="
-    !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="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>
 </ng-container>
 <ng-template #addEdit></ng-template>
 <ng-template #eventsTemplate></ng-template>

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

@@ -1,292 +1,286 @@
-import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
+import {
+    Component,
+    ComponentFactoryResolver,
+    OnInit,
+    ViewChild,
+    ViewContainerRef
+} from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ToasterService } from 'angular2-toaster';
 
-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 { 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 { ValidationService } from 'jslib-angular/services/validation.service';
 
-import { ModalService } from "jslib-angular/services/modal.service";
-import { ValidationService } from "jslib-angular/services/validation.service";
+import { ProviderUserStatusType } from 'jslib-common/enums/providerUserStatusType';
+import { ProviderUserType } from 'jslib-common/enums/providerUserType';
 
-import { 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 { 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 { 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 { 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 { BasePeopleComponent } from 'src/app/common/base.people.component';
+import { ModalComponent } from 'src/app/modal.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';
 
 @Component({
-  selector: "provider-people",
-  templateUrl: "people.component.html",
+    selector: 'provider-people',
+    templateUrl: 'people.component.html',
 })
-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;
+export class PeopleComponent extends BasePeopleComponent<ProviderUserUserDetailsResponse> implements OnInit {
 
-  userType = ProviderUserType;
-  userStatusType = ProviderUserStatusType;
-  providerId: string;
-  accessEvents = false;
+    @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;
 
-  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
-    );
-  }
+    userType = ProviderUserType;
+    userStatusType = ProviderUserStatusType;
+    providerId: string;
+    accessEvents = false;
 
-  ngOnInit() {
-    this.route.parent.params.subscribe(async (params) => {
-      this.providerId = params.providerId;
-      const provider = await this.providerService.get(this.providerId);
+    constructor(apiService: ApiService, private route: ActivatedRoute,
+        i18nService: I18nService, componentFactoryResolver: ComponentFactoryResolver,
+        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, componentFactoryResolver, logService, searchPipe, userNamePipe);
+    }
 
-      if (!provider.canManageUsers) {
-        this.router.navigate(["../"], { relativeTo: this.route });
-        return;
-      }
+    ngOnInit() {
+        this.route.parent.params.subscribe(async params => {
+            this.providerId = params.providerId;
+            const provider = await this.userService.getProvider(this.providerId);
 
-      this.accessEvents = provider.useEvents;
+            if (!provider.canManageUsers) {
+                this.router.navigate(['../'], { relativeTo: this.route });
+                return;
+            }
 
-      await this.load();
+            this.accessEvents = provider.useEvents;
 
-      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]);
-          }
+            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);
+    }
+
+    edit(user: ProviderUserUserDetailsResponse) {
+        if (this.modal != null) {
+            this.modal.close();
         }
-      });
-    });
-  }
 
-  getUsers(): Promise<ListResponse<ProviderUserUserDetailsResponse>> {
-    return this.apiService.getProviderUsers(this.providerId);
-  }
+        const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent);
+        this.modal = this.addEditModalRef.createComponent(factory).instance;
+        const childComponent = this.modal.show<UserAddEditComponent>(
+            UserAddEditComponent, this.addEditModalRef);
 
-  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();
+        childComponent.name = this.userNamePipe.transform(user);
+        childComponent.providerId = this.providerId;
+        childComponent.providerUserId = user != null ? user.id : null;
+        childComponent.onSavedUser.subscribe(() => {
+            this.modal.close();
+            this.load();
         });
-        comp.onDeletedUser.subscribe(() => {
-          modal.close();
-          this.removeUser(user);
+        childComponent.onDeletedUser.subscribe(() => {
+            this.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;
-    }
-
-    const [modal] = await this.modalService.openViewRef(
-      BulkRemoveComponent,
-      this.bulkRemoveModalRef,
-      (comp) => {
-        comp.providerId = this.providerId;
-        comp.users = this.getCheckedUsers();
-      }
-    );
-
-    await modal.onClosedPromise();
-    await this.load();
-  }
-
-  async bulkReinvite() {
-    if (this.actionPromise != null) {
-      return;
-    }
-
-    const users = this.getCheckedUsers();
-    const filteredUsers = users.filter((u) => u.status === ProviderUserStatusType.Invited);
-
-    if (filteredUsers.length <= 0) {
-      this.platformUtilsService.showToast(
-        "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 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;
-          if (!keyedFilteredUsers.hasOwnProperty(user.id)) {
-            message = this.i18nService.t("bulkFilteredMessage");
-          }
-
-          return {
-            user: user,
-            error: keyedErrors.hasOwnProperty(user.id),
-            message: message,
-          };
+        this.modal.onClosed.subscribe(() => {
+            this.modal = null;
         });
-        childComponent.loading = false;
-      }
-    } catch {
-      close = true;
-      modal.close();
     }
-  }
+
+    async events(user: ProviderUserUserDetailsResponse) {
+        if (this.modal != null) {
+            this.modal.close();
+        }
+
+        const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent);
+        this.modal = this.eventsModalRef.createComponent(factory).instance;
+        const childComponent = this.modal.show<EntityEventsComponent>(
+            EntityEventsComponent, this.eventsModalRef);
+
+        childComponent.name = this.userNamePipe.transform(user);
+        childComponent.providerId = this.providerId;
+        childComponent.entityId = user.id;
+        childComponent.showUser = false;
+        childComponent.entity = 'user';
+
+        this.modal.onClosed.subscribe(() => {
+            this.modal = null;
+        });
+    }
+
+    async bulkRemove() {
+        if (this.actionPromise != null) {
+            return;
+        }
+
+        if (this.modal != null) {
+            this.modal.close();
+        }
+
+        const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent);
+        this.modal = this.bulkRemoveModalRef.createComponent(factory).instance;
+        const childComponent = this.modal.show(BulkRemoveComponent, this.bulkRemoveModalRef);
+
+        childComponent.providerId = this.providerId;
+        childComponent.users = this.getCheckedUsers();
+
+        this.modal.onClosed.subscribe(async () => {
+            await this.load();
+            this.modal = null;
+        });
+    }
+
+    async bulkReinvite() {
+        if (this.actionPromise != null) {
+            return;
+        }
+
+        const users = this.getCheckedUsers();
+        const filteredUsers = users.filter(u => u.status === ProviderUserStatusType.Invited);
+
+        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 bulkConfirm() {
+        if (this.actionPromise != null) {
+            return;
+        }
+
+        if (this.modal != null) {
+            this.modal.close();
+        }
+
+        const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent);
+        this.modal = this.bulkConfirmModalRef.createComponent(factory).instance;
+        const childComponent = this.modal.show(BulkConfirmComponent, this.bulkConfirmModalRef);
+
+        childComponent.providerId = this.providerId;
+        childComponent.users = this.getCheckedUsers();
+
+        this.modal.onClosed.subscribe(async () => {
+            await this.load();
+            this.modal = null;
+        });
+    }
+
+    private async showBulkStatus(users: ProviderUserUserDetailsResponse[], filteredUsers: ProviderUserUserDetailsResponse[],
+        request: Promise<ListResponse<ProviderUserBulkResponse>>, successfullMessage: string) {
+
+        const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent);
+        this.modal = this.bulkStatusModalRef.createComponent(factory).instance;
+        const childComponent = this.modal.show<BulkStatusComponent>(
+            BulkStatusComponent, this.bulkStatusModalRef);
+
+        childComponent.loading = true;
+
+        // Workaround to handle closing the modal shortly after it has been opened
+        let close = false;
+        this.modal.onShown.subscribe(() => {
+            if (close) {
+                this.modal.close();
+            }
+        });
+
+        this.modal.onClosed.subscribe(() => {
+            this.modal = null;
+        });
+
+        try {
+            const response = await request;
+
+            if (this.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;
+            if (this.modal) {
+                this.modal.close();
+            }
+        }
+    }
 }

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

@@ -1,124 +1,71 @@
-<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="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" 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>

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

@@ -1,121 +1,104 @@
-import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
+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 { LogService } from "jslib-common/abstractions/log.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
+import { ToasterService } from 'angular2-toaster';
 
-import { ProviderUserInviteRequest } from "jslib-common/models/request/provider/providerUserInviteRequest";
+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 { PermissionsApi } from "jslib-common/models/api/permissionsApi";
+import { ProviderUserInviteRequest } from 'jslib-common/models/request/provider/providerUserInviteRequest';
 
-import { ProviderUserType } from "jslib-common/enums/providerUserType";
-import { ProviderUserUpdateRequest } from "jslib-common/models/request/provider/providerUserUpdateRequest";
+import { PermissionsApi } from 'jslib-common/models/api/permissionsApi';
+
+import { ProviderUserType } from 'jslib-common/enums/providerUserType';
+import { ProviderUserUpdateRequest } from 'jslib-common/models/request/provider/providerUserUpdateRequest';
 
 @Component({
-  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: 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;
 
-  constructor(
-    private apiService: ApiService,
-    private i18nService: I18nService,
-    private platformUtilsService: PlatformUtilsService,
-    private logService: LogService
-  ) {}
+    constructor(private apiService: ApiService, private i18nService: I18nService,
+        private toasterService: ToasterService, private platformUtilsService: PlatformUtilsService) { }
 
-  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 (e) {
-        this.logService.error(e);
-      }
-    } else {
-      this.title = this.i18nService.t("inviteUser");
+        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;
     }
 
-    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 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 { }
     }
 
-    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;
+    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 { }
     }
 
-    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 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>
-        <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>
-  </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,50 +1,51 @@
-import { Component } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
+import { Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 
-import { ProviderService } from "jslib-common/abstractions/provider.service";
+import { UserService } from 'jslib-common/abstractions/user.service';
 
-import { Provider } from "jslib-common/models/domain/provider";
+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;
 
-  constructor(private route: ActivatedRoute, private providerService: ProviderService) {}
+    provider: Provider;
+    private providerId: string;
 
-  ngOnInit() {
-    document.body.classList.remove("layout_frontend");
-    this.route.params.subscribe(async (params) => {
-      this.providerId = params.providerId;
-      await this.load();
-    });
-  }
+    constructor(private route: ActivatedRoute, private userService: UserService) { }
 
-  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";
+    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';
+        }
     }
-  }
 }

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

@@ -1,123 +1,123 @@
-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 { AuthGuardService } from 'jslib-angular/services/auth-guard.service';
+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 { 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 { 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 { ProvidersComponent } from 'src/app/providers/providers.component';
+import { ProviderGuardService } from './services/provider-guard.service';
+import { ProviderTypeGuardService } from './services/provider-type-guard.service';
+import { AccountComponent } from './settings/account.component';
 
 const routes: Routes = [
-  {
-    path: "",
-    canActivate: [AuthGuardService],
-    component: ProvidersComponent,
-  },
-  {
-    path: "",
-    component: FrontendLayoutComponent,
-    children: [
-      {
-        path: "setup-provider",
-        component: SetupProviderComponent,
-        data: { titleId: "setupProvider" },
-      },
-      {
-        path: "accept-provider",
-        component: AcceptProviderComponent,
-        data: { titleId: "acceptProvider" },
-      },
-    ],
-  },
-  {
-    path: "",
-    canActivate: [AuthGuardService],
-    children: [
-      {
-        path: "setup",
-        component: SetupComponent,
-      },
-      {
-        path: ":providerId",
-        component: ProvidersLayoutComponent,
-        canActivate: [ProviderGuardService],
+    {
+        path: '',
+        canActivate: [AuthGuardService],
+        component: ProvidersComponent,
+    },
+    {
+        path: '',
+        component: FrontendLayoutComponent,
         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],
-                },
-              },
-            ],
-          },
+            {
+                path: 'setup-provider',
+                component: SetupProviderComponent,
+                data: { titleId: 'setupProvider' },
+            },
+            {
+                path: 'accept-provider',
+                component: AcceptProviderComponent,
+                data: { titleId: 'acceptProvider' },
+            },
         ],
-      },
-    ],
-  },
+    },
+    {
+        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,63 +1,62 @@
-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 { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
 
-import { ModalService } from "jslib-angular/services/modal.service";
+import { ProviderGuardService } from './services/provider-guard.service';
+import { ProviderTypeGuardService } from './services/provider-type-guard.service';
+import { ProviderService } from './services/provider.service';
 
-import { ProviderGuardService } from "./services/provider-guard.service";
-import { ProviderTypeGuardService } from "./services/provider-type-guard.service";
-import { WebProviderService } from "./services/webProvider.service";
+import { ProvidersLayoutComponent } from './providers-layout.component';
+import { ProvidersRoutingModule } from './providers-routing.module';
 
-import { 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 { 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 { 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 { 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 { SetupProviderComponent } from "./setup/setup-provider.component";
-import { SetupComponent } from "./setup/setup.component";
-
-import { OssModule } from "src/app/oss.module";
+import { OssModule } from 'src/app/oss.module';
 
 @NgModule({
-  imports: [CommonModule, FormsModule, OssModule, ProvidersRoutingModule],
-  declarations: [
-    AcceptProviderComponent,
-    AccountComponent,
-    AddOrganizationComponent,
-    BulkConfirmComponent,
-    BulkRemoveComponent,
-    ClientsComponent,
-    CreateOrganizationComponent,
-    EventsComponent,
-    ManageComponent,
-    PeopleComponent,
-    ProvidersLayoutComponent,
-    SettingsComponent,
-    SetupComponent,
-    SetupProviderComponent,
-    UserAddEditComponent,
-  ],
-  providers: [WebProviderService, ProviderGuardService, ProviderTypeGuardService],
+    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,
+    ],
 })
-export class ProvidersModule {
-  constructor(modalService: ModalService, componentFactoryResolver: ComponentFactoryResolver) {
-    modalService.registerComponentFactoryResolver(
-      AddOrganizationComponent,
-      componentFactoryResolver
-    );
-  }
-}
+export class ProvidersModule {}

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

@@ -1,31 +1,32 @@
-import { Injectable } from "@angular/core";
-import { ActivatedRouteSnapshot, CanActivate, Router } from "@angular/router";
+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";
+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 router: Router,
-    private platformUtilsService: PlatformUtilsService,
-    private i18nService: I18nService,
-    private providerService: ProviderService
-  ) {}
+    constructor(private userService: UserService, private router: Router,
+        private toasterService: ToasterService, private i18nService: I18nService) { }
 
-  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;
-    }
+    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;
-  }
+        return true;
+    }
 }

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

@@ -1,27 +1,31 @@
-import { Injectable } from "@angular/core";
-import { ActivatedRouteSnapshot, CanActivate, Router } from "@angular/router";
+import { Injectable } from '@angular/core';
+import {
+    ActivatedRouteSnapshot,
+    CanActivate,
+    Router,
+} from '@angular/router';
 
-import { ProviderService } from "jslib-common/abstractions/provider.service";
+import { UserService } from 'jslib-common/abstractions/user.service';
 
-import { Permissions } from "jslib-common/enums/permissions";
+import { Permissions } from 'jslib-common/enums/permissions';
 
 @Injectable()
 export class ProviderTypeGuardService implements CanActivate {
-  constructor(private providerService: ProviderService, private router: Router) {}
+    constructor(private userService: UserService, 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[]);
+    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;
+        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;
     }
-
-    this.router.navigate(["/providers", provider.id]);
-    return false;
-  }
 }

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

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

@@ -1,36 +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 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,48 +1,30 @@
 <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="fa fa-spinner fa-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>
+<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>
     </div>
-    <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="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="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
+        <span>{{'save' | i18n}}</span>
+    </button>
 </form>

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

@@ -1,65 +1,62 @@
-import { Component } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
+import { Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { ToasterService } from 'angular2-toaster';
 
-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 { 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 { ProviderUpdateRequest } from 'jslib-common/models/request/provider/providerUpdateRequest';
 
-import { ProviderResponse } from "jslib-common/models/response/provider/providerResponse";
+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 route: ActivatedRoute,
-    private syncService: SyncService,
-    private platformUtilsService: PlatformUtilsService,
-    private logService: LogService
-  ) {}
+    constructor(private apiService: ApiService, private i18nService: I18nService,
+        private toasterService: ToasterService, 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.platformUtilsService.showToast("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.toasterService.popAsync('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 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>
-    <div class="col-9">
-      <router-outlet></router-outlet>
-    </div>
-  </div>
 </div>

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

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

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

@@ -1,31 +1,27 @@
 <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 src="/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>
 <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 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>
-      </div>
     </div>
-  </div>
 </div>

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

@@ -1,21 +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";
 
-  requiredParameters = ["providerId", "email", "token"];
+    failedShortMessage = 'inviteAcceptFailedShort';
+    failedMessage = 'inviteAcceptFailed';
 
-  async authedHandler(qParams: any) {
-    this.router.navigate(["/providers/setup"], { queryParams: qParams });
-  }
+    requiredParameters = ['providerId', 'email', 'token'];
 
-  // tslint:disable-next-line
-  async unauthedHandler(qParams: any) {}
+    async authedHandler(qParams: any) {
+        this.router.navigate(['/providers/setup'], {queryParams: qParams});
+    }
+
+    // tslint:disable-next-line
+    async unauthedHandler(qParams: any) {}
 }

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

@@ -1,39 +1,32 @@
 <app-navbar></app-navbar>
 <div class="container page-content">
-  <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 class="page-header">
+        <h1>{{'setupProvider' | i18n}}</h1>
     </div>
+    <p>{{'setupProviderDesc' | i18n}}</p>
 
-    <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>
+    <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>
 <app-footer></app-footer>

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

@@ -1,101 +1,94 @@
-import { Component, OnInit } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
+import {
+    Component,
+    OnInit,
+} from '@angular/core';
+import {
+    ActivatedRoute,
+    Router,
+} from '@angular/router';
+import {
+    Toast,
+    ToasterService,
+} from 'angular2-toaster';
 
-import { first } from "rxjs/operators";
+import { ApiService } from 'jslib-common/abstractions/api.service';
+import { CryptoService } from 'jslib-common/abstractions/crypto.service';
 
-import { ApiService } from "jslib-common/abstractions/api.service";
-import { CryptoService } from "jslib-common/abstractions/crypto.service";
-
-import { ValidationService } from "jslib-angular/services/validation.service";
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-import { SyncService } from "jslib-common/abstractions/sync.service";
-import { ProviderSetupRequest } from "jslib-common/models/request/provider/providerSetupRequest";
+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';
 
 @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 platformUtilsService: PlatformUtilsService,
-    private i18nService: I18nService,
-    private route: ActivatedRoute,
-    private cryptoService: CryptoService,
-    private apiService: ApiService,
-    private syncService: SyncService,
-    private validationService: ValidationService
-  ) {}
+    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) { }
 
-  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;
+    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;
 
-      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;
-
-      // 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);
+            if (error) {
+                const toast: Toast = {
+                    type: 'error',
+                    title: null,
+                    body: this.i18nService.t('emergencyInviteAcceptFailed'),
+                    timeout: 10000,
+                };
+                this.toasterService.popAsync(toast);
+                this.router.navigate(['/']);
+            } else {
+                this.providerId = qParams.providerId;
+                this.token = qParams.token;
+            }
+        });
+    }
+
+    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);
+        }
     }
-  }
 }

bitwarden_license/webpack.config.js

@@ -1,8 +1,12 @@
-const { AngularWebpackPlugin } = require("@ngtools/webpack");
+const AngularCompilerPlugin = require('@ngtools/webpack').AngularCompilerPlugin;
 
-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].entryModule = "bitwarden_license/src/app/app.module#AppModule";
+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,
+});
 
 module.exports = webpackConfig;

config.js

@@ -1,53 +1,29 @@
 function load(envName) {
-  return {
-    ...require("./config/base.json"),
-    ...loadConfig(envName),
-    ...loadConfig("local"),
-    dev: {
-      ...require("./config/base.json").dev,
-      ...loadConfig(envName).dev,
-      ...loadConfig("local").dev,
-    },
-  };
+    const envOverrides = {
+        'production': () => require('./config/production.json'),
+        'qa': () => require('./config/qa.json'),
+        'development': () => require('./config/development.json'),
+    };
+
+    const baseConfig = require('./config/base.json');
+    const overrideConfig = envOverrides.hasOwnProperty(envName) ? envOverrides[envName]() : {};
+
+    return {
+        ...baseConfig,
+        ...overrideConfig
+    };
 }
 
 function log(configObj) {
-  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;
-    }
-  }
-}
-
-function generateSubstitutions(configObj) {
-  let result = {};
-
-  Object.keys(configObj.compileFlags ?? {}).forEach(key => {
-    result = { ...result, ...generateSubstitutionsForFlag(key) };
-  });
-
-  return result;
-}
-
-function generateSubstitutionsForFlag(flagName) {
-  return {
-    "featureFlag: (.*)[\\s\\S]*?\\/\\/ endFeatureFlag": ""
-  };
+    const repeatNum = 50
+    console.log(`${"=".repeat(repeatNum)}\nenvConfig`)
+    Object.entries(configObj).map(([key, value]) => {
+        console.log(`  ${key}: ${value}`)
+    })
+    console.log(`${"=".repeat(repeatNum)}`)
 }
 
 module.exports = {
-  load,
-  log,
-  generateSubstitutions,
+    load,
+    log
 };

config/base.json

@@ -1,12 +1,8 @@
 {
-  "urls": {},
-  "stripeKey": "pk_test_KPoCfZXu7mznb9uSCPZ2JpTD",
-  "braintreeKey": "sandbox_r72q8jq6_9pnxkwm75f87sdc2",
-  "paypal": {
-    "businessId": "AD3LAUZSNVPJY",
-    "buttonAction": "https://www.sandbox.paypal.com/cgi-bin/webscr"
-  },
-  "dev": {
-    "allowedHosts": "auto"
-  }
+    "proxyApi": "http://localhost:4000",
+    "proxyIdentity": "http://localhost:33656",
+    "proxyEvents": "http://localhost:46273",
+    "proxyNotifications": "http://localhost:61840",
+    "proxyPortal": "http://localhost:52313",
+    "allowedHosts": []
 }

config/cloud.json

@@ -1,17 +0,0 @@
-{
-  "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,14 +0,0 @@
-{
-  "urls": {
-    "notifications": "http://localhost:61840"
-  },
-  "dev": {
-    "proxyApi": "http://localhost:4000",
-    "proxyIdentity": "http://localhost:33656",
-    "proxyEvents": "http://localhost:46273",
-    "proxyNotifications": "http://localhost:61840"
-  },
-  "compileFlags": {
-    "Test": false
-  }
-}

config/production.json

@@ -0,0 +1,7 @@
+{
+    "proxyApi": "https://api.bitwarden.com",
+    "proxyIdentity": "https://identity.bitwarden.com",
+    "proxyEvents": "https://events.bitwarden.com",
+    "proxyNotifications": "https://notifications.bitwarden.com",
+    "proxyPortal": "https://portal.bitwarden.com"
+}

config/qa.json

@@ -1,11 +1,7 @@
 {
-  "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"
-  }
+    "proxyApi": "https://api.qa.bitwarden.com",
+    "proxyIdentity": "https://identity.qa.bitwarden.com",
+    "proxyEvents": "https://events.qa.bitwarden.com",
+    "proxyNotifications": "https://notifications.qa.bitwarden.com",
+    "proxyPortal": "https://portal.qa.bitwarden.com"
 }

config/selfhosted.json

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

crowdin.yml

@@ -1,9 +1,5 @@
-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:

entrypoint.sh

@@ -31,6 +31,7 @@ mkhomedir_helper $USERNAME
 
 chown -R $USERNAME:$GROUPNAME /etc/bitwarden
 cp /etc/bitwarden/web/app-id.json /app/app-id.json
+cp /etc/bitwarden/web/assetlinks.json /app/assetlinks.json
 chown -R $USERNAME:$GROUPNAME /app
 chown -R $USERNAME:$GROUPNAME /bitwarden_server
 

gulpfile.js

@@ -0,0 +1,37 @@
+const gulp = require('gulp');
+const googleWebFonts = require('gulp-google-webfonts');
+const del = require('del');
+const package = require('./package.json');
+const fs = require('fs');
+
+const paths = {
+    node_modules: './node_modules/',
+    src: './src/',
+    build: './build/',
+    cssDir: './src/css/',
+};
+
+function clean() {
+    return del([paths.cssDir]);
+}
+
+function webfonts() {
+    return gulp.src('./webfonts.list')
+        .pipe(googleWebFonts({
+            fontsDir: 'webfonts',
+            cssFilename: 'webfonts.css',
+            format: 'woff',
+        }))
+        .pipe(gulp.dest(paths.cssDir));
+};
+
+function version(cb) {
+    fs.writeFileSync(paths.build + 'version.json', '{"version":"' + package.version + '"}');
+    cb();
+}
+
+exports.clean = clean;
+exports.webfonts = gulp.series(clean, webfonts);
+exports.prebuild = gulp.series(clean, webfonts);
+exports.version = version;
+exports.postdist = version;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitwarden-web",
-  "version": "2.25.1",
+  "version": "2.22.2",
   "license": "GPL-3.0",
   "repository": "https://github.com/bitwarden/web",
   "scripts": {
@@ -11,75 +11,68 @@
     "symlink:win": "rm -rf ./jslib && cmd /c mklink /J .\\jslib ..\\jslib",
     "symlink:mac": "npm run symlink:lin",
     "symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib",
-    "build:oss": "webpack",
-    "build:bit": "webpack -c bitwarden_license/webpack.config.js",
-    "build:oss:watch": "webpack serve",
-    "build:bit:watch": "webpack serve -c bitwarden_license/webpack.config.js",
-    "build:bit:dev": "cross-env ENV=development npm run build:bit",
-    "build:bit:dev:watch": "cross-env ENV=development npm run build:bit:watch",
-    "build:bit:qa": "cross-env NODE_ENV=production ENV=qa npm run build:bit",
-    "build:bit:cloud": "cross-env NODE_ENV=production ENV=cloud npm run build:bit",
-    "build:oss:selfhost:watch": "cross-env ENV=selfhosted npm run build:oss:watch",
-    "build:bit:selfhost:watch": "cross-env ENV=selfhosted npm run build:bit:watch",
-    "build:oss:selfhost:prod": "cross-env ENV=selfhosted NODE_ENV=production npm run build:oss",
-    "build:bit:selfhost:prod": "cross-env ENV=selfhosted NODE_ENV=production npm run build:bit",
+    "build": "gulp prebuild && webpack -c bitwarden_license/webpack.config.js",
+    "build:oss": "gulp prebuild && webpack",
+    "build:watch": "gulp prebuild && webpack serve -c bitwarden_license/webpack.config.js",
+    "build:watch:oss": "gulp prebuild && webpack serve",
+    "build:dev": "cross-env ENV=development npm run build",
+    "build:dev:watch": "cross-env ENV=development npm run build:watch",
+    "build:qa": "cross-env NODE_ENV=production ENV=qa npm run build",
+    "build:qa:watch": "cross-env NODE_ENV=production ENV=qa npm run build:watch",
+    "build:prod": "cross-env NODE_ENV=production ENV=production npm run build",
+    "build:prod:oss": "cross-env NODE_ENV=production ENV=production npm run build:oss",
+    "build:prod:watch": "cross-env NODE_ENV=production ENV=production npm run build:watch",
+    "build:selfhost": "cross-env SELF_HOST=true npm run build:watch",
+    "build:selfhost:watch": "cross-env SELF_HOST=true npm run build:watch",
+    "build:selfhost:prod": "cross-env SELF_HOST=true NODE_ENV=production npm run build",
+    "build:selfhost:prod:oss": "cross-env SELF_HOST=true NODE_ENV=production npm run build:oss",
+    "build:selfhost:prod:watch": "cross-env SELF_HOST=true NODE_ENV=production npm run build:watch",
     "clean:l10n": "git push origin --delete l10n_master",
-    "dist:bit:cloud": "npm run build:bit:cloud",
-    "dist:oss:selfhost": "npm run build:oss:selfhost:prod",
-    "dist:bit:selfhost": "npm run build:bit:selfhost:prod",
-    "deploy": "npm run dist:bit && gh-pages -d build",
-    "deploy:dev": "npm run dist:bit && gh-pages -d build -r git@github.com:kspearrin/bitwarden-web-dev.git",
-    "lint": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts' && prettier --check .",
-    "lint:fix": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts' --fix",
-    "prettier": "prettier --write .",
-    "prepare": "husky install"
+    "dist": "npm run build:prod && gulp postdist",
+    "dist:oss": "npm run build:prod:oss && gulp postdist",
+    "dist:selfhost": "npm run build:selfhost:prod && gulp postdist",
+    "dist:selfhost:oss": "npm run build:selfhost:prod:oss && gulp postdist",
+    "deploy": "npm run dist && gh-pages -d build",
+    "deploy:dev": "npm run dist && 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"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "^12.2.13",
-    "@ngtools/webpack": "^12.2.13",
+    "@angular/compiler-cli": "^11.2.11",
+    "@ngtools/webpack": "^11.2.10",
     "@types/jquery": "^3.5.5",
-    "@types/node": "^16.11.12",
+    "@types/node": "^14.17.2",
     "@types/webcrypto": "^0.0.28",
-    "@types/webpack": "^5.28.0",
-    "buffer": "^6.0.3",
-    "clean-webpack-plugin": "^4.0.0",
-    "copy-webpack-plugin": "^10.0.0",
+    "@types/webpack": "^4.4.27",
+    "clean-webpack-plugin": "^3.0.0",
+    "copy-webpack-plugin": "^6.4.0",
     "cross-env": "^7.0.3",
-    "css-loader": "^6.5.1",
+    "css-loader": "^5.2.3",
+    "del": "^6.0.0",
+    "file-loader": "^6.2.0",
     "gh-pages": "^3.1.0",
-    "html-loader": "^3.0.1",
-    "html-webpack-injector": "1.1.4",
-    "html-webpack-plugin": "^5.5.0",
-    "husky": "^7.0.4",
-    "lint-staged": "^12.1.2",
-    "mini-css-extract-plugin": "^2.4.5",
-    "prettier": "2.5.1",
-    "process": "^0.11.10",
+    "gulp": "^4.0.2",
+    "gulp-google-webfonts": "^4.0.0",
+    "html-loader": "^1.3.2",
+    "html-webpack-plugin": "^4.5.1",
+    "mini-css-extract-plugin": "^1.5.0",
     "sass": "^1.32.10",
-    "sass-loader": "^12.4.0",
-    "style-loader": "^3.3.1",
-    "terser-webpack-plugin": "^5.2.5",
-    "ts-loader": "^9.2.5",
+    "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.3.5",
-    "util": "^0.12.4",
-    "webpack": "^5.64.4",
-    "webpack-cli": "^4.9.1",
-    "webpack-dev-server": "^4.6.0"
+    "typescript": "4.1.5",
+    "webpack": "^4.46.0",
+    "webpack-cli": "^4.6.0",
+    "webpack-dev-server": "^3.11.2"
   },
   "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",
     "browser-hrtime": "^1.1.8",
@@ -88,20 +81,14 @@
     "font-awesome": "4.7.0",
     "jquery": "3.6.0",
     "ngx-infinite-scroll": "^10.0.1",
-    "ngx-toastr": "14.1.4",
     "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"
   },
   "engines": {
-    "node": "~16",
-    "npm": "~8"
-  },
-  "lint-staged": {
-    "*": "prettier --ignore-unknown --write",
-    "*.png": "node scripts/optimize.js"
+    "node": "~14",
+    "npm": "~7"
   }
 }

scripts/optimize.js

@@ -1,21 +0,0 @@
-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,56 +1,50 @@
 <!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-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 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</div>
+    <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>
         </div>
-      </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>
+        <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>
 </html>

src/404/styles.css

@@ -1,121 +1,119 @@
 @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;
 }

src/app-id.json

@@ -8,7 +8,8 @@
       "ids": [
         "https://vault.bitwarden.com",
         "ios:bundle-id:com.8bit.bitwarden",
-        "android:apk-key-hash:dUGFzUzf3lmHSLBDBIv+WaFyZMI"
+        "android:apk-key-hash:dUGFzUzf3lmHSLBDBIv+WaFyZMI",
+        "android:apk-key-hash:pSCbprJwYtwCZOPOpmU6YuPBs/g"
       ]
     }
   ]

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

@@ -1,41 +1,34 @@
 <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 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>
 <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 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>
-      </div>
     </div>
-  </div>
 </div>

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

@@ -1,54 +1,60 @@
-import { Component } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
+import { Component } from '@angular/core';
+import {
+    ActivatedRoute,
+    Router,
+} 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 { StateService } from "jslib-common/abstractions/state.service";
-import { EmergencyAccessAcceptRequest } from "jslib-common/models/request/emergencyAccessAcceptRequest";
-import { BaseAcceptComponent } from "../common/base.accept.component";
+import {
+    Toast,
+    ToasterService,
+} from 'angular2-toaster';
+
+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';
 
 @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;
 
-  protected requiredParameters: string[] = ["id", "name", "email", "token"];
-  protected failedShortMessage = "emergencyInviteAcceptFailedShort";
-  protected failedMessage = "emergencyInviteAcceptFailed";
+    name: string;
 
-  constructor(
-    router: Router,
-    platformUtilsService: PlatformUtilsService,
-    i18nService: I18nService,
-    route: ActivatedRoute,
-    private apiService: ApiService,
-    stateService: StateService
-  ) {
-    super(router, platformUtilsService, i18nService, route, stateService);
-  }
+    protected requiredParameters: string[] = ['id', 'name', 'email', 'token'];
+    protected failedShortMessage = 'emergencyInviteAcceptFailedShort';
+    protected failedMessage = 'emergencyInviteAcceptFailed';
 
-  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, " ");
+    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, ' ');
+        }
     }
-  }
 }

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

@@ -1,42 +1,35 @@
 <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="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>
 <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 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>
-      </div>
     </div>
-  </div>
 </div>

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

@@ -1,127 +1,114 @@
-import { Component } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
+import { Component } from '@angular/core';
+import {
+    ActivatedRoute,
+    Router,
+} from '@angular/router';
 
-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 {
+    Toast,
+    ToasterService,
+} from 'angular2-toaster';
 
-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 { Utils } from "jslib-common/misc/utils";
-import { Policy } from "jslib-common/models/domain/policy";
-import { BaseAcceptComponent } from "../common/base.accept.component";
+import { OrganizationUserAcceptRequest } from 'jslib-common/models/request/organizationUserAcceptRequest';
+import { OrganizationUserResetPasswordEnrollmentRequest } from 'jslib-common/models/request/organizationUserResetPasswordEnrollmentRequest';
+
+import { Utils } from 'jslib-common/misc/utils';
+import { Policy } from 'jslib-common/models/domain/policy';
+import { BaseAcceptComponent } from '../common/base.accept.component';
 
 @Component({
-  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,
-    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
-      );
+    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);
     }
 
-    await this.actionPromise;
-    this.platformUtilService.showToast(
-      "success",
-      this.i18nService.t("inviteAccepted"),
-      this.i18nService.t("inviteAcceptedDesc"),
-      { timeout: 10000 }
-    );
+    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.stateService.setOrganizationInvitation(null);
-    this.router.navigate(["/vault"]);
-  }
+                    const publicKey = Utils.fromB64ToArray(response.publicKey);
 
-  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);
-  }
+                    // 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);
 
-  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);
+                    // 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']);
     }
 
-    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;
+    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);
     }
 
-    return false;
-  }
+    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;
+    }
 }

src/app/accounts/hint.component.html

@@ -1,44 +1,27 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container" ngNativeValidate>
-  <div class="row justify-content-md-center mt-5">
-    <div class="col-5">
-      <p class="lead text-center mb-4">{{ "passwordHint" | i18n }}</p>
-      <div class="card d-block">
-        <div class="card-body">
-          <div class="form-group">
-            <label for="email">{{ "emailAddress" | i18n }}</label>
-            <input
-              id="email"
-              class="form-control"
-              type="text"
-              name="Email"
-              [(ngModel)]="email"
-              required
-              appAutofocus
-              inputmode="email"
-              appInputVerbatim="false"
-            />
-            <small class="form-text text-muted">{{ "enterEmailToGetHint" | i18n }}</small>
-          </div>
-          <hr />
-          <div class="d-flex">
-            <button
-              type="submit"
-              class="btn btn-primary btn-block btn-submit"
-              [disabled]="form.loading"
-            >
-              <span [hidden]="form.loading">{{ "submit" | i18n }}</span>
-              <i
-                class="fa fa-spinner fa-spin"
-                title="{{ 'loading' | i18n }}"
-                aria-hidden="true"
-              ></i>
-            </button>
-            <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
-              {{ "cancel" | i18n }}
-            </a>
-          </div>
+    <div class="row justify-content-md-center mt-5">
+        <div class="col-5">
+            <p class="lead text-center mb-4">{{'passwordHint' | i18n}}</p>
+            <div class="card d-block">
+                <div class="card-body">
+                    <div class="form-group">
+                        <label for="email">{{'emailAddress' | i18n}}</label>
+                        <input id="email" class="form-control" type="text" name="Email" [(ngModel)]="email" required
+                            appAutofocus inputmode="email" appInputVerbatim="false">
+                        <small class="form-text text-muted">{{'enterEmailToGetHint' | i18n}}</small>
+                    </div>
+                    <hr>
+                    <div class="d-flex">
+                        <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading">
+                            <span [hidden]="form.loading">{{'submit' | i18n}}</span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
+                        </button>
+                        <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+                            {{'cancel' | i18n}}
+                        </a>
+                    </div>
+                </div>
+            </div>
         </div>
-      </div>
     </div>
-  </div>
 </form>

src/app/accounts/hint.component.ts

@@ -1,25 +1,19 @@
-import { Component } from "@angular/core";
-import { Router } from "@angular/router";
+import { Component } from '@angular/core';
+import { Router } 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 { ApiService } from 'jslib-common/abstractions/api.service';
+import { I18nService } from 'jslib-common/abstractions/i18n.service';
+import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
 
-import { HintComponent as BaseHintComponent } from "jslib-angular/components/hint.component";
+import { HintComponent as BaseHintComponent } from 'jslib-angular/components/hint.component';
 
 @Component({
-  selector: "app-hint",
-  templateUrl: "hint.component.html",
+    selector: 'app-hint',
+    templateUrl: 'hint.component.html',
 })
 export class HintComponent extends BaseHintComponent {
-  constructor(
-    router: Router,
-    i18nService: I18nService,
-    apiService: ApiService,
-    platformUtilsService: PlatformUtilsService,
-    logService: LogService
-  ) {
-    super(router, i18nService, apiService, platformUtilsService, logService);
-  }
+    constructor(router: Router, i18nService: I18nService,
+        apiService: ApiService, platformUtilsService: PlatformUtilsService) {
+        super(router, i18nService, apiService, platformUtilsService);
+    }
 }

src/app/accounts/lock.component.html

@@ -1,68 +1,42 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container" ngNativeValidate>
-  <div class="row justify-content-md-center mt-5">
-    <div class="col-5">
-      <p class="text-center mb-4">
-        <i class="fa fa-lock fa-4x text-muted" aria-hidden="true"></i>
-      </p>
-      <p class="lead text-center mx-4 mb-4">{{ "yourVaultIsLocked" | i18n }}</p>
-      <div class="card d-block">
-        <div class="card-body">
-          <div class="form-group">
-            <label for="masterPassword">{{ "masterPass" | i18n }}</label>
-            <div class="d-flex">
-              <input
-                id="masterPassword"
-                type="{{ showPassword ? 'text' : 'password' }}"
-                name="MasterPassword"
-                class="text-monospace form-control"
-                [(ngModel)]="masterPassword"
-                required
-                appAutofocus
-                appInputVerbatim
-              />
-              <button
-                type="button"
-                class="ml-1 btn btn-link"
-                appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-                (click)="togglePassword()"
-              >
-                <i
-                  class="fa fa-lg"
-                  aria-hidden="true"
-                  [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
-                ></i>
-              </button>
+    <div class="row justify-content-md-center mt-5">
+        <div class="col-5">
+            <p class="text-center mb-4">
+                <i class="fa fa-lock fa-4x text-muted" aria-hidden="true"></i>
+            </p>
+            <p class="lead text-center mx-4 mb-4">{{'yourVaultIsLocked' | i18n}}</p>
+            <div class="card d-block">
+                <div class="card-body">
+                    <div class="form-group">
+                        <label for="masterPassword">{{'masterPass' | i18n}}</label>
+                        <div class="d-flex">
+                            <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}"
+                                name="MasterPassword" class="text-monospace form-control" [(ngModel)]="masterPassword"
+                                required appAutofocus appInputVerbatim>
+                            <button type="button" class="ml-1 btn btn-link" appA11yTitle="{{'toggleVisibility' | i18n}}"
+                                (click)="togglePassword()">
+                                <i class="fa fa-lg" aria-hidden="true"
+                                    [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                            </button>
+                        </div>
+                        <small class="text-muted form-text">
+                            {{'loggedInAsEmailOn' | i18n : email : webVaultHostname}}
+                        </small>
+                    </div>
+                    <hr>
+                    <div class="d-flex">
+                        <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading">
+                            <span>
+                                <i class="fa fa-unlock-alt" aria-hidden="true"></i> {{'unlock' | i18n}}
+                            </span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
+                        </button>
+                        <button type="button" class="btn btn-outline-secondary btn-block ml-2 mt-0" (click)="logOut()">
+                            {{'logOut' | i18n}}
+                        </button>
+                    </div>
+                </div>
             </div>
-            <small class="text-muted form-text">
-              {{ "loggedInAsEmailOn" | i18n: email:webVaultHostname }}
-            </small>
-          </div>
-          <hr />
-          <div class="d-flex">
-            <button
-              type="submit"
-              class="btn btn-primary btn-block btn-submit"
-              [disabled]="form.loading"
-            >
-              <span>
-                <i class="fa fa-unlock-alt" aria-hidden="true"></i> {{ "unlock" | i18n }}
-              </span>
-              <i
-                class="fa fa-spinner fa-spin"
-                title="{{ 'loading' | i18n }}"
-                aria-hidden="true"
-              ></i>
-            </button>
-            <button
-              type="button"
-              class="btn btn-outline-secondary btn-block ml-2 mt-0"
-              (click)="logOut()"
-            >
-              {{ "logOut" | i18n }}
-            </button>
-          </div>
         </div>
-      </div>
     </div>
-  </div>
 </form>

src/app/accounts/lock.component.ts

@@ -1,65 +1,44 @@
-import { Component, NgZone } from "@angular/core";
-import { Router } from "@angular/router";
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
 
-import { ApiService } from "jslib-common/abstractions/api.service";
-import { CryptoService } from "jslib-common/abstractions/crypto.service";
-import { EnvironmentService } from "jslib-common/abstractions/environment.service";
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service";
-import { LogService } from "jslib-common/abstractions/log.service";
-import { MessagingService } from "jslib-common/abstractions/messaging.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-import { StateService } from "jslib-common/abstractions/state.service";
-import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service";
+import { ApiService } from 'jslib-common/abstractions/api.service';
+import { CryptoService } from 'jslib-common/abstractions/crypto.service';
+import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
+import { I18nService } from 'jslib-common/abstractions/i18n.service';
+import { MessagingService } from 'jslib-common/abstractions/messaging.service';
+import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
+import { StateService } from 'jslib-common/abstractions/state.service';
+import { StorageService } from 'jslib-common/abstractions/storage.service';
+import { UserService } from 'jslib-common/abstractions/user.service';
+import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service';
 
-import { RouterService } from "../services/router.service";
+import { RouterService } from '../services/router.service';
 
-import { LockComponent as BaseLockComponent } from "jslib-angular/components/lock.component";
+import { LockComponent as BaseLockComponent } from 'jslib-angular/components/lock.component';
 
 @Component({
-  selector: "app-lock",
-  templateUrl: "lock.component.html",
+    selector: 'app-lock',
+    templateUrl: 'lock.component.html',
 })
 export class LockComponent extends BaseLockComponent {
-  constructor(
-    router: Router,
-    i18nService: I18nService,
-    platformUtilsService: PlatformUtilsService,
-    messagingService: MessagingService,
-    cryptoService: CryptoService,
-    vaultTimeoutService: VaultTimeoutService,
-    environmentService: EnvironmentService,
-    private routerService: RouterService,
-    stateService: StateService,
-    apiService: ApiService,
-    logService: LogService,
-    keyConnectorService: KeyConnectorService,
-    ngZone: NgZone
-  ) {
-    super(
-      router,
-      i18nService,
-      platformUtilsService,
-      messagingService,
-      cryptoService,
-      vaultTimeoutService,
-      environmentService,
-      stateService,
-      apiService,
-      logService,
-      keyConnectorService,
-      ngZone
-    );
-  }
+    constructor(router: Router, i18nService: I18nService,
+        platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
+        userService: UserService, cryptoService: CryptoService,
+        storageService: StorageService, vaultTimeoutService: VaultTimeoutService,
+        environmentService: EnvironmentService, private routerService: RouterService,
+        stateService: StateService, apiService: ApiService) {
+        super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService,
+            storageService, vaultTimeoutService, environmentService, stateService, apiService);
+    }
 
-  async ngOnInit() {
-    await super.ngOnInit();
-    this.onSuccessfulSubmit = async () => {
-      const previousUrl = this.routerService.getPreviousUrl();
-      if (previousUrl !== "/" && previousUrl.indexOf("lock") === -1) {
-        this.successRoute = previousUrl;
-      }
-      this.router.navigate([this.successRoute]);
-    };
-  }
+    async ngOnInit() {
+        await super.ngOnInit();
+        this.onSuccessfulSubmit = () => {
+            const previousUrl = this.routerService.getPreviousUrl();
+            if (previousUrl !== '/' && previousUrl.indexOf('lock') === -1) {
+                this.successRoute = previousUrl;
+            }
+            this.router.navigate([this.successRoute]);
+        };
+    }
 }

src/app/accounts/login.component.html

@@ -1,101 +1,61 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container" ngNativeValidate>
-  <div class="row justify-content-md-center mt-5">
-    <div class="col-5">
-      <img class="mb-2 logo logo-themed" alt="Bitwarden" />
-      <p class="lead text-center mx-4 mb-4">{{ "loginOrCreateNewAccount" | i18n }}</p>
-      <div class="card d-block">
-        <div class="card-body">
-          <app-callout
-            type="warning"
-            title="{{ 'resetPasswordPolicyAutoEnroll' | i18n }}"
-            *ngIf="showResetPasswordAutoEnrollWarning"
-          >
-            {{ "resetPasswordAutoEnrollInviteWarning" | i18n }}
-          </app-callout>
-          <div class="form-group">
-            <label for="email">{{ "emailAddress" | i18n }}</label>
-            <input
-              id="email"
-              class="form-control"
-              type="text"
-              name="Email"
-              [(ngModel)]="email"
-              required
-              inputmode="email"
-              appInputVerbatim="false"
-            />
-          </div>
-          <div class="form-group">
-            <label for="masterPassword">{{ "masterPass" | i18n }}</label>
-            <div class="d-flex">
-              <input
-                id="masterPassword"
-                type="{{ showPassword ? 'text' : 'password' }}"
-                name="MasterPassword"
-                class="text-monospace form-control"
-                [(ngModel)]="masterPassword"
-                required
-                appInputVerbatim
-              />
-              <button
-                type="button"
-                class="ml-1 btn btn-link"
-                appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-                (click)="togglePassword()"
-              >
-                <i
-                  class="fa fa-lg"
-                  aria-hidden="true"
-                  [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
-                ></i>
-              </button>
+    <div class="row justify-content-md-center mt-5">
+        <div class="col-5">
+            <img src="../../images/logo-dark@2x.png" class="logo mb-2" alt="Bitwarden">
+            <p class="lead text-center mx-4 mb-4">{{'loginOrCreateNewAccount' | i18n}}</p>
+            <div class="card d-block">
+                <div class="card-body">
+                    <app-callout type="warning" title="{{'resetPasswordPolicyAutoEnroll' | i18n}}"
+                        *ngIf="showResetPasswordAutoEnrollWarning">
+                        {{'resetPasswordAutoEnrollInviteWarning' | i18n}}
+                    </app-callout>
+                    <div class="form-group">
+                        <label for="email">{{'emailAddress' | i18n}}</label>
+                        <input id="email" class="form-control" type="text" name="Email" [(ngModel)]="email" required
+                            inputmode="email" appInputVerbatim="false">
+                    </div>
+                    <div class="form-group">
+                        <label for="masterPassword">{{'masterPass' | i18n}}</label>
+                        <div class="d-flex">
+                            <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}"
+                                name="MasterPassword" class="text-monospace form-control" [(ngModel)]="masterPassword"
+                                required appInputVerbatim>
+                            <button type="button" class="ml-1 btn btn-link" appA11yTitle="{{'toggleVisibility' | i18n}}"
+                                (click)="togglePassword()">
+                                <i class="fa fa-lg" aria-hidden="true"
+                                    [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                            </button>
+                        </div>
+                        <small class="form-text">
+                            <a routerLink="/hint">{{'getMasterPasswordHint' | i18n}}</a>
+                        </small>
+                    </div>
+                    <div class="form-check mb-3">
+                        <input type="checkbox" class="form-check-input" id="rememberEmail" name="RememberEmail"
+                            [(ngModel)]="rememberEmail">
+                        <label class="form-check-label" for="rememberEmail">{{'rememberEmail' | i18n}}</label>
+                    </div>
+                    <div class="mb-n3" [hidden]="!showCaptcha()"><iframe id="hcaptcha_iframe" height="80"></iframe></div>
+                    <hr>
+                    <div class="d-flex">
+                        <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading">
+                            <span>
+                                <i class="fa fa-sign-in" aria-hidden="true"></i> {{'logIn' | i18n}}
+                            </span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
+                        </button>
+                        <a routerLink="/register" [queryParams]="{email: email}"
+                            class="btn btn-outline-secondary btn-block ml-2 mt-0">
+                            <i class="fa fa-pencil-square-o" aria-hidden="true"></i> {{'createAccount' | i18n}}
+                        </a>
+                    </div>
+                    <div class="d-flex">
+                        <a routerLink="/sso" class="btn btn-outline-secondary btn-block mt-2">
+                            <i class="fa fa-bank" aria-hidden="true"></i> {{'enterpriseSingleSignOn' | i18n}}
+                        </a>
+                    </div>
+                </div>
             </div>
-            <small class="form-text">
-              <a routerLink="/hint">{{ "getMasterPasswordHint" | i18n }}</a>
-            </small>
-          </div>
-          <div class="form-check mb-3">
-            <input
-              type="checkbox"
-              class="form-check-input"
-              id="rememberEmail"
-              name="RememberEmail"
-              [(ngModel)]="rememberEmail"
-            />
-            <label class="form-check-label" for="rememberEmail">{{ "rememberEmail" | i18n }}</label>
-          </div>
-          <div class="mb-n3" [hidden]="!showCaptcha()">
-            <iframe id="hcaptcha_iframe" height="80"></iframe>
-          </div>
-          <hr />
-          <div class="d-flex">
-            <button
-              type="submit"
-              class="btn btn-primary btn-block btn-submit"
-              [disabled]="form.loading"
-            >
-              <span> <i class="fa fa-sign-in" aria-hidden="true"></i> {{ "logIn" | i18n }} </span>
-              <i
-                class="fa fa-spinner fa-spin"
-                title="{{ 'loading' | i18n }}"
-                aria-hidden="true"
-              ></i>
-            </button>
-            <a
-              routerLink="/register"
-              [queryParams]="{ email: email }"
-              class="btn btn-outline-secondary btn-block ml-2 mt-0"
-            >
-              <i class="fa fa-pencil-square-o" aria-hidden="true"></i> {{ "createAccount" | i18n }}
-            </a>
-          </div>
-          <div class="d-flex">
-            <a routerLink="/sso" class="btn btn-outline-secondary btn-block mt-2">
-              <i class="fa fa-bank" aria-hidden="true"></i> {{ "enterpriseSingleSignOn" | i18n }}
-            </a>
-          </div>
         </div>
-      </div>
     </div>
-  </div>
 </form>

src/app/accounts/login.component.ts

@@ -1,118 +1,87 @@
-import { Component, NgZone } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
+import { Component } from '@angular/core';
+import {
+    ActivatedRoute,
+    Router,
+} from '@angular/router';
 
-import { first } from "rxjs/operators";
+import { ApiService } from 'jslib-common/abstractions/api.service';
+import { AuthService } from 'jslib-common/abstractions/auth.service';
+import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service';
+import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
+import { I18nService } from 'jslib-common/abstractions/i18n.service';
+import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
+import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
+import { PolicyService } from 'jslib-common/abstractions/policy.service';
+import { StateService } from 'jslib-common/abstractions/state.service';
+import { StorageService } from 'jslib-common/abstractions/storage.service';
 
-import { ApiService } from "jslib-common/abstractions/api.service";
-import { AuthService } from "jslib-common/abstractions/auth.service";
-import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service";
-import { EnvironmentService } from "jslib-common/abstractions/environment.service";
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { LogService } from "jslib-common/abstractions/log.service";
-import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-import { PolicyService } from "jslib-common/abstractions/policy.service";
-import { StateService } from "jslib-common/abstractions/state.service";
+import { LoginComponent as BaseLoginComponent } from 'jslib-angular/components/login.component';
 
-import { LoginComponent as BaseLoginComponent } from "jslib-angular/components/login.component";
-
-import { Policy } from "jslib-common/models/domain/policy";
+import { Policy } from 'jslib-common/models/domain/policy';
 
 @Component({
-  selector: "app-login",
-  templateUrl: "login.component.html",
+    selector: 'app-login',
+    templateUrl: 'login.component.html',
 })
 export class LoginComponent extends BaseLoginComponent {
-  showResetPasswordAutoEnrollWarning = false;
 
-  constructor(
-    authService: AuthService,
-    router: Router,
-    i18nService: I18nService,
-    private route: ActivatedRoute,
-    stateService: StateService,
-    platformUtilsService: PlatformUtilsService,
-    environmentService: EnvironmentService,
-    passwordGenerationService: PasswordGenerationService,
-    cryptoFunctionService: CryptoFunctionService,
-    private apiService: ApiService,
-    private policyService: PolicyService,
-    logService: LogService,
-    ngZone: NgZone
-  ) {
-    super(
-      authService,
-      router,
-      platformUtilsService,
-      i18nService,
-      stateService,
-      environmentService,
-      passwordGenerationService,
-      cryptoFunctionService,
-      logService,
-      ngZone
-    );
-    this.onSuccessfulLoginNavigate = this.goAfterLogIn;
-  }
+    showResetPasswordAutoEnrollWarning = false;
 
-  async ngOnInit() {
-    this.route.queryParams.pipe(first()).subscribe(async (qParams) => {
-      if (qParams.email != null && qParams.email.indexOf("@") > -1) {
-        this.email = qParams.email;
-      }
-      if (qParams.premium != null) {
-        this.stateService.setLoginRedirect({ route: "/settings/premium" });
-      } else if (qParams.org != null) {
-        this.stateService.setLoginRedirect({
-          route: "/settings/create-organization",
-          qParams: { plan: qParams.org },
-        });
-      }
-
-      // Are they coming from an email for sponsoring a families organization
-      if (qParams.sponsorshipToken != null) {
-        // After logging in redirect them to setup the families sponsorship
-        this.stateService.setLoginRedirect({
-          route: "/setup/families-for-enterprise",
-          qParams: { token: qParams.sponsorshipToken },
-        });
-      }
-      await super.ngOnInit();
-    });
-
-    const invite = await this.stateService.getOrganizationInvitation();
-    if (invite != null) {
-      let policyList: Policy[] = null;
-      try {
-        const policies = await this.apiService.getPoliciesByToken(
-          invite.organizationId,
-          invite.token,
-          invite.email,
-          invite.organizationUserId
-        );
-        policyList = this.policyService.mapPoliciesFromToken(policies);
-      } catch (e) {
-        this.logService.error(e);
-      }
-
-      if (policyList != null) {
-        const result = this.policyService.getResetPasswordPolicyOptions(
-          policyList,
-          invite.organizationId
-        );
-        // Set to true if policy enabled and auto-enroll enabled
-        this.showResetPasswordAutoEnrollWarning = result[1] && result[0].autoEnrollEnabled;
-      }
+    constructor(authService: AuthService, router: Router,
+        i18nService: I18nService, private route: ActivatedRoute,
+        storageService: StorageService, stateService: StateService,
+        platformUtilsService: PlatformUtilsService, environmentService: EnvironmentService,
+        passwordGenerationService: PasswordGenerationService, cryptoFunctionService: CryptoFunctionService,
+        private apiService: ApiService, private policyService: PolicyService) {
+        super(authService, router,
+            platformUtilsService, i18nService,
+            stateService, environmentService,
+            passwordGenerationService, cryptoFunctionService,
+            storageService);
+        this.onSuccessfulLoginNavigate = this.goAfterLogIn;
     }
-  }
 
-  async goAfterLogIn() {
-    const loginRedirect = await this.stateService.getLoginRedirect();
-    if (loginRedirect != null) {
-      this.router.navigate([loginRedirect.route], { queryParams: loginRedirect.qParams });
-      await this.stateService.setLoginRedirect(null);
-    } else {
-      this.router.navigate([this.successRoute]);
+    async ngOnInit() {
+        const queryParamsSub = this.route.queryParams.subscribe(async qParams => {
+            if (qParams.email != null && qParams.email.indexOf('@') > -1) {
+                this.email = qParams.email;
+            }
+            if (qParams.premium != null) {
+                this.stateService.save('loginRedirect', { route: '/settings/premium' });
+            } else if (qParams.org != null) {
+                this.stateService.save('loginRedirect',
+                    { route: '/settings/create-organization', qParams: { plan: qParams.org } });
+            }
+            await super.ngOnInit();
+            if (queryParamsSub != null) {
+                queryParamsSub.unsubscribe();
+            }
+        });
+
+        const invite = await this.stateService.get<any>('orgInvitation');
+        if (invite != null) {
+            let policyList: Policy[] = null;
+            try {
+                const policies = await this.apiService.getPoliciesByToken(invite.organizationId, invite.token,
+                    invite.email, invite.organizationUserId);
+                policyList = this.policyService.mapPoliciesFromToken(policies);
+            } catch { }
+
+            if (policyList != null) {
+                const result = this.policyService.getResetPasswordPolicyOptions(policyList, invite.organizationId);
+                // Set to true if policy enabled and auto-enroll enabled
+                this.showResetPasswordAutoEnrollWarning = result[1] && result[0].autoEnrollEnabled;
+            }
+        }
+    }
+
+    async goAfterLogIn() {
+        const loginRedirect = await this.stateService.get<any>('loginRedirect');
+        if (loginRedirect != null) {
+            this.router.navigate([loginRedirect.route], { queryParams: loginRedirect.qParams });
+            await this.stateService.remove('loginRedirect');
+        } else {
+            this.router.navigate([this.successRoute]);
+        }
     }
-  }
 }

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

@@ -1,44 +1,27 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container" ngNativeValidate>
-  <div class="row justify-content-md-center mt-5">
-    <div class="col-5">
-      <p class="lead text-center mb-4">{{ "deleteAccount" | i18n }}</p>
-      <div class="card">
-        <div class="card-body">
-          <p>{{ "deleteRecoverDesc" | i18n }}</p>
-          <div class="form-group">
-            <label for="email">{{ "emailAddress" | i18n }}</label>
-            <input
-              id="email"
-              class="form-control"
-              type="text"
-              name="Email"
-              [(ngModel)]="email"
-              required
-              appAutofocus
-              inputmode="email"
-              appInputVerbatim="false"
-            />
-          </div>
-          <hr />
-          <div class="d-flex">
-            <button
-              type="submit"
-              class="btn btn-primary btn-block btn-submit"
-              [disabled]="form.loading"
-            >
-              <span>{{ "submit" | i18n }}</span>
-              <i
-                class="fa fa-spinner fa-spin"
-                title="{{ 'loading' | i18n }}"
-                aria-hidden="true"
-              ></i>
-            </button>
-            <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
-              {{ "cancel" | i18n }}
-            </a>
-          </div>
+    <div class="row justify-content-md-center mt-5">
+        <div class="col-5">
+            <p class="lead text-center mb-4">{{'deleteAccount' | i18n}}</p>
+            <div class="card">
+                <div class="card-body">
+                    <p>{{'deleteRecoverDesc' | i18n}}</p>
+                    <div class="form-group">
+                        <label for="email">{{'emailAddress' | i18n}}</label>
+                        <input id="email" class="form-control" type="text" name="Email" [(ngModel)]="email" required
+                            appAutofocus inputmode="email" appInputVerbatim="false">
+                    </div>
+                    <hr>
+                    <div class="d-flex">
+                        <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading">
+                            <span>{{'submit' | i18n}}</span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
+                        </button>
+                        <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+                            {{'cancel' | i18n}}
+                        </a>
+                    </div>
+                </div>
+            </div>
         </div>
-      </div>
     </div>
-  </div>
 </form>

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

@@ -1,43 +1,33 @@
-import { Component } from "@angular/core";
-import { Router } from "@angular/router";
+import { Component } from '@angular/core';
+import { Router } 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 { ToasterService } from 'angular2-toaster';
 
-import { DeleteRecoverRequest } from "jslib-common/models/request/deleteRecoverRequest";
+import { ApiService } from 'jslib-common/abstractions/api.service';
+import { I18nService } from 'jslib-common/abstractions/i18n.service';
+
+import { DeleteRecoverRequest } from 'jslib-common/models/request/deleteRecoverRequest';
 
 @Component({
-  selector: "app-recover-delete",
-  templateUrl: "recover-delete.component.html",
+    selector: 'app-recover-delete',
+    templateUrl: 'recover-delete.component.html',
 })
 export class RecoverDeleteComponent {
-  email: string;
-  formPromise: Promise<any>;
+    email: string;
+    formPromise: Promise<any>;
 
-  constructor(
-    private router: Router,
-    private apiService: ApiService,
-    private platformUtilsService: PlatformUtilsService,
-    private i18nService: I18nService,
-    private logService: LogService
-  ) {}
-
-  async submit() {
-    try {
-      const request = new DeleteRecoverRequest();
-      request.email = this.email.trim().toLowerCase();
-      this.formPromise = this.apiService.postAccountRecoverDelete(request);
-      await this.formPromise;
-      this.platformUtilsService.showToast(
-        "success",
-        null,
-        this.i18nService.t("deleteRecoverEmailSent")
-      );
-      this.router.navigate(["/"]);
-    } catch (e) {
-      this.logService.error(e);
+    constructor(private router: Router, private apiService: ApiService,
+        private toasterService: ToasterService, private i18nService: I18nService) {
+    }
+
+    async submit() {
+        try {
+            const request = new DeleteRecoverRequest();
+            request.email = this.email.trim().toLowerCase();
+            this.formPromise = this.apiService.postAccountRecoverDelete(request);
+            await this.formPromise;
+            this.toasterService.popAsync('success', null, this.i18nService.t('deleteRecoverEmailSent'));
+            this.router.navigate(['/']);
+        } catch { }
     }
-  }
 }

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

@@ -1,76 +1,40 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container" ngNativeValidate>
-  <div class="row justify-content-md-center mt-5">
-    <div class="col-5">
-      <p class="lead text-center mb-4">{{ "recoverAccountTwoStep" | i18n }}</p>
-      <div class="card">
-        <div class="card-body">
-          <p>
-            {{ "recoverAccountTwoStepDesc" | i18n }}
-            <a
-              href="https://help.bitwarden.com/article/lost-two-step-device/"
-              target="_blank"
-              rel="noopener"
-              >{{ "learnMore" | i18n }}</a
-            >
-          </p>
-          <div class="form-group">
-            <label for="email">{{ "emailAddress" | i18n }}</label>
-            <input
-              id="email"
-              class="form-control"
-              type="text"
-              name="Email"
-              [(ngModel)]="email"
-              required
-              appAutofocus
-              inputmode="email"
-              appInputVerbatim="false"
-            />
-          </div>
-          <div class="form-group">
-            <label for="masterPassword">{{ "masterPass" | i18n }}</label>
-            <input
-              id="masterPassword"
-              type="password"
-              name="MasterPassword"
-              class="form-control"
-              [(ngModel)]="masterPassword"
-              required
-              appInputVerbatim
-            />
-          </div>
-          <div class="form-group">
-            <label for="recoveryCode">{{ "recoveryCodeTitle" | i18n }}</label>
-            <input
-              id="recoveryCode"
-              class="text-monospace form-control"
-              type="text"
-              name="RecoveryCode"
-              [(ngModel)]="recoveryCode"
-              required
-              appInputVerbatim
-            />
-          </div>
-          <hr />
-          <div class="d-flex">
-            <button
-              type="submit"
-              class="btn btn-primary btn-block btn-submit"
-              [disabled]="form.loading"
-            >
-              <span>{{ "submit" | i18n }}</span>
-              <i
-                class="fa fa-spinner fa-spin"
-                title="{{ 'loading' | i18n }}"
-                aria-hidden="true"
-              ></i>
-            </button>
-            <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
-              {{ "cancel" | i18n }}
-            </a>
-          </div>
+    <div class="row justify-content-md-center mt-5">
+        <div class="col-5">
+            <p class="lead text-center mb-4">{{'recoverAccountTwoStep' | i18n}}</p>
+            <div class="card">
+                <div class="card-body">
+                    <p>{{'recoverAccountTwoStepDesc' | i18n}}
+                        <a href="https://help.bitwarden.com/article/lost-two-step-device/" target="_blank"
+                            rel="noopener">{{'learnMore' | i18n}}</a>
+                    </p>
+                    <div class="form-group">
+                        <label for="email">{{'emailAddress' | i18n}}</label>
+                        <input id="email" class="form-control" type="text" name="Email" [(ngModel)]="email" required
+                            appAutofocus inputmode="email" appInputVerbatim="false">
+                    </div>
+                    <div class="form-group">
+                        <label for="masterPassword">{{'masterPass' | i18n}}</label>
+                        <input id="masterPassword" type="password" name="MasterPassword" class="form-control"
+                            [(ngModel)]="masterPassword" required appInputVerbatim>
+                    </div>
+                    <div class="form-group">
+                        <label for="recoveryCode">{{'recoveryCodeTitle' | i18n}}</label>
+                        <input id="recoveryCode" class="text-monospace form-control" type="text" name="RecoveryCode"
+                            [(ngModel)]="recoveryCode" required appInputVerbatim>
+                    </div>
+                    <hr>
+                    <div class="d-flex">
+                        <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading">
+                            <span>{{'submit' | i18n}}</span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
+                        </button>
+                        <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+                            {{'cancel' | i18n}}
+                        </a>
+                    </div>
+                </div>
+            </div>
         </div>
-      </div>
     </div>
-  </div>
 </form>

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

@@ -1,52 +1,40 @@
-import { Component } from "@angular/core";
-import { Router } from "@angular/router";
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
 
-import { ApiService } from "jslib-common/abstractions/api.service";
-import { AuthService } from "jslib-common/abstractions/auth.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 { ToasterService } from 'angular2-toaster';
 
-import { TwoFactorRecoveryRequest } from "jslib-common/models/request/twoFactorRecoveryRequest";
+import { ApiService } from 'jslib-common/abstractions/api.service';
+import { AuthService } from 'jslib-common/abstractions/auth.service';
+import { CryptoService } from 'jslib-common/abstractions/crypto.service';
+import { I18nService } from 'jslib-common/abstractions/i18n.service';
+
+import { TwoFactorRecoveryRequest } from 'jslib-common/models/request/twoFactorRecoveryRequest';
 
 @Component({
-  selector: "app-recover-two-factor",
-  templateUrl: "recover-two-factor.component.html",
+    selector: 'app-recover-two-factor',
+    templateUrl: 'recover-two-factor.component.html',
 })
 export class RecoverTwoFactorComponent {
-  email: string;
-  masterPassword: string;
-  recoveryCode: string;
-  formPromise: Promise<any>;
+    email: string;
+    masterPassword: string;
+    recoveryCode: string;
+    formPromise: Promise<any>;
 
-  constructor(
-    private router: Router,
-    private apiService: ApiService,
-    private platformUtilsService: PlatformUtilsService,
-    private i18nService: I18nService,
-    private cryptoService: CryptoService,
-    private authService: AuthService,
-    private logService: LogService
-  ) {}
+    constructor(private router: Router, private apiService: ApiService,
+        private toasterService: ToasterService, private i18nService: I18nService,
+        private cryptoService: CryptoService, private authService: AuthService) { }
 
-  async submit() {
-    try {
-      const request = new TwoFactorRecoveryRequest();
-      request.recoveryCode = this.recoveryCode.replace(/\s/g, "").toLowerCase();
-      request.email = this.email.trim().toLowerCase();
-      const key = await this.authService.makePreloginKey(this.masterPassword, request.email);
-      request.masterPasswordHash = await this.cryptoService.hashPassword(this.masterPassword, key);
-      this.formPromise = this.apiService.postTwoFactorRecover(request);
-      await this.formPromise;
-      this.platformUtilsService.showToast(
-        "success",
-        null,
-        this.i18nService.t("twoStepRecoverDisabled")
-      );
-      this.router.navigate(["/"]);
-    } catch (e) {
-      this.logService.error(e);
+    async submit() {
+        try {
+            const request = new TwoFactorRecoveryRequest();
+            request.recoveryCode = this.recoveryCode.replace(/\s/g, '').toLowerCase();
+            request.email = this.email.trim().toLowerCase();
+            const key = await this.authService.makePreloginKey(this.masterPassword, request.email);
+            request.masterPasswordHash = await this.cryptoService.hashPassword(this.masterPassword, key);
+            this.formPromise = this.apiService.postTwoFactorRecover(request);
+            await this.formPromise;
+            this.toasterService.popAsync('success', null, this.i18nService.t('twoStepRecoverDisabled'));
+            this.router.navigate(['/']);
+        } catch { }
     }
-  }
 }

src/app/accounts/register.component.html

@@ -1,216 +1,157 @@
 <div class="layout" [ngClass]="['layout', layout]">
-  <header class="header" *ngIf="layout === 'enterprise2'">
-    <div class="container">
-      <div class="row">
-        <div class="col-7">
-          <img
-            alt="Bitwarden"
-            class="logo mb-2"
-            src="../../images/register-layout/logo-horizontal-white.png"
-          />
-        </div>
-      </div>
-    </div>
-  </header>
-  <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container" ngNativeValidate>
-    <div class="row">
-      <div class="col-7" *ngIf="layout">
-        <div class="mt-5">
-          <div *ngIf="layout === 'enterprise2'">
-            <h2>Companies globally trust Bitwarden for password management.</h2>
-            <p>Start your 7-day free trial!</p>
-            <p class="highlight">Quickly deploy your <b>organization</b></p>
-            <p>Use Bitwarden across all platforms</p>
-            <p>Collaborate and share securely</p>
-            <figure>
-              <figcaption>
-                <cite>
-                  <img src="../../images/register-layout/wired-logo.png" alt="Wired" />
-                </cite>
-              </figcaption>
-              <blockquote>
-                "Bitwarden has become a popular choice among open-source software advocates. After
-                using it for a few months, I can see why." - February 2020
-              </blockquote>
-            </figure>
-          </div>
-          <div *ngIf="layout === 'enterprise3'">
-            <p>Enterprise 3 layout</p>
-          </div>
-          <div *ngIf="layout === 'enterprise4'">
-            <p>Enterprise 4 layout</p>
-          </div>
-        </div>
-      </div>
-      <div [ngClass]="{ 'col-5': layout, 'col-12': !layout }">
-        <div class="row justify-content-md-center mt-5">
-          <div [ngClass]="{ 'col-5': !layout, 'col-12': layout }">
-            <p class="lead text-center mb-4" *ngIf="!layout">{{ "createAccount" | i18n }}</p>
-            <div class="card d-block">
-              <div class="card-body">
-                <app-callout
-                  title="{{ 'createOrganizationStep1' | i18n }}"
-                  type="info"
-                  icon="fa-thumb-tack"
-                  *ngIf="showCreateOrgMessage"
-                >
-                  {{ "createOrganizationCreatePersonalAccount" | i18n }}
-                </app-callout>
-                <div class="form-group">
-                  <label for="email">{{ "emailAddress" | i18n }}</label>
-                  <input
-                    id="email"
-                    class="form-control"
-                    type="text"
-                    name="Email"
-                    [(ngModel)]="email"
-                    required
-                    [appAutofocus]="email === ''"
-                    inputmode="email"
-                    appInputVerbatim="false"
-                  />
-                  <small class="form-text text-muted">{{ "emailAddressDesc" | i18n }}</small>
+    <header class="header" *ngIf="layout === 'enterprise2'">
+        <div class="container">
+            <div class="row">
+                <div class="col-7">
+                    <img alt="Bitwarden" class="logo mb-2" src="../../images/register-layout/logo-horizontal-white.png">
                 </div>
-                <div class="form-group">
-                  <label for="name">{{ "yourName" | i18n }}</label>
-                  <input
-                    id="name"
-                    class="form-control"
-                    type="text"
-                    name="Name"
-                    [(ngModel)]="name"
-                    [appAutofocus]="email !== ''"
-                  />
-                  <small class="form-text text-muted">{{ "yourNameDesc" | i18n }}</small>
-                </div>
-                <div class="form-group">
-                  <app-callout
-                    type="info"
-                    [enforcedPolicyOptions]="enforcedPolicyOptions"
-                    *ngIf="enforcedPolicyOptions"
-                  >
-                  </app-callout>
-                  <label for="masterPassword">{{ "masterPass" | i18n }}</label>
-                  <div class="d-flex">
-                    <div class="w-100">
-                      <input
-                        id="masterPassword"
-                        type="{{ showPassword ? 'text' : 'password' }}"
-                        name="MasterPassword"
-                        class="text-monospace form-control mb-1"
-                        [(ngModel)]="masterPassword"
-                        (input)="updatePasswordStrength()"
-                        required
-                        appInputVerbatim
-                      />
-                      <app-password-strength [score]="masterPasswordScore" [showText]="true">
-                      </app-password-strength>
-                    </div>
-                    <div>
-                      <button
-                        type="button"
-                        class="ml-1 btn btn-link"
-                        appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-                        (click)="togglePassword(false)"
-                      >
-                        <i
-                          class="fa fa-lg"
-                          aria-hidden="true"
-                          [ngClass]="{
-                            'fa-eye': !showPassword,
-                            'fa-eye-slash': showPassword
-                          }"
-                        ></i>
-                      </button>
-                      <div class="progress-bar invisible"></div>
-                    </div>
-                  </div>
-                  <small class="form-text text-muted">{{ "masterPassDesc" | i18n }}</small>
-                </div>
-                <div class="form-group">
-                  <label for="masterPasswordRetype">{{ "reTypeMasterPass" | i18n }}</label>
-                  <div class="d-flex">
-                    <input
-                      id="masterPasswordRetype"
-                      type="{{ showPassword ? 'text' : 'password' }}"
-                      name="MasterPasswordRetype"
-                      class="text-monospace form-control"
-                      [(ngModel)]="confirmMasterPassword"
-                      required
-                      appInputVerbatim
-                    />
-                    <button
-                      type="button"
-                      class="ml-1 btn btn-link"
-                      appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-                      (click)="togglePassword(true)"
-                    >
-                      <i
-                        class="fa fa-lg"
-                        aria-hidden="true"
-                        [ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }"
-                      ></i>
-                    </button>
-                  </div>
-                </div>
-                <div class="form-group">
-                  <label for="hint">{{ "masterPassHint" | i18n }}</label>
-                  <input
-                    id="hint"
-                    class="form-control"
-                    type="text"
-                    name="Hint"
-                    [(ngModel)]="hint"
-                  />
-                  <small class="form-text text-muted">{{ "masterPassHintDesc" | i18n }}</small>
-                </div>
-                <div [hidden]="!showCaptcha()">
-                  <iframe id="hcaptcha_iframe" height="80"></iframe>
-                </div>
-                <div class="form-group" *ngIf="showTerms">
-                  <div class="form-check">
-                    <input
-                      class="form-check-input"
-                      type="checkbox"
-                      id="acceptPolicies"
-                      [(ngModel)]="acceptPolicies"
-                      name="AcceptPolicies"
-                    />
-                    <label class="form-check-label small text-muted" for="acceptPolicies">
-                      {{ "acceptPolicies" | i18n }}<br />
-                      <a href="https://bitwarden.com/terms/" target="_blank" rel="noopener">{{
-                        "termsOfService" | i18n
-                      }}</a
-                      >,
-                      <a href="https://bitwarden.com/privacy/" target="_blank" rel="noopener">{{
-                        "privacyPolicy" | i18n
-                      }}</a>
-                    </label>
-                  </div>
-                </div>
-                <hr />
-                <div class="d-flex mb-2">
-                  <button
-                    type="submit"
-                    class="btn btn-primary btn-block btn-submit"
-                    [disabled]="form.loading"
-                  >
-                    <span>{{ "submit" | i18n }}</span>
-                    <i
-                      class="fa fa-spinner fa-spin"
-                      title="{{ 'loading' | i18n }}"
-                      aria-hidden="true"
-                    ></i>
-                  </button>
-                  <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
-                    {{ "cancel" | i18n }}
-                  </a>
-                </div>
-              </div>
             </div>
-          </div>
         </div>
-      </div>
-    </div>
-  </form>
+    </header>
+    <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container" ngNativeValidate>
+        <div class="row">
+            <div class="col-7" *ngIf="layout">
+                <div class="mt-5">
+                    <div *ngIf="layout === 'enterprise2'">
+                        <h2>Companies globally trust Bitwarden for password management.</h2>
+                        <p>Start your 7-day free trial!</p>
+                        <p class="highlight">Quickly deploy your <b>organization</b></p>
+                        <p>Use Bitwarden across all platforms</p>
+                        <p>Collaborate and share securely</p>
+                        <figure>
+                            <figcaption>
+                                <cite>
+                                    <img src="../../images/register-layout/wired-logo.png" alt="Wired">
+                                </cite>
+                            </figcaption>
+                            <blockquote>
+                                "Bitwarden has become a popular choice among open-source software advocates. After using
+                                it for a few months, I can see why." - February 2020
+                            </blockquote>
+                        </figure>
+                    </div>
+                    <div *ngIf="layout === 'enterprise3'">
+                        <p>Enterprise 3 layout</p>
+                    </div>
+                    <div *ngIf="layout === 'enterprise4'">
+                        <p>Enterprise 4 layout</p>
+                    </div>
+                </div>
+            </div>
+            <div [ngClass]="{'col-5': layout, 'col-12': !layout}">
+                <div class="row justify-content-md-center mt-5">
+                    <div [ngClass]="{'col-5': !layout, 'col-12': layout}">
+                        <p class="lead text-center mb-4" *ngIf="!layout">{{'createAccount' | i18n}}</p>
+                        <div class="card d-block">
+                            <div class="card-body">
+                                <app-callout title="{{'createOrganizationStep1' | i18n}}" type="info"
+                                    icon="fa-thumb-tack" *ngIf="showCreateOrgMessage">
+                                    {{'createOrganizationCreatePersonalAccount' | i18n}}
+                                </app-callout>
+                                <div class="form-group">
+                                    <label for="email">{{'emailAddress' | i18n}}</label>
+                                    <input id="email" class="form-control" type="text" name="Email" [(ngModel)]="email"
+                                        required [appAutofocus]="email === ''" inputmode="email"
+                                        appInputVerbatim="false">
+                                    <small class="form-text text-muted">{{'emailAddressDesc' | i18n}}</small>
+                                </div>
+                                <div class="form-group">
+                                    <label for="name">{{'yourName' | i18n}}</label>
+                                    <input id="name" class="form-control" type="text" name="Name" [(ngModel)]="name"
+                                        [appAutofocus]="email !== ''">
+                                    <small class="form-text text-muted">{{'yourNameDesc' | i18n}}</small>
+                                </div>
+                                <div class="form-group">
+                                    <app-callout type="info" *ngIf="enforcedPolicyOptions">
+                                        {{'masterPasswordPolicyInEffect' | i18n}}
+                                        <ul class="mb-0">
+                                            <li *ngIf="enforcedPolicyOptions?.minComplexity > 0">
+                                                {{'policyInEffectMinComplexity' | i18n : getPasswordScoreAlertDisplay()}}
+                                            </li>
+                                            <li *ngIf="enforcedPolicyOptions?.minLength > 0">
+                                                {{'policyInEffectMinLength' | i18n : enforcedPolicyOptions?.minLength.toString()}}
+                                            </li>
+                                            <li *ngIf="enforcedPolicyOptions?.requireUpper">
+                                                {{'policyInEffectUppercase' | i18n}}</li>
+                                            <li *ngIf="enforcedPolicyOptions?.requireLower">
+                                                {{'policyInEffectLowercase' | i18n}}</li>
+                                            <li *ngIf="enforcedPolicyOptions?.requireNumbers">
+                                                {{'policyInEffectNumbers' | i18n}}</li>
+                                            <li *ngIf="enforcedPolicyOptions?.requireSpecial">
+                                                {{'policyInEffectSpecial' | i18n : '!@#$%^&*'}}</li>
+                                        </ul>
+                                    </app-callout>
+                                    <label for="masterPassword">{{'masterPass' | i18n}}</label>
+                                    <div class="d-flex">
+                                        <div class="w-100">
+                                            <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}"
+                                                name="MasterPassword" class="text-monospace form-control mb-1"
+                                                [(ngModel)]="masterPassword" (input)="updatePasswordStrength()" required
+                                                appInputVerbatim>
+                                            <app-password-strength [score]="masterPasswordScore" [showText]="true">
+                                            </app-password-strength>
+                                        </div>
+                                        <div>
+                                            <button type="button" class="ml-1 btn btn-link"
+                                                appA11yTitle="{{'toggleVisibility' | i18n}}"
+                                                (click)="togglePassword(false)">
+                                                <i class="fa fa-lg" aria-hidden="true"
+                                                    [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                                            </button>
+                                            <div class="progress-bar invisible"></div>
+                                        </div>
+                                    </div>
+                                    <small class="form-text text-muted">{{'masterPassDesc' | i18n}}</small>
+                                </div>
+                                <div class="form-group">
+                                    <label for="masterPasswordRetype">{{'reTypeMasterPass' | i18n}}</label>
+                                    <div class="d-flex">
+                                        <input id="masterPasswordRetype" type="{{showPassword ? 'text' : 'password'}}"
+                                            name="MasterPasswordRetype" class="text-monospace form-control"
+                                            [(ngModel)]="confirmMasterPassword" required appInputVerbatim>
+                                        <button type="button" class="ml-1 btn btn-link"
+                                            appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(true)">
+                                            <i class="fa fa-lg" aria-hidden="true"
+                                                [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                                        </button>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label for="hint">{{'masterPassHint' | i18n}}</label>
+                                    <input id="hint" class="form-control" type="text" name="Hint" [(ngModel)]="hint">
+                                    <small class="form-text text-muted">{{'masterPassHintDesc' | i18n}}</small>
+                                </div>
+                                <div [hidden]="!showCaptcha()"><iframe id="hcaptcha_iframe" height="80"></iframe></div>
+                                <div class="form-group" *ngIf="showTerms">
+                                    <div class="form-check">
+                                        <input class="form-check-input" type="checkbox" id="acceptPolicies"
+                                            [(ngModel)]="acceptPolicies" name="AcceptPolicies">
+                                        <label class="form-check-label small text-muted" for="acceptPolicies">
+                                            {{'acceptPolicies' | i18n}}<br>
+                                            <a href="https://bitwarden.com/terms/" target="_blank"
+                                                rel="noopener">{{'termsOfService' | i18n}}</a>,
+                                            <a href="https://bitwarden.com/privacy/" target="_blank"
+                                                rel="noopener">{{'privacyPolicy' | i18n}}</a>
+                                        </label>
+                                    </div>
+                                </div>
+                                <hr>
+                                <div class="d-flex mb-2">
+                                    <button type="submit" class="btn btn-primary btn-block btn-submit"
+                                        [disabled]="form.loading">
+                                        <span>{{'submit' | i18n}}</span>
+                                        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"
+                                            aria-hidden="true"></i>
+                                    </button>
+                                    <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+                                        {{'cancel' | i18n}}
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
 </div>