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

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-NODEFORGE-2330875
- https://snyk.io/vuln/SNYK-JS-NODEFORGE-2331908

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,6 +21,10 @@
 
 <!--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)

.github/workflows/build.yml

@@ -11,10 +11,6 @@ on:
     branches-ignore:
       - "l10n_master"
       - "gh-pages"
-      - "deploy"
-    paths-ignore:
-      - '.github/workflows/**'
-
 
 jobs:
   cloc:
@@ -32,28 +28,6 @@ jobs:
       - name: Print lines of code
         run: cloc --include-lang TypeScript,JavaScript,HTML,Sass,CSS --vcs git
 
-
-  lint:
-    name: Lint
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
-
-      - name: Cache npm
-        id: npm-cache
-        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353  # v2.1.6
-        with:
-          path: "~/.npm"
-          key: ${{ runner.os }}-npm-lint-${{ hashFiles('**/package-lock.json') }}
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Run linter
-        run: npm run lint
-
-
   setup:
     name: Setup
     runs-on: ubuntu-20.04
@@ -67,26 +41,25 @@ jobs:
         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:
+    needs: setup
-      - setup
-      - lint
     env:
       _VERSION: ${{ needs.setup.outputs.version }}
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
       - name: Set up Node
-        uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
+        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
         with:
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
           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
@@ -97,6 +70,9 @@ jobs:
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
 
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
       - name: Install dependencies
         run: npm ci
 
@@ -112,26 +88,25 @@ jobs:
           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:
+    needs: setup
-      - setup
-      - lint
     env:
       _VERSION: ${{ needs.setup.outputs.version }}
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
       - name: Set up Node
-        uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
+        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
         with:
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
           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
@@ -142,6 +117,9 @@ jobs:
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
 
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
       - name: Install dependencies
         run: npm ci
 
@@ -157,26 +135,25 @@ jobs:
           path: ./web-${{ env._VERSION }}-cloud-COMMERCIAL.zip
           if-no-files-found: error
 
-
   build-commercial-selfhost:
     name: Build SelfHost Docker image
     runs-on: ubuntu-20.04
-    needs:
+    needs: setup
-      - setup
-      - lint
     env:
       _VERSION: ${{ needs.setup.outputs.version }}
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
       - name: Set up Node
-        uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
+        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
         with:
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
           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
@@ -188,13 +165,16 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Setup DCT
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix'
         id: setup-dct
         uses: bitwarden/gh-actions/setup-docker-trust@a8c384a05a974c05c48374c818b004be221d43ff
         with:
           azure-creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
           azure-keyvault-name: "bitwarden-prod-kv"
 
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
       - name: Install dependencies
         run: npm ci
 
@@ -229,11 +209,11 @@ jobs:
         run: docker tag bitwarden/web bitwarden/web:dev
 
       - name: Tag hotfix branch
-        if: github.ref == 'refs/heads/hotfix-rc'
+        if: github.ref == 'refs/heads/hotfix'
-        run: docker tag bitwarden/web bitwarden/web:hotfix-rc
+        run: docker tag bitwarden/web bitwarden/web:hotfix
 
       - name: List Docker images
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix'
         run: docker images
 
       - name: Push rc image
@@ -251,59 +231,32 @@ jobs:
           DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.setup-dct.outputs.dct-delegate-repo-passphrase }}
 
       - name: Push hotfix image
-        if: github.ref == 'refs/heads/hotfix-rc'
+        if: github.ref == 'refs/heads/hotfix'
-        run: docker push bitwarden/web:hotfix-rc
+        run: docker push bitwarden/web:hotfix
         env:
           DOCKER_CONTENT_TRUST: 1
           DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.setup-dct.outputs.dct-delegate-repo-passphrase }}
 
       - name: Log out of Docker
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix'
-        run: |
-          docker logout
-          echo "DOCKER_CONTENT_TRUST=0" >> $GITHUB_ENV
-
-      - name: Login to Azure - QA Subscription
-        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
-        with:
-          creds: ${{ secrets.AZURE_QA_KV_CREDENTIALS }}
-
-      - name: Login to Azure ACR
-        run: az acr login -n bitwardenqa
-
-      - name: Tag and Push RC to Azure ACR QA registry
-        env:
-          REGISTRY: bitwardenqa.azurecr.io
-        run: |
-          IMAGE_TAG=$(echo "${GITHUB_REF:11}" | sed "s#/#-#g")  # slash safe branch name
-          if [[ "$IMAGE_TAG" == "master" ]]; then
-            IMAGE_TAG=dev
-          fi
-          docker tag bitwarden/web \
-            $REGISTRY/web-sh:$IMAGE_TAG
-          docker push $REGISTRY/web-sh:$IMAGE_TAG
-
-      - name: Log out of Docker
         run: docker logout
 
-
   build-qa:
     name: Build Docker images for QA environment
     runs-on: ubuntu-20.04
-    needs:
-      - setup
-      - lint
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
       - name: Set up Node
-        uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
+        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
         with:
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
           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
@@ -322,6 +275,9 @@ jobs:
       - name: Log into container registry
         run: az acr login -n bitwardenqa
 
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
       - name: Install dependencies
         run: npm ci
 
@@ -377,29 +333,34 @@ jobs:
       - name: Log out of Docker
         run: docker logout
 
-
   windows:
     name: Test code on Windows
     runs-on: windows-2019
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
       - name: Set up NuGet
         uses: nuget/setup-nuget@04b0c2b8d1b97922f67eca497d7cf0bf17b8ffe1
         with:
           nuget-version: "latest"
 
-      - name: Set up Node
+      - name: Set up MSBuild
-        uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
+        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:
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
           node-version: "16"
 
       - name: Print environment
         run: |
           nuget help | grep Version
+          msbuild -version
           node --version
           npm --version
           echo "GitHub ref: $GITHUB_REF"
@@ -408,13 +369,18 @@ jobs:
           GITHUB_REF: ${{ github.ref }}
           GITHUB_EVENT: ${{ github.event_name }}
 
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
       - name: Install dependencies
         run: npm ci
 
+      - name: Run linter
+        run: npm run lint
+
       - name: NPM build
         run: npm run build:bit:cloud
 
-
   crowdin-push:
     name: Crowdin Push
     if: github.ref == 'refs/heads/master'
@@ -453,7 +419,6 @@ jobs:
           upload_sources: true
           upload_translations: false
 
-
   check-failures:
     name: Check for failures
     if: always()
@@ -461,7 +426,6 @@ jobs:
     needs:
       - cloc
       - setup
-      - lint
       - build-oss-selfhost
       - build-cloud
       - build-commercial-selfhost
@@ -473,7 +437,6 @@ jobs:
         if: ${{ (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/rc') }}
         env:
           CLOC_STATUS: ${{ needs.cloc.result }}
-          LINT_STATUS: ${{ needs.lint.result }}
           SETUP_STATUS: ${{ needs.setup.result }}
           BUILD_OSS_SELFHOST_STATUS: ${{ needs.build-oss-selfhost.result }}
           BUILD_CLOUD_STATUS: ${{ needs.build-cloud.result }}
@@ -484,8 +447,6 @@ jobs:
         run: |
           if [ "$CLOC_STATUS" = "failure" ]; then
               exit 1
-          elif [ "$LINT_STATUS" = "failure" ]; then
-              exit 1
           elif [ "$SETUP_STATUS" = "failure" ]; then
               exit 1
           elif [ "$BUILD_OSS_SELFHOST_STATUS" = "failure" ]; then

.github/workflows/release.yml

@@ -12,7 +12,6 @@ on:
         options:
           - Initial Release
           - Redeploy
-          - Dry Run
 
 jobs:
   setup:
@@ -24,17 +23,16 @@ jobs:
       branch_name: ${{ steps.branch.outputs.branch_name }}
     steps:
       - name: Branch check
-        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         run: |
-          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix-rc" ]]; then
+          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix" ]]; then
             echo "==================================="
-            echo "[!] Can only release from the 'rc' or 'hotfix-rc' branches"
+            echo "[!] Can only release from the 'rc' or 'hotfix' branches"
             echo "==================================="
             exit 1
           fi
 
       - name: Checkout repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # 2.4.0
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # 2.3.4
 
       - name: Check Release Version
         id: version
@@ -59,7 +57,6 @@ jobs:
           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
@@ -67,7 +64,6 @@ jobs:
     env:
       _BRANCH_NAME: ${{ needs.setup.outputs.branch_name }}
       _RELEASE_VERSION: ${{ needs.setup.outputs.release_version }}
-      _RELEASE_OPTION: ${{ github.event.inputs.release_type }}
     steps:
       - name: Print environment
         run: |
@@ -75,12 +71,7 @@ jobs:
           docker --version
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
-          echo "Github Release Option: $_RELEASE_OPTION"
 
-      - name: Checkout repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
-
-      ########## DockerHub ##########
       - name: Setup DCT
         id: setup-dct
         uses: bitwarden/gh-actions/setup-docker-trust@a8c384a05a974c05c48374c818b004be221d43ff
@@ -88,25 +79,21 @@ jobs:
           azure-creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
           azure-keyvault-name: "bitwarden-prod-kv"
 
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
       - name: Pull latest selfhost image
-        run: |
+        run: docker pull bitwarden/web:$_BRANCH_NAME
-          if [[ "${{ github.event.inputs.release_type }}" == "Dry Run" ]]; then
-            docker pull bitwarden/web:latest
-          else
-            docker pull bitwarden/web:$_BRANCH_NAME
-          fi
 
       - name: Tag version and latest
         run: |
-          if [[ "${{ github.event.inputs.release_type }}" == "Dry Run" ]]; then
+          docker tag bitwarden/web:$_BRANCH_NAME bitwarden/web:$_RELEASE_VERSION
-            docker tag bitwarden/web:latest bitwarden/web:dryrun
+          docker tag bitwarden/web:$_BRANCH_NAME bitwarden/web:latest
-          else
+
-            docker tag bitwarden/web:$_BRANCH_NAME bitwarden/web:$_RELEASE_VERSION
+      - name: List Docker images
-            docker tag bitwarden/web:$_BRANCH_NAME bitwarden/web:latest
+        run: docker images
-          fi
 
       - name: Push version and latest image
-        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         env:
           DOCKER_CONTENT_TRUST: 1
           DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.setup-dct.outputs.dct-delegate-repo-passphrase }}
@@ -114,51 +101,11 @@ jobs:
           docker push bitwarden/web:$_RELEASE_VERSION
           docker push bitwarden/web:latest
 
-      - name: Log out of Docker and disable Docker Notary
-        run: |
-          docker logout
-          echo "DOCKER_CONTENT_TRUST=0" >> $GITHUB_ENV
-
-      ########## ACR ##########
-      - name: Login to Azure - QA Subscription
-        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
-        with:
-          creds: ${{ secrets.AZURE_QA_KV_CREDENTIALS }}
-
-      - name: Login to Azure ACR
-        run: az acr login -n bitwardenqa
-
-      - name: Tag version and latest
-        env:
-          REGISTRY: bitwardenqa.azurecr.io
-        run: |
-          if [[ "${{ github.event.inputs.release_type }}" == "Dry Run" ]]; then
-            docker tag bitwarden/web:latest $REGISTRY/web:dryrun
-          else
-            docker tag bitwarden/web:$_BRANCH_NAME $REGISTRY/web:$_RELEASE_VERSION
-            docker tag bitwarden/web:$_BRANCH_NAME $REGISTRY/web:latest
-
-            docker tag bitwarden/web:$_BRANCH_NAME $REGISTRY/web-sh:$_RELEASE_VERSION
-            docker tag bitwarden/web:$_BRANCH_NAME $REGISTRY/web-sh:latest
-          fi
-
-      - name: Push version and latest image
-        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        env:
-          REGISTRY: bitwardenqa.azurecr.io
-        run: |
-          docker push $REGISTRY/web:$_RELEASE_VERSION
-          docker push $REGISTRY/web:latest
-
-          docker push $REGISTRY/web-sh:$_RELEASE_VERSION
-          docker push $REGISTRY/web-sh:latest
-
       - name: Log out of Docker
         run: docker logout
 
-
   ghpages-deploy:
-    name: Deploy Web Vault to GitHub Pages
+    name: Deploy Web Vault
     runs-on: ubuntu-20.04
     needs:
       - setup
@@ -168,17 +115,17 @@ jobs:
       _TAG_VERSION: ${{ needs.setup.outputs.tag_version }}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
         with:
           ref: gh-pages
 
-      - name: Create gh-pages-deploy branch
+      - name: Create deploy branch
         run: |
-          git switch -c gh-pages-deploy-$_TAG_VERSION
+          git switch -c deploy-$_TAG_VERSION
-          git push -u origin gh-pages-deploy-$_TAG_VERSION
+          git push -u origin deploy-$_TAG_VERSION
 
       - name: Checkout Repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
       - name: Setup git config
         run: |
@@ -188,7 +135,7 @@ jobs:
           git config --global url."https://".insteadOf ssh://
 
       - name: Download latest cloud asset
-        uses: bitwarden/gh-actions/download-artifacts@c1fa8e09871a860862d6bbe36184b06d2c7e35a8
+        uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
         with:
           workflow: build.yml
           workflow_conclusion: success
@@ -200,92 +147,25 @@ jobs:
         run: unzip web-*-cloud-COMMERCIAL.zip
 
       - name: Deploy GitHub Pages
-        uses: crazy-max/ghaction-github-pages@a117e4aa1fb4854d021546d2abdfac95be568a3a  # v2.6.0
+        uses: crazy-max/ghaction-github-pages@db4476a01402e1a7ce05f41832040eef16d14925  # v2.5.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          target_branch: gh-pages-deploy-${{ needs.setup.outputs.tag_version }}
+          target_branch: deploy-${{ needs.setup.outputs.tag_version }}
           build_dir: build
           keep_history: true
           commit_message: "Staging deploy ${{ needs.setup.outputs.release_version }}"
-          dry_run: ${{ github.event.inputs.release_type == 'Dry Run' }}
 
-      - name: Create GitHub Pages Deploy PR
+      - name: Create Deploy PR
-        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         env:
-          PR_BRANCH: gh-pages-deploy-${{ env._TAG_VERSION }}
+          PR_BRANCH: deploy-${{ env._TAG_VERSION }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh pr create --title "Deploy $_RELEASE_VERSION to GitHub Pages" \
+          gh pr create --title "Deploy $_RELEASE_VERSION" \
             --body "Deploying $_RELEASE_VERSION" \
             --base gh-pages \
             --head "$PR_BRANCH"
 
-
-  cfpages-deploy:
-    name: Deploy Web Vault to CloudFlare Pages branch
-    runs-on: ubuntu-20.04
-    needs:
-      - setup
-      - self-host
-    env:
-      _RELEASE_VERSION: ${{ needs.setup.outputs.release_version }}
-      _TAG_VERSION: ${{ needs.setup.outputs.tag_version }}
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
-
-      - name: Download latest cloud asset
-        uses: bitwarden/gh-actions/download-artifacts@c1fa8e09871a860862d6bbe36184b06d2c7e35a8
-        with:
-          workflow: build.yml
-          workflow_conclusion: success
-          branch: ${{ needs.setup.outputs.branch_name }}
-          artifacts: web-*-cloud-COMMERCIAL.zip
-
-      # This should result in a build directory in the current working directory
-      - name: Unzip build asset
-        run: unzip web-*-cloud-COMMERCIAL.zip
-
-      - name: Checkout Repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
-        with:
-          ref: deploy
-          path: deployment
-
-      - name: Setup git config
-        run: |
-          git config --global user.name = "GitHub Action Bot"
-          git config --global user.email = "<>"
-          git config --global url."https://github.com/".insteadOf ssh://git@github.com/
-          git config --global url."https://".insteadOf ssh://
-
-      - name: Deploy CloudFlare Pages
-        run: |
-          rm -rf ./*
-          cp -R ../build/* .
-        working-directory: deployment
-
-      - name: Create cf-pages-deploy branch
-        run: |
-          git switch -c cf-pages-deploy-$_TAG_VERSION
-          git add .
-          git commit -m "Staging deploy ${{ needs.setup.outputs.release_version }}"
-          git push -u origin cf-pages-deploy-$_TAG_VERSION
-        working-directory: deployment    
-
-      - name: Create CloudFlare Pages Deploy PR
-        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        env:
-          PR_BRANCH: cf-pages-deploy-${{ env._TAG_VERSION }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh pr create --title "Deploy $_RELEASE_VERSION to CloudFlare Pages" \
-            --body "Deploying $_RELEASE_VERSION" \
-            --base deploy \
-            --head "$PR_BRANCH"
-
-
   release:
     name: Create GitHub Release
     runs-on: ubuntu-20.04
@@ -293,7 +173,6 @@ jobs:
       - setup
       - self-host
       - ghpages-deploy
-      - cfpages-deploy
     steps:
       - name: Download latest build artifacts
         uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
@@ -310,8 +189,7 @@ jobs:
           mv web-*-selfhosted-open-source.zip web-${{ needs.setup.outputs.release_version }}-selfhosted-open-source.zip
 
       - name: Create release
-        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
+        uses: ncipollo/release-action@95215a3cb6e6a1908b3c44e00b4fdb15548b1e09
-        uses: ncipollo/release-action@40bb172bd05f266cf9ba4ff965cb61e9ee5f6d01
         with:
           name: "Version ${{ needs.setup.outputs.release_version }}"
           commit: ${{ github.sha }}
@@ -321,23 +199,3 @@ jobs:
             web-${{ needs.setup.outputs.release_version }}-selfhosted-open-source.zip"
           token: ${{ secrets.GITHUB_TOKEN }}
           draft: true
-
-
-  dry-run:
-    name: Dry Run Cleanup
-    runs-on: ubuntu-20.04
-    if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-    env:
-      _TAG_VERSION: ${{ needs.setup.outputs.tag_version }}
-    needs:
-      - setup
-      - release
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # 2.4.0
-
-      - name: Remove gh-pages-deploy branch
-        run: git push origin --delete gh-pages-deploy-$_TAG_VERSION
-
-      - name: Remove cf-pages-deploy branch
-        run: git push origin --delete cf-pages-deploy-$_TAG_VERSION

CONTRIBUTING.md

@@ -10,7 +10,7 @@ Here is how you can get involved:
 - **Write code for a new feature:** Make a new post in the [Github Contributions category](https://community.bitwarden.com/c/github-contributions/) of the Community Forums. Include a description of your proposed contribution, screeshots, and links to any relevant feature requests. This helps get feedback from the community and Bitwarden team members before you start writing code
 - **Report a bug or submit a bugfix:** Use Github issues and pull requests
 - **Write documentation:** Submit a pull request to the [Bitwarden help repository](https://github.com/bitwarden/help)
-- **Help other users:** Go to the [Ask the Bitwarden Community category](https://community.bitwarden.com/c/support/) on the Community Forums
+- **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
@@ -31,6 +31,6 @@ We use a translation tool called [Crowdin](https://crowdin.com) to help manage o
 
 If you are interested in helping translate the Bitwarden web vault into another language (or make a translation correction), please register an account at Crowdin and join our project here: https://crowdin.com/project/bitwarden-web
 
-If the language that you are interested in translating is not already listed, create a new account on Crowdin, join the project, and contact the project owner (https://crowdin.com/profile/dwbit).
+If the language that you are interested in translating is not already listed, create a new account on Crowdin, join the project, and contact the project owner (https://crowdin.com/profile/kspearrin).
 
 You can read Crowdin's getting started guide for translators here: https://support.crowdin.com/crowdin-intro/

README.md

@@ -1,9 +1,3 @@
-> **Repository Reorganization in Progress**
->
-> We are currently migrating some projects over to a mono repository. For existing PR's we will be providing documentation on how to move/migrate them. To minimize the overhead we are actively reviewing open PRs. If possible please ensure any pending comments are resolved as soon as possible.
->
-> New pull requests created during this transition period may not get addressed —if needed, please create a new PR after the reorganization is complete.
-
 <p align="center">
     <img src="https://raw.githubusercontent.com/bitwarden/brand/master/screenshots/web-vault-macbook.png" alt="" width="600" height="358" />
 </p>

SECURITY.md

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

bitwarden_license/src/app/app.module.ts

@@ -1,12 +1,11 @@
 import { DragDropModule } from "@angular/cdk/drag-drop";
-import { OverlayModule } from "@angular/cdk/overlay";
 import { NgModule } from "@angular/core";
 import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { RouterModule } from "@angular/router";
 import { InfiniteScrollModule } from "ngx-infinite-scroll";
 
-import { JslibModule } from "jslib-angular/jslib.module";
+import { BitwardenToastModule } from "jslib-angular/components/toastr.component";
 
 import { OssRoutingModule } from "src/app/oss-routing.module";
 import { OssModule } from "src/app/oss.module";
@@ -21,25 +20,28 @@ import { MaximumVaultTimeoutPolicyComponent } from "./policies/maximum-vault-tim
 
 @NgModule({
   imports: [
-    OverlayModule,
     OssModule,
-    JslibModule,
     BrowserAnimationsModule,
     FormsModule,
     ReactiveFormsModule,
     ServicesModule,
+    BitwardenToastModule.forRoot({
+      maxOpened: 5,
+      autoDismiss: true,
+      closeButton: true,
+    }),
     InfiniteScrollModule,
     DragDropModule,
     AppRoutingModule,
     OssRoutingModule,
-    OrganizationsModule, // Must be after OssRoutingModule for competing routes to resolve properly
+    OrganizationsModule,
     RouterModule,
     WildcardRoutingModule, // Needs to be last to catch all non-existing routes
   ],
   declarations: [
     AppComponent,
-    DisablePersonalVaultExportPolicyComponent,
     MaximumVaultTimeoutPolicyComponent,
+    DisablePersonalVaultExportPolicyComponent,
   ],
   bootstrap: [AppComponent],
 })

bitwarden_license/src/app/main.ts

@@ -6,7 +6,6 @@ import "jquery";
 import "popper.js";
 
 require("src/scss/styles.scss");
-require("src/scss/tailwind.css");
 
 import { AppModule } from "./app.module";
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,13 +1,13 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
-import { AuthGuard } from "jslib-angular/guards/auth.guard";
+import { AuthGuardService } from "jslib-angular/services/auth-guard.service";
 import { Permissions } from "jslib-common/enums/permissions";
 
-import { PermissionsGuard } from "src/app/organizations/guards/permissions.guard";
+import { OrganizationLayoutComponent } from "src/app/layouts/organization-layout.component";
-import { OrganizationLayoutComponent } from "src/app/organizations/layouts/organization-layout.component";
 import { ManageComponent } from "src/app/organizations/manage/manage.component";
-import { NavigationPermissionsService } from "src/app/organizations/services/navigation-permissions.service";
+import { OrganizationGuardService } from "src/app/services/organization-guard.service";
+import { OrganizationTypeGuardService } from "src/app/services/organization-type-guard.service";
 
 import { SsoComponent } from "./manage/sso.component";
 
@@ -15,16 +15,25 @@ const routes: Routes = [
   {
     path: "organizations/:organizationId",
     component: OrganizationLayoutComponent,
-    canActivate: [AuthGuard, PermissionsGuard],
+    canActivate: [AuthGuardService, OrganizationGuardService],
     children: [
       {
         path: "manage",
         component: ManageComponent,
-        canActivate: [PermissionsGuard],
+        canActivate: [OrganizationTypeGuardService],
         data: {
-          permissions: NavigationPermissionsService.getPermissions("manage").concat(
+          permissions: [
-            Permissions.ManageSso
+            Permissions.CreateNewCollections,
-          ),
+            Permissions.EditAnyCollection,
+            Permissions.DeleteAnyCollection,
+            Permissions.EditAssignedCollections,
+            Permissions.DeleteAssignedCollections,
+            Permissions.AccessEventLogs,
+            Permissions.ManageGroups,
+            Permissions.ManageUsers,
+            Permissions.ManagePolicies,
+            Permissions.ManageSso,
+          ],
         },
         children: [
           {

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

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

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

@@ -24,11 +24,7 @@
           <p>{{ "joinProviderDesc" | i18n }}</p>
           <hr />
           <div class="d-flex">
-            <a
+            <a routerLink="/" [queryParams]="{ email: email }" class="btn btn-primary btn-block">
-              routerLink="/login"
-              [queryParams]="{ email: email }"
-              class="btn btn-primary btn-block"
-            >
               {{ "logIn" | i18n }}
             </a>
             <a

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

@@ -1,7 +1,7 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
-import { AuthGuard } from "jslib-angular/guards/auth.guard";
+import { AuthGuardService } from "jslib-angular/services/auth-guard.service";
 import { Permissions } from "jslib-common/enums/permissions";
 
 import { FrontendLayoutComponent } from "src/app/layouts/frontend-layout.component";
@@ -9,13 +9,13 @@ import { ProvidersComponent } from "src/app/providers/providers.component";
 
 import { ClientsComponent } from "./clients/clients.component";
 import { CreateOrganizationComponent } from "./clients/create-organization.component";
-import { PermissionsGuard } from "./guards/provider-type.guard";
-import { ProviderGuard } from "./guards/provider.guard";
 import { AcceptProviderComponent } from "./manage/accept-provider.component";
 import { EventsComponent } from "./manage/events.component";
 import { ManageComponent } from "./manage/manage.component";
 import { PeopleComponent } from "./manage/people.component";
 import { ProvidersLayoutComponent } from "./providers-layout.component";
+import { ProviderGuardService } from "./services/provider-guard.service";
+import { ProviderTypeGuardService } from "./services/provider-type-guard.service";
 import { AccountComponent } from "./settings/account.component";
 import { SettingsComponent } from "./settings/settings.component";
 import { SetupProviderComponent } from "./setup/setup-provider.component";
@@ -24,7 +24,7 @@ import { SetupComponent } from "./setup/setup.component";
 const routes: Routes = [
   {
     path: "",
-    canActivate: [AuthGuard],
+    canActivate: [AuthGuardService],
     component: ProvidersComponent,
   },
   {
@@ -45,7 +45,7 @@ const routes: Routes = [
   },
   {
     path: "",
-    canActivate: [AuthGuard],
+    canActivate: [AuthGuardService],
     children: [
       {
         path: "setup",
@@ -54,7 +54,7 @@ const routes: Routes = [
       {
         path: ":providerId",
         component: ProvidersLayoutComponent,
-        canActivate: [ProviderGuard],
+        canActivate: [ProviderGuardService],
         children: [
           { path: "", pathMatch: "full", redirectTo: "clients" },
           { path: "clients/create", component: CreateOrganizationComponent },
@@ -71,7 +71,7 @@ const routes: Routes = [
               {
                 path: "people",
                 component: PeopleComponent,
-                canActivate: [PermissionsGuard],
+                canActivate: [ProviderTypeGuardService],
                 data: {
                   titleId: "people",
                   permissions: [Permissions.ManageUsers],
@@ -80,7 +80,7 @@ const routes: Routes = [
               {
                 path: "events",
                 component: EventsComponent,
-                canActivate: [PermissionsGuard],
+                canActivate: [ProviderTypeGuardService],
                 data: {
                   titleId: "eventLogs",
                   permissions: [Permissions.AccessEventLogs],
@@ -100,7 +100,7 @@ const routes: Routes = [
               {
                 path: "account",
                 component: AccountComponent,
-                canActivate: [PermissionsGuard],
+                canActivate: [ProviderTypeGuardService],
                 data: {
                   titleId: "myProvider",
                   permissions: [Permissions.ManageProvider],

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

@@ -2,7 +2,6 @@ import { CommonModule } from "@angular/common";
 import { ComponentFactoryResolver, NgModule } from "@angular/core";
 import { FormsModule } from "@angular/forms";
 
-import { JslibModule } from "jslib-angular/jslib.module";
 import { ModalService } from "jslib-angular/services/modal.service";
 
 import { OssModule } from "src/app/oss.module";
@@ -10,8 +9,6 @@ import { OssModule } from "src/app/oss.module";
 import { AddOrganizationComponent } from "./clients/add-organization.component";
 import { ClientsComponent } from "./clients/clients.component";
 import { CreateOrganizationComponent } from "./clients/create-organization.component";
-import { PermissionsGuard } from "./guards/provider-type.guard";
-import { ProviderGuard } from "./guards/provider.guard";
 import { AcceptProviderComponent } from "./manage/accept-provider.component";
 import { BulkConfirmComponent } from "./manage/bulk/bulk-confirm.component";
 import { BulkRemoveComponent } from "./manage/bulk/bulk-remove.component";
@@ -21,6 +18,8 @@ import { PeopleComponent } from "./manage/people.component";
 import { UserAddEditComponent } from "./manage/user-add-edit.component";
 import { ProvidersLayoutComponent } from "./providers-layout.component";
 import { ProvidersRoutingModule } from "./providers-routing.module";
+import { ProviderGuardService } from "./services/provider-guard.service";
+import { ProviderTypeGuardService } from "./services/provider-type-guard.service";
 import { WebProviderService } from "./services/webProvider.service";
 import { AccountComponent } from "./settings/account.component";
 import { SettingsComponent } from "./settings/settings.component";
@@ -28,7 +27,7 @@ import { SetupProviderComponent } from "./setup/setup-provider.component";
 import { SetupComponent } from "./setup/setup.component";
 
 @NgModule({
-  imports: [CommonModule, FormsModule, OssModule, JslibModule, ProvidersRoutingModule],
+  imports: [CommonModule, FormsModule, OssModule, ProvidersRoutingModule],
   declarations: [
     AcceptProviderComponent,
     AccountComponent,
@@ -46,7 +45,7 @@ import { SetupComponent } from "./setup/setup.component";
     SetupProviderComponent,
     UserAddEditComponent,
   ],
-  providers: [WebProviderService, ProviderGuard, PermissionsGuard],
+  providers: [WebProviderService, ProviderGuardService, ProviderTypeGuardService],
 })
 export class ProvidersModule {
   constructor(modalService: ModalService, componentFactoryResolver: ComponentFactoryResolver) {

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

@@ -6,7 +6,7 @@ import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.se
 import { ProviderService } from "jslib-common/abstractions/provider.service";
 
 @Injectable()
-export class ProviderGuard implements CanActivate {
+export class ProviderGuardService implements CanActivate {
   constructor(
     private router: Router,
     private platformUtilsService: PlatformUtilsService,

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

@@ -5,7 +5,7 @@ import { ProviderService } from "jslib-common/abstractions/provider.service";
 import { Permissions } from "jslib-common/enums/permissions";
 
 @Injectable()
-export class PermissionsGuard implements CanActivate {
+export class ProviderTypeGuardService implements CanActivate {
   constructor(private providerService: ProviderService, private router: Router) {}
 
   async canActivate(route: ActivatedRouteSnapshot) {

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

@@ -20,11 +20,7 @@
           <p>{{ "setupProviderLoginDesc" | i18n }}</p>
           <hr />
           <div class="d-flex">
-            <a
+            <a routerLink="/" [queryParams]="{ email: email }" class="btn btn-primary btn-block">
-              routerLink="/login"
-              [queryParams]="{ email: email }"
-              class="btn btn-primary btn-block"
-            >
               {{ "logIn" | i18n }}
             </a>
           </div>

config/base.json

@@ -7,7 +7,6 @@
     "buttonAction": "https://www.sandbox.paypal.com/cgi-bin/webscr"
   },
   "dev": {
-    "port": 8080,
     "allowedHosts": "auto"
   }
 }

config/selfhosted.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/web-vault",
-  "version": "2.28.1",
+  "version": "2.26.1",
   "license": "GPL-3.0",
   "repository": "https://github.com/bitwarden/web",
   "scripts": {
@@ -43,7 +43,6 @@
     "@types/webpack": "^5.28.0",
     "@typescript-eslint/eslint-plugin": "^5.10.1",
     "@typescript-eslint/parser": "^5.10.1",
-    "autoprefixer": "^10.4.2",
     "buffer": "^6.0.3",
     "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^10.0.0",
@@ -60,15 +59,12 @@
     "husky": "^7.0.4",
     "lint-staged": "^12.1.2",
     "mini-css-extract-plugin": "^2.4.5",
-    "postcss": "^8.4.6",
-    "postcss-loader": "^6.2.1",
     "prettier": "2.5.1",
     "process": "^0.11.10",
     "rimraf": "^3.0.2",
     "sass": "^1.32.10",
     "sass-loader": "^12.4.0",
     "style-loader": "^3.3.1",
-    "tailwindcss": "^3.0.18",
     "terser-webpack-plugin": "^5.2.5",
     "ts-loader": "^9.2.5",
     "typescript": "4.3.5",
@@ -90,22 +86,20 @@
     "@bitwarden/jslib-angular": "file:jslib/angular",
     "@bitwarden/jslib-common": "file:jslib/common",
     "bootstrap": "4.6.0",
-    "braintree-web-drop-in": "1.33.1",
+    "braintree-web-drop-in": "1.30.1",
     "browser-hrtime": "^1.1.8",
     "core-js": "^3.11.0",
     "date-input-polyfill": "^2.14.0",
     "jquery": "3.6.0",
-    "jszip": "^3.7.1",
     "ngx-infinite-scroll": "^10.0.1",
     "ngx-toastr": "14.1.4",
-    "node-forge": "^1.3.1",
+    "node-forge": "^1.0.0",
     "popper.js": "1.16.1",
     "qrious": "4.0.2",
     "rxjs": "^7.4.0",
     "sweetalert2": "^10.16.6",
     "webcrypto-shim": "0.1.7",
-    "whatwg-fetch": "3.6.2",
+    "whatwg-fetch": "3.6.2"
-    "zone.js": "0.11.4"
   },
   "engines": {
     "node": "~16",

postcss.config.js

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

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

@@ -23,11 +23,7 @@
           <p>{{ "acceptEmergencyAccess" | i18n }}</p>
           <hr />
           <div class="d-flex">
-            <a
+            <a routerLink="/" [queryParams]="{ email: email }" class="btn btn-primary btn-block">
-              routerLink="/login"
-              [queryParams]="{ email: email }"
-              class="btn btn-primary btn-block"
-            >
               {{ "logIn" | i18n }}
             </a>
             <a

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

@@ -24,11 +24,7 @@
           <p>{{ "joinOrganizationDesc" | i18n }}</p>
           <hr />
           <div class="d-flex">
-            <a
+            <a routerLink="/" [queryParams]="{ email: email }" class="btn btn-primary btn-block">
-              routerLink="/login"
-              [queryParams]="{ email: email }"
-              class="btn btn-primary btn-block"
-            >
               {{ "logIn" | i18n }}
             </a>
             <a

src/app/accounts/hint.component.html

@@ -33,7 +33,7 @@
                 aria-hidden="true"
               ></i>
             </button>
-            <a routerLink="/login" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+            <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
               {{ "cancel" | i18n }}
             </a>
           </div>

src/app/accounts/lock.component.ts

@@ -58,7 +58,7 @@ export class LockComponent extends BaseLockComponent {
       if (previousUrl !== "/" && previousUrl.indexOf("lock") === -1) {
         this.successRoute = previousUrl;
       }
-      this.router.navigateByUrl(this.successRoute);
+      this.router.navigate([this.successRoute]);
     };
   }
 }

src/app/accounts/login.component.ts

@@ -9,7 +9,6 @@ import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.
 import { EnvironmentService } from "jslib-common/abstractions/environment.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
-import { MessagingService } from "jslib-common/abstractions/messaging.service";
 import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { PolicyService } from "jslib-common/abstractions/policy.service";
@@ -20,7 +19,6 @@ import { ListResponse } from "jslib-common/models/response/listResponse";
 import { PolicyResponse } from "jslib-common/models/response/policyResponse";
 
 import { StateService } from "../../abstractions/state.service";
-import { RouterService } from "../services/router.service";
 
 @Component({
   selector: "app-login",
@@ -44,9 +42,7 @@ export class LoginComponent extends BaseLoginComponent {
     private policyService: PolicyService,
     logService: LogService,
     ngZone: NgZone,
-    protected stateService: StateService,
+    protected stateService: StateService
-    private messagingService: MessagingService,
-    private routerService: RouterService
   ) {
     super(
       authService,
@@ -60,9 +56,6 @@ export class LoginComponent extends BaseLoginComponent {
       logService,
       ngZone
     );
-    this.onSuccessfulLogin = async () => {
-      this.messagingService.send("setFullWidth");
-    };
     this.onSuccessfulLoginNavigate = this.goAfterLogIn;
   }
 
@@ -72,20 +65,21 @@ export class LoginComponent extends BaseLoginComponent {
         this.email = qParams.email;
       }
       if (qParams.premium != null) {
-        this.routerService.setPreviousUrl("/settings/premium");
+        this.stateService.setLoginRedirect({ route: "/settings/premium" });
       } else if (qParams.org != null) {
-        const route = this.router.createUrlTree(["create-organization"], {
+        this.stateService.setLoginRedirect({
-          queryParams: { plan: qParams.org },
+          route: "/settings/create-organization",
+          qParams: { plan: qParams.org },
         });
-        this.routerService.setPreviousUrl(route.toString());
       }
 
       // Are they coming from an email for sponsoring a families organization
       if (qParams.sponsorshipToken != null) {
-        const route = this.router.createUrlTree(["setup/families-for-enterprise"], {
+        // After logging in redirect them to setup the families sponsorship
-          queryParams: { token: qParams.sponsorshipToken },
+        this.stateService.setLoginRedirect({
+          route: "/setup/families-for-enterprise",
+          qParams: { token: qParams.sponsorshipToken },
         });
-        this.routerService.setPreviousUrl(route.toString());
       }
       await super.ngOnInit();
       this.rememberEmail = await this.stateService.getRememberEmail();
@@ -146,9 +140,10 @@ export class LoginComponent extends BaseLoginComponent {
       }
     }
 
-    const previousUrl = this.routerService.getPreviousUrl();
+    const loginRedirect = await this.stateService.getLoginRedirect();
-    if (previousUrl) {
+    if (loginRedirect != null) {
-      this.router.navigateByUrl(previousUrl);
+      this.router.navigate([loginRedirect.route], { queryParams: loginRedirect.qParams });
+      await this.stateService.setLoginRedirect(null);
     } else {
       this.router.navigate([this.successRoute]);
     }

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

@@ -33,7 +33,7 @@
                 aria-hidden="true"
               ></i>
             </button>
-            <a routerLink="/login" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+            <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
               {{ "cancel" | i18n }}
             </a>
           </div>

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

@@ -65,7 +65,7 @@
                 aria-hidden="true"
               ></i>
             </button>
-            <a routerLink="/login" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+            <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
               {{ "cancel" | i18n }}
             </a>
           </div>

src/app/accounts/register.component.html

@@ -258,7 +258,7 @@
                       aria-hidden="true"
                     ></i>
                   </button>
-                  <a routerLink="/login" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+                  <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
                     {{ "cancel" | i18n }}
                   </a>
                 </div>

src/app/accounts/register.component.ts

@@ -18,8 +18,6 @@ import { MasterPasswordPolicyOptions } from "jslib-common/models/domain/masterPa
 import { Policy } from "jslib-common/models/domain/policy";
 import { ReferenceEventRequest } from "jslib-common/models/request/referenceEventRequest";
 
-import { RouterService } from "../services/router.service";
-
 @Component({
   selector: "app-register",
   templateUrl: "register.component.html",
@@ -43,8 +41,7 @@ export class RegisterComponent extends BaseRegisterComponent {
     passwordGenerationService: PasswordGenerationService,
     private policyService: PolicyService,
     environmentService: EnvironmentService,
-    logService: LogService,
+    logService: LogService
-    private routerService: RouterService
   ) {
     super(
       authService,
@@ -67,14 +64,14 @@ export class RegisterComponent extends BaseRegisterComponent {
         this.email = qParams.email;
       }
       if (qParams.premium != null) {
-        this.routerService.setPreviousUrl("/settings/premium");
+        this.stateService.setLoginRedirect({ route: "/settings/premium" });
       } else if (qParams.org != null) {
         this.showCreateOrgMessage = true;
         this.referenceData.flow = qParams.org;
-        const route = this.router.createUrlTree(["create-organization"], {
+        this.stateService.setLoginRedirect({
-          queryParams: { plan: qParams.org },
+          route: "/settings/create-organization",
+          qParams: { plan: qParams.org },
         });
-        this.routerService.setPreviousUrl(route.toString());
       }
       if (qParams.layout != null) {
         this.layout = this.referenceData.layout = qParams.layout;
@@ -91,10 +88,10 @@ export class RegisterComponent extends BaseRegisterComponent {
       // 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
-        const route = this.router.createUrlTree(["setup/families-for-enterprise"], {
+        this.stateService.setLoginRedirect({
-          queryParams: { plan: qParams.sponsorshipToken },
+          route: "/setup/families-for-enterprise",
+          qParams: { token: qParams.sponsorshipToken },
         });
-        this.routerService.setPreviousUrl(route.toString());
       }
       if (this.referenceData.id === "") {
         this.referenceData.id = null;

src/app/accounts/sso.component.html

@@ -41,7 +41,7 @@
                 aria-hidden="true"
               ></i>
             </button>
-            <a routerLink="/login" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+            <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
               {{ "cancel" | i18n }}
             </a>
           </div>

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

@@ -114,9 +114,6 @@
             <p>{{ "noTwoStepProviders2" | i18n }}</p>
           </ng-container>
           <hr />
-          <div [hidden]="!showCaptcha()">
-            <iframe id="hcaptcha_iframe" height="80"></iframe>
-          </div>
           <div class="d-flex mb-3">
             <button
               type="submit"
@@ -138,7 +135,7 @@
                 aria-hidden="true"
               ></i>
             </button>
-            <a routerLink="/login" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+            <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
               {{ "cancel" | i18n }}
             </a>
           </div>

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

@@ -4,7 +4,6 @@ import { ActivatedRoute, Router } from "@angular/router";
 import { TwoFactorComponent as BaseTwoFactorComponent } from "jslib-angular/components/two-factor.component";
 import { ModalService } from "jslib-angular/services/modal.service";
 import { ApiService } from "jslib-common/abstractions/api.service";
-import { AppIdService } from "jslib-common/abstractions/appId.service";
 import { AuthService } from "jslib-common/abstractions/auth.service";
 import { EnvironmentService } from "jslib-common/abstractions/environment.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
@@ -14,8 +13,6 @@ import { StateService } from "jslib-common/abstractions/state.service";
 import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service";
 import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType";
 
-import { RouterService } from "../services/router.service";
-
 import { TwoFactorOptionsComponent } from "./two-factor-options.component";
 
 @Component({
@@ -37,9 +34,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
     private modalService: ModalService,
     route: ActivatedRoute,
     logService: LogService,
-    twoFactorService: TwoFactorService,
+    twoFactorService: TwoFactorService
-    appIdService: AppIdService,
-    private routerService: RouterService
   ) {
     super(
       authService,
@@ -52,8 +47,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
       stateService,
       route,
       logService,
-      twoFactorService,
+      twoFactorService
-      appIdService
     );
     this.onSuccessfulLoginNavigate = this.goAfterLogIn;
   }
@@ -76,9 +70,10 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
   }
 
   async goAfterLogIn() {
-    const previousUrl = this.routerService.getPreviousUrl();
+    const loginRedirect = await this.stateService.getLoginRedirect();
-    if (previousUrl) {
+    if (loginRedirect != null) {
-      this.router.navigateByUrl(previousUrl);
+      this.router.navigate([loginRedirect.route], { queryParams: loginRedirect.qParams });
+      await this.stateService.setLoginRedirect(null);
     } else {
       this.router.navigate([this.successRoute], {
         queryParams: {

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

@@ -23,7 +23,7 @@
                 aria-hidden="true"
               ></i>
             </button>
-            <a routerLink="/login" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+            <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
               {{ "cancel" | i18n }}
             </a>
           </div>

src/app/app.component.ts

@@ -91,17 +91,11 @@ export class AppComponent implements OnDestroy, OnInit {
       this.ngZone.run(async () => {
         switch (message.command) {
           case "loggedIn":
-            this.notificationsService.updateConnection(false);
-            break;
           case "loggedOut":
-            this.routerService.setPreviousUrl(null);
-            this.notificationsService.updateConnection(false);
-            break;
           case "unlocked":
             this.notificationsService.updateConnection(false);
             break;
           case "authBlocked":
-            this.routerService.setPreviousUrl(message.url);
             this.router.navigate(["/"]);
             break;
           case "logout":
@@ -115,7 +109,7 @@ export class AppComponent implements OnDestroy, OnInit {
             this.router.navigate(["lock"]);
             break;
           case "lockedUrl":
-            this.routerService.setPreviousUrl(message.url);
+            window.setTimeout(() => this.routerService.setPreviousUrl(message.url), 500);
             break;
           case "syncStarted":
             break;

src/app/app.module.ts

@@ -4,6 +4,8 @@ import { FormsModule } from "@angular/forms";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { InfiniteScrollModule } from "ngx-infinite-scroll";
 
+import { BitwardenToastModule } from "jslib-angular/components/toastr.component";
+
 import { AppComponent } from "./app.component";
 import { OssRoutingModule } from "./oss-routing.module";
 import { OssModule } from "./oss.module";
@@ -16,6 +18,11 @@ import { WildcardRoutingModule } from "./wildcard-routing.module";
     BrowserAnimationsModule,
     FormsModule,
     ServicesModule,
+    BitwardenToastModule.forRoot({
+      maxOpened: 5,
+      autoDismiss: true,
+      closeButton: true,
+    }),
     InfiniteScrollModule,
     DragDropModule,
     OssRoutingModule,

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

@@ -30,6 +30,7 @@ export abstract class BaseAcceptComponent implements OnInit {
 
   ngOnInit() {
     this.route.queryParams.pipe(first()).subscribe(async (qParams) => {
+      await this.stateService.setLoginRedirect(null);
       let error = this.requiredParameters.some((e) => qParams?.[e] == null || qParams[e] === "");
       let errorMessage: string = null;
       if (!error) {
@@ -43,6 +44,11 @@ export abstract class BaseAcceptComponent implements OnInit {
             errorMessage = e.message;
           }
         } else {
+          await this.stateService.setLoginRedirect({
+            route: this.getRedirectRoute(),
+            qParams: qParams,
+          });
+
           this.email = qParams.email;
           await this.unauthedHandler(qParams);
         }
@@ -60,4 +66,10 @@ export abstract class BaseAcceptComponent implements OnInit {
       this.loading = false;
     });
   }
+
+  getRedirectRoute() {
+    const urlTree = this.router.parseUrl(this.router.url);
+    urlTree.queryParams = {};
+    return urlTree.toString();
+  }
 }

src/app/components/organization-switcher.component.html

@@ -1,68 +0,0 @@
-<div *ngIf="loaded && activeOrganization != null" class="tw-flex">
-  <button
-    class="tw-flex tw-items-center tw-bg-background-alt tw-border-none"
-    type="button"
-    id="pickerButton"
-    [appA11yTitle]="'organizationPicker' | i18n"
-    [bitMenuTriggerFor]="orgPickerMenu"
-  >
-    <app-avatar
-      [data]="activeOrganization.name"
-      size="45"
-      [circle]="true"
-      [dynamic]="true"
-    ></app-avatar>
-    <div class="tw-flex">
-      <div class="org-name tw-ml-3">
-        <span>{{ activeOrganization.name }}</span>
-        <small class="tw-text-muted">{{ "organization" | i18n }}</small>
-      </div>
-      <div class="tw-ml-3">
-        <i class="bwi bwi-angle-down tw-text-main" aria-hidden="true"></i>
-      </div>
-    </div>
-  </button>
-  <div>
-    <div
-      class="tw-ml-3 tw-border tw-border-solid tw-rounded tw-border-danger-500 tw-text-danger"
-      *ngIf="!activeOrganization.enabled"
-    >
-      <div class="tw-py-2 tw-px-5">
-        <i class="bwi bwi-exclamation-triangle" aria-hidden="true"></i>
-        {{ "organizationIsDisabled" | i18n }}
-      </div>
-    </div>
-    <div
-      class="tw-ml-3 tw-border tw-border-solid tw-rounded tw-border-info-500 tw-text-info"
-      *ngIf="activeOrganization.isProviderUser"
-    >
-      <div class="tw-py-2 tw-px-5">
-        <i class="bwi bwi-exclamation-triangle" aria-hidden="true"></i>
-        {{ "accessingUsingProvider" | i18n: activeOrganization.providerName }}
-      </div>
-    </div>
-  </div>
-
-  <bit-menu #orgPickerMenu>
-    <ul aria-labelledby="pickerButton" class="tw-p-0 tw-m-0">
-      <li *ngFor="let org of organizations" class="tw-list-none tw-flex tw-flex-col" role="none">
-        <a bit-menu-item [routerLink]="['/organizations', org.id]">
-          <i
-            class="bwi bwi-check mr-2"
-            [ngClass]="org.id === activeOrganization.id ? 'visible' : 'invisible'"
-          >
-            <span class="tw-sr-only">{{ "currentOrganization" | i18n }}</span>
-          </i>
-          {{ org.name }}
-        </a>
-      </li>
-      <bit-menu-divider></bit-menu-divider>
-      <li class="tw-list-none" role="none">
-        <a bit-menu-item routerLink="/create-organization">
-          <i class="bwi bwi-plus mr-2"></i>
-          {{ "newOrganization" | i18n }}</a
-        >
-      </li>
-    </ul>
-  </bit-menu>
-</div>

src/app/components/organization-switcher.component.ts

@@ -1,34 +0,0 @@
-import { Component, Input, OnInit } from "@angular/core";
-
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { OrganizationService } from "jslib-common/abstractions/organization.service";
-import { Utils } from "jslib-common/misc/utils";
-import { Organization } from "jslib-common/models/domain/organization";
-
-import { NavigationPermissionsService } from "../organizations/services/navigation-permissions.service";
-
-@Component({
-  selector: "app-organization-switcher",
-  templateUrl: "organization-switcher.component.html",
-})
-export class OrganizationSwitcherComponent implements OnInit {
-  constructor(private organizationService: OrganizationService, private i18nService: I18nService) {}
-
-  @Input() activeOrganization: Organization = null;
-  organizations: Organization[] = [];
-
-  loaded = false;
-
-  async ngOnInit() {
-    await this.load();
-  }
-
-  async load() {
-    const orgs = await this.organizationService.getAll();
-    this.organizations = orgs
-      .filter((org) => NavigationPermissionsService.canAccessAdmin(org))
-      .sort(Utils.getSortFunction(this.i18nService, "name"));
-
-    this.loaded = true;
-  }
-}

src/app/components/premium-badge.component.ts

@@ -1,19 +0,0 @@
-import { Component } from "@angular/core";
-
-import { MessagingService } from "jslib-common/abstractions/messaging.service";
-
-@Component({
-  selector: "app-premium-badge",
-  template: `
-    <button *appNotPremium bit-badge badgeType="success" (click)="premiumRequired()">
-      {{ "premium" | i18n }}
-    </button>
-  `,
-})
-export class PremiumBadgeComponent {
-  constructor(private messagingService: MessagingService) {}
-
-  premiumRequired() {
-    this.messagingService.send("premiumRequired");
-  }
-}

src/app/guards/home.guard.ts

@@ -1,22 +0,0 @@
-import { Injectable } from "@angular/core";
-import { ActivatedRouteSnapshot, CanActivate, Router } from "@angular/router";
-
-import { AuthService } from "jslib-common/abstractions/auth.service";
-import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus";
-
-@Injectable()
-export class HomeGuard implements CanActivate {
-  constructor(private router: Router, private authService: AuthService) {}
-
-  async canActivate(route: ActivatedRouteSnapshot) {
-    const authStatus = await this.authService.getAuthStatus();
-
-    if (authStatus === AuthenticationStatus.LoggedOut) {
-      return this.router.createUrlTree(["/login"], { queryParams: route.queryParams });
-    }
-    if (authStatus === AuthenticationStatus.Locked) {
-      return this.router.createUrlTree(["/lock"], { queryParams: route.queryParams });
-    }
-    return this.router.createUrlTree(["/vault"], { queryParams: route.queryParams });
-  }
-}

src/app/layouts/navbar.component.html

@@ -6,22 +6,11 @@
     <div class="collapse navbar-collapse">
       <ul class="navbar-nav">
         <li class="nav-item" routerLinkActive="active">
-          <a class="nav-link" routerLink="/vault">{{ "vaults" | i18n }}</a>
+          <a class="nav-link" routerLink="/vault">{{ "myVault" | i18n }}</a>
         </li>
         <li class="nav-item" routerLinkActive="active">
           <a class="nav-link" routerLink="/sends">{{ "send" | i18n }}</a>
         </li>
-        <li class="nav-item" routerLinkActive="active">
-          <a class="nav-link" routerLink="/tools">{{ "tools" | i18n }}</a>
-        </li>
-        <li class="nav-item" routerLinkActive="active">
-          <a class="nav-link" routerLink="/reports">{{ "reports" | i18n }}</a>
-        </li>
-        <li *ngIf="(organizations$ | async).length >= 1" class="nav-item" routerLinkActive="active">
-          <a class="nav-link" [routerLink]="['/organizations', (organizations$ | async)[0].id]">{{
-            "organizations" | i18n
-          }}</a>
-        </li>
         <ng-container *ngIf="providers.length >= 1">
           <li class="nav-item" routerLinkActive="active" *ngIf="providers.length == 1">
             <a class="nav-link" [routerLink]="['/providers', providers[0].id]">{{
@@ -32,62 +21,73 @@
             <a class="nav-link" routerLink="/providers">{{ "provider" | i18n }}</a>
           </li>
         </ng-container>
+        <li class="nav-item" routerLinkActive="active">
+          <a class="nav-link" routerLink="/tools">{{ "tools" | i18n }}</a>
+        </li>
+        <li class="nav-item" routerLinkActive="active">
+          <a class="nav-link" routerLink="/settings">{{ "settings" | i18n }}</a>
+        </li>
       </ul>
     </div>
     <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
-      <li>
+      <li class="nav-item dropdown">
-        <button
+        <a
-          [bitMenuTriggerFor]="accountMenu"
+          class="nav-item nav-link dropdown-toggle"
-          class="tw-border-0 tw-bg-transparent tw-text-alt2 tw-opacity-70 hover:tw-opacity-90"
+          href="#"
+          id="nav-profile"
+          data-toggle="dropdown"
+          aria-haspopup="true"
+          aria-expanded="false"
         >
           <i class="bwi bwi-user-circle bwi-lg" aria-hidden="true"></i>
-          <i class="bwi bwi-caret-down bwi-sm" aria-hidden="true"></i>
+        </a>
-        </button>
+        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="nav-profile">
-        <bit-menu class="dropdown-menu" #accountMenu>
+          <div class="dropdown-item-text d-flex align-items-center" *ngIf="name" appStopProp>
-          <div class="tw-max-w-[300px] tw-min-w-[200px] tw-flex tw-flex-col">
+            <app-avatar
-            <div
+              [data]="name"
-              class="tw-flex tw-items-center tw-leading-tight tw-text-info tw-py-1 tw-px-4"
+              [email]="email"
-              *ngIf="name"
+              size="25"
-              appStopProp
+              fontSize="14"
-            >
+              [circle]="true"
-              <app-avatar
+            ></app-avatar>
-                [data]="name"
+            <div class="ml-2 overflow-hidden">
-                [email]="email"
+              <span>{{ "loggedInAs" | i18n }}</span>
-                size="25"
+              <small class="text-muted">{{ name }}</small>
-                fontSize="14"
-                [circle]="true"
-              ></app-avatar>
-              <div class="tw-ml-2 tw-block tw-overflow-hidden tw-whitespace-nowrap">
-                <span>{{ "loggedInAs" | i18n }}</span>
-                <small class="tw-text-muted tw-block tw-overflow-hidden tw-whitespace-nowrap">{{
-                  name
-                }}</small>
-              </div>
             </div>
-            <bit-menu-divider></bit-menu-divider>
-            <a bit-menu-item routerLink="/settings/account">
-              <i class="bwi bwi-fw bwi-user" aria-hidden="true"></i>
-              {{ "accountSettings" | i18n }}
-            </a>
-            <a bit-menu-item href="https://bitwarden.com/help/" target="_blank" rel="noopener">
-              <i class="bwi bwi-fw bwi-question-circle" aria-hidden="true"></i>
-              {{ "getHelp" | i18n }}
-            </a>
-            <a bit-menu-item href="https://bitwarden.com/download/" target="_blank" rel="noopener">
-              <i class="bwi bwi-fw bwi-download" aria-hidden="true"></i>
-              {{ "getApps" | i18n }}
-            </a>
-            <bit-menu-divider></bit-menu-divider>
-            <button bit-menu-item type="button" (click)="lock()">
-              <i class="bwi bwi-fw bwi-lock" aria-hidden="true"></i>
-              {{ "lockNow" | i18n }}
-            </button>
-            <button bit-menu-item type="button" (click)="logOut()">
-              <i class="bwi bwi-fw bwi-sign-out" aria-hidden="true"></i>
-              {{ "logOut" | i18n }}
-            </button>
           </div>
-        </bit-menu>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="#" routerLink="/settings/account">
+            <i class="bwi bwi-fw bwi-user" aria-hidden="true"></i>
+            {{ "myAccount" | i18n }}
+          </a>
+          <a
+            class="dropdown-item"
+            href="https://bitwarden.com/help/"
+            target="_blank"
+            rel="noopener"
+          >
+            <i class="bwi bwi-fw bwi-question-circle" aria-hidden="true"></i>
+            {{ "getHelp" | i18n }}
+          </a>
+          <a
+            class="dropdown-item"
+            href="https://bitwarden.com/download/"
+            target="_blank"
+            rel="noopener"
+          >
+            <i class="bwi bwi-fw bwi-download" aria-hidden="true"></i>
+            {{ "getApps" | i18n }}
+          </a>
+          <div class="dropdown-divider"></div>
+          <button type="button" class="dropdown-item" (click)="lock()">
+            <i class="bwi bwi-fw bwi-lock" aria-hidden="true"></i>
+            {{ "lockNow" | i18n }}
+          </button>
+          <button type="button" class="dropdown-item" (click)="logOut()">
+            <i class="bwi bwi-fw bwi-sign-out" aria-hidden="true"></i>
+            {{ "logOut" | i18n }}
+          </button>
+        </div>
       </li>
     </ul>
   </div>

src/app/layouts/navbar.component.ts

@@ -1,19 +1,12 @@
 import { Component, OnInit } from "@angular/core";
-import { Observable, map } from "rxjs";
 
-import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { MessagingService } from "jslib-common/abstractions/messaging.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 { SyncService } from "jslib-common/abstractions/sync.service";
 import { TokenService } from "jslib-common/abstractions/token.service";
-import { Utils } from "jslib-common/misc/utils";
-import { Organization } from "jslib-common/models/domain/organization";
 import { Provider } from "jslib-common/models/domain/provider";
 
-import { NavigationPermissionsService as OrgNavigationPermissionsService } from "../organizations/services/navigation-permissions.service";
-
 @Component({
   selector: "app-navbar",
   templateUrl: "navbar.component.html",
@@ -23,16 +16,13 @@ export class NavbarComponent implements OnInit {
   name: string;
   email: string;
   providers: Provider[] = [];
-  organizations$ = new Observable<Organization[]>();
 
   constructor(
     private messagingService: MessagingService,
     private platformUtilsService: PlatformUtilsService,
     private tokenService: TokenService,
     private providerService: ProviderService,
-    private syncService: SyncService,
+    private syncService: SyncService
-    private organizationService: OrganizationService,
-    private i18nService: I18nService
   ) {
     this.selfHosted = this.platformUtilsService.isSelfHost();
   }
@@ -44,23 +34,11 @@ export class NavbarComponent implements OnInit {
       this.name = this.email;
     }
 
-    // Ensure providers and organizations are loaded
+    // Ensure provides are loaded
     if ((await this.syncService.getLastSync()) == null) {
       await this.syncService.fullSync(false);
     }
     this.providers = await this.providerService.getAll();
-
-    this.organizations$ = await this.buildOrganizations();
-  }
-
-  async buildOrganizations() {
-    return this.organizations$.pipe(
-      map((orgs) => {
-        return orgs
-          .filter((org) => OrgNavigationPermissionsService.canAccessAdmin(org))
-          .sort(Utils.getSortFunction(this.i18nService, "name"));
-      })
-    );
   }
 
   lock() {

src/app/layouts/organization-layout.component.html

@@ -0,0 +1,60 @@
+<app-navbar></app-navbar>
+<div class="org-nav" *ngIf="organization">
+  <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]="organization.name" size="45" [circle]="true"></app-avatar>
+        <div class="org-name ml-3">
+          <span>{{ organization.name }}</span>
+          <small class="text-muted">{{ "organization" | i18n }}</small>
+        </div>
+        <div
+          class="ml-3 card border-danger text-danger bg-transparent"
+          *ngIf="!organization.enabled"
+        >
+          <div class="card-body py-2">
+            <i class="bwi bwi-exclamation-triangle" aria-hidden="true"></i>
+            {{ "organizationIsDisabled" | i18n }}
+          </div>
+        </div>
+        <div
+          class="ml-3 card border-info text-info bg-transparent"
+          *ngIf="organization.isProviderUser"
+        >
+          <div class="card-body py-2">
+            <i class="bwi bwi-exclamation-triangle" aria-hidden="true"></i>
+            {{ "accessingUsingProvider" | i18n: organization.providerName }}
+          </div>
+        </div>
+      </div>
+      <ul class="nav nav-tabs" *ngIf="showMenuBar">
+        <li class="nav-item">
+          <a class="nav-link" routerLink="vault" routerLinkActive="active">
+            <i class="bwi bwi-lock" aria-hidden="true"></i>
+            {{ "vault" | i18n }}
+          </a>
+        </li>
+        <li class="nav-item" *ngIf="showManageTab">
+          <a class="nav-link" [routerLink]="manageRoute" routerLinkActive="active">
+            <i class="bwi bwi-sliders" aria-hidden="true"></i>
+            {{ "manage" | i18n }}
+          </a>
+        </li>
+        <li class="nav-item" *ngIf="showToolsTab">
+          <a class="nav-link" [routerLink]="toolsRoute" routerLinkActive="active">
+            <i class="bwi bwi-wrench" aria-hidden="true"></i>
+            {{ "tools" | i18n }}
+          </a>
+        </li>
+        <li class="nav-item" *ngIf="organization.isOwner">
+          <a class="nav-link" routerLink="settings" routerLinkActive="active">
+            <i class="bwi bwi-cogs" aria-hidden="true"></i>
+            {{ "settings" | i18n }}
+          </a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</div>
+<router-outlet></router-outlet>
+<app-footer></app-footer>

src/app/layouts/organization-layout.component.ts

@@ -5,8 +5,6 @@ import { BroadcasterService } from "jslib-common/abstractions/broadcaster.servic
 import { OrganizationService } from "jslib-common/abstractions/organization.service";
 import { Organization } from "jslib-common/models/domain/organization";
 
-import { NavigationPermissionsService } from "../services/navigation-permissions.service";
-
 const BroadcasterSubscriptionId = "OrganizationLayoutComponent";
 
 @Component({
@@ -27,7 +25,7 @@ export class OrganizationLayoutComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     document.body.classList.remove("layout_frontend");
-    this.route.params.subscribe(async (params: any) => {
+    this.route.params.subscribe(async (params) => {
       this.organizationId = params.organizationId;
       await this.load();
     });
@@ -50,16 +48,23 @@ export class OrganizationLayoutComponent implements OnInit, OnDestroy {
     this.organization = await this.organizationService.get(this.organizationId);
   }
 
+  get showMenuBar() {
+    return this.showManageTab || this.showToolsTab || this.organization.isOwner;
+  }
+
   get showManageTab(): boolean {
-    return NavigationPermissionsService.canAccessManage(this.organization);
+    return (
+      this.organization.canManageUsers ||
+      this.organization.canViewAllCollections ||
+      this.organization.canViewAssignedCollections ||
+      this.organization.canManageGroups ||
+      this.organization.canManagePolicies ||
+      this.organization.canAccessEventLogs
+    );
   }
 
   get showToolsTab(): boolean {
-    return NavigationPermissionsService.canAccessTools(this.organization);
+    return this.organization.canAccessImportExport || this.organization.canAccessReports;
-  }
-
-  get showSettingsTab(): boolean {
-    return NavigationPermissionsService.canAccessSettings(this.organization);
   }
 
   get toolsRoute(): string {

src/app/main.ts

@@ -6,7 +6,6 @@ import "jquery";
 import "popper.js";
 
 require("../scss/styles.scss");
-require("../scss/tailwind.css");
 
 import { AppModule } from "./app.module";
 

src/app/modules/loose-components.module.ts

@@ -1,499 +0,0 @@
-import { NgModule } from "@angular/core";
-
-import { UserVerificationComponent } from "jslib-angular/components/user-verification.component";
-
-import { AcceptEmergencyComponent } from "../accounts/accept-emergency.component";
-import { AcceptOrganizationComponent } from "../accounts/accept-organization.component";
-import { HintComponent } from "../accounts/hint.component";
-import { LockComponent } from "../accounts/lock.component";
-import { LoginComponent } from "../accounts/login.component";
-import { RecoverDeleteComponent } from "../accounts/recover-delete.component";
-import { RecoverTwoFactorComponent } from "../accounts/recover-two-factor.component";
-import { RegisterComponent } from "../accounts/register.component";
-import { RemovePasswordComponent } from "../accounts/remove-password.component";
-import { SetPasswordComponent } from "../accounts/set-password.component";
-import { SsoComponent } from "../accounts/sso.component";
-import { TwoFactorOptionsComponent } from "../accounts/two-factor-options.component";
-import { TwoFactorComponent } from "../accounts/two-factor.component";
-import { UpdatePasswordComponent } from "../accounts/update-password.component";
-import { UpdateTempPasswordComponent } from "../accounts/update-temp-password.component";
-import { VerifyEmailTokenComponent } from "../accounts/verify-email-token.component";
-import { VerifyRecoverDeleteComponent } from "../accounts/verify-recover-delete.component";
-import { NestedCheckboxComponent } from "../components/nested-checkbox.component";
-import { OrganizationSwitcherComponent } from "../components/organization-switcher.component";
-import { PasswordRepromptComponent } from "../components/password-reprompt.component";
-import { PasswordStrengthComponent } from "../components/password-strength.component";
-import { PremiumBadgeComponent } from "../components/premium-badge.component";
-import { FooterComponent } from "../layouts/footer.component";
-import { FrontendLayoutComponent } from "../layouts/frontend-layout.component";
-import { NavbarComponent } from "../layouts/navbar.component";
-import { UserLayoutComponent } from "../layouts/user-layout.component";
-import { OrganizationLayoutComponent } from "../organizations/layouts/organization-layout.component";
-import { BulkConfirmComponent as OrgBulkConfirmComponent } from "../organizations/manage/bulk/bulk-confirm.component";
-import { BulkRemoveComponent as OrgBulkRemoveComponent } from "../organizations/manage/bulk/bulk-remove.component";
-import { BulkStatusComponent as OrgBulkStatusComponent } from "../organizations/manage/bulk/bulk-status.component";
-import { CollectionAddEditComponent as OrgCollectionAddEditComponent } from "../organizations/manage/collection-add-edit.component";
-import { CollectionsComponent as OrgManageCollectionsComponent } from "../organizations/manage/collections.component";
-import { EntityEventsComponent as OrgEntityEventsComponent } from "../organizations/manage/entity-events.component";
-import { EntityUsersComponent as OrgEntityUsersComponent } from "../organizations/manage/entity-users.component";
-import { EventsComponent as OrgEventsComponent } from "../organizations/manage/events.component";
-import { GroupAddEditComponent as OrgGroupAddEditComponent } from "../organizations/manage/group-add-edit.component";
-import { GroupsComponent as OrgGroupsComponent } from "../organizations/manage/groups.component";
-import { ManageComponent as OrgManageComponent } from "../organizations/manage/manage.component";
-import { PeopleComponent as OrgPeopleComponent } from "../organizations/manage/people.component";
-import { PoliciesComponent as OrgPoliciesComponent } from "../organizations/manage/policies.component";
-import { PolicyEditComponent as OrgPolicyEditComponent } from "../organizations/manage/policy-edit.component";
-import { ResetPasswordComponent as OrgResetPasswordComponent } from "../organizations/manage/reset-password.component";
-import { UserAddEditComponent as OrgUserAddEditComponent } from "../organizations/manage/user-add-edit.component";
-import { UserConfirmComponent as OrgUserConfirmComponent } from "../organizations/manage/user-confirm.component";
-import { UserGroupsComponent as OrgUserGroupsComponent } from "../organizations/manage/user-groups.component";
-import { DisableSendPolicyComponent } from "../organizations/policies/disable-send.component";
-import { MasterPasswordPolicyComponent } from "../organizations/policies/master-password.component";
-import { PasswordGeneratorPolicyComponent } from "../organizations/policies/password-generator.component";
-import { PersonalOwnershipPolicyComponent } from "../organizations/policies/personal-ownership.component";
-import { RequireSsoPolicyComponent } from "../organizations/policies/require-sso.component";
-import { ResetPasswordPolicyComponent } from "../organizations/policies/reset-password.component";
-import { SendOptionsPolicyComponent } from "../organizations/policies/send-options.component";
-import { SingleOrgPolicyComponent } from "../organizations/policies/single-org.component";
-import { TwoFactorAuthenticationPolicyComponent } from "../organizations/policies/two-factor-authentication.component";
-import { AccountComponent as OrgAccountComponent } from "../organizations/settings/account.component";
-import { AdjustSubscription } from "../organizations/settings/adjust-subscription.component";
-import { BillingSyncApiKeyComponent } from "../organizations/settings/billing-sync-api-key.component";
-import { ChangePlanComponent } from "../organizations/settings/change-plan.component";
-import { DeleteOrganizationComponent } from "../organizations/settings/delete-organization.component";
-import { DownloadLicenseComponent } from "../organizations/settings/download-license.component";
-import { ImageSubscriptionHiddenComponent as OrgSubscriptionHiddenComponent } from "../organizations/settings/image-subscription-hidden.component";
-import { OrganizationBillingComponent } from "../organizations/settings/organization-billing.component";
-import { OrganizationSubscriptionComponent } from "../organizations/settings/organization-subscription.component";
-import { SettingsComponent as OrgSettingComponent } from "../organizations/settings/settings.component";
-import { TwoFactorSetupComponent as OrgTwoFactorSetupComponent } from "../organizations/settings/two-factor-setup.component";
-import { AcceptFamilySponsorshipComponent } from "../organizations/sponsorships/accept-family-sponsorship.component";
-import { FamiliesForEnterpriseSetupComponent } from "../organizations/sponsorships/families-for-enterprise-setup.component";
-import { ExportComponent as OrgExportComponent } from "../organizations/tools/export.component";
-import { ExposedPasswordsReportComponent as OrgExposedPasswordsReportComponent } from "../organizations/tools/exposed-passwords-report.component";
-import { ImportComponent as OrgImportComponent } from "../organizations/tools/import.component";
-import { InactiveTwoFactorReportComponent as OrgInactiveTwoFactorReportComponent } from "../organizations/tools/inactive-two-factor-report.component";
-import { ReusedPasswordsReportComponent as OrgReusedPasswordsReportComponent } from "../organizations/tools/reused-passwords-report.component";
-import { ToolsComponent as OrgToolsComponent } from "../organizations/tools/tools.component";
-import { UnsecuredWebsitesReportComponent as OrgUnsecuredWebsitesReportComponent } from "../organizations/tools/unsecured-websites-report.component";
-import { WeakPasswordsReportComponent as OrgWeakPasswordsReportComponent } from "../organizations/tools/weak-passwords-report.component";
-import { AddEditComponent as OrgAddEditComponent } from "../organizations/vault/add-edit.component";
-import { AttachmentsComponent as OrgAttachmentsComponent } from "../organizations/vault/attachments.component";
-import { CiphersComponent as OrgCiphersComponent } from "../organizations/vault/ciphers.component";
-import { CollectionsComponent as OrgCollectionsComponent } from "../organizations/vault/collections.component";
-import { ProvidersComponent } from "../providers/providers.component";
-import { BreachReportComponent } from "../reports/breach-report.component";
-import { ExposedPasswordsReportComponent } from "../reports/exposed-passwords-report.component";
-import { InactiveTwoFactorReportComponent } from "../reports/inactive-two-factor-report.component";
-import { ReportCardComponent } from "../reports/report-card.component";
-import { ReportListComponent } from "../reports/report-list.component";
-import { ReportsComponent } from "../reports/reports.component";
-import { ReusedPasswordsReportComponent } from "../reports/reused-passwords-report.component";
-import { UnsecuredWebsitesReportComponent } from "../reports/unsecured-websites-report.component";
-import { WeakPasswordsReportComponent } from "../reports/weak-passwords-report.component";
-import { AccessComponent } from "../send/access.component";
-import { AddEditComponent as SendAddEditComponent } from "../send/add-edit.component";
-import { EffluxDatesComponent as SendEffluxDatesComponent } from "../send/efflux-dates.component";
-import { SendComponent } from "../send/send.component";
-import { AccountComponent } from "../settings/account.component";
-import { AddCreditComponent } from "../settings/add-credit.component";
-import { AdjustPaymentComponent } from "../settings/adjust-payment.component";
-import { AdjustStorageComponent } from "../settings/adjust-storage.component";
-import { ApiKeyComponent } from "../settings/api-key.component";
-import { BillingSyncKeyComponent } from "../settings/billing-sync-key.component";
-import { ChangeEmailComponent } from "../settings/change-email.component";
-import { ChangeKdfComponent } from "../settings/change-kdf.component";
-import { ChangePasswordComponent } from "../settings/change-password.component";
-import { CreateOrganizationComponent } from "../settings/create-organization.component";
-import { DeauthorizeSessionsComponent } from "../settings/deauthorize-sessions.component";
-import { DeleteAccountComponent } from "../settings/delete-account.component";
-import { DomainRulesComponent } from "../settings/domain-rules.component";
-import { EmergencyAccessAddEditComponent } from "../settings/emergency-access-add-edit.component";
-import { EmergencyAccessAttachmentsComponent } from "../settings/emergency-access-attachments.component";
-import { EmergencyAccessConfirmComponent } from "../settings/emergency-access-confirm.component";
-import { EmergencyAccessTakeoverComponent } from "../settings/emergency-access-takeover.component";
-import { EmergencyAccessViewComponent } from "../settings/emergency-access-view.component";
-import { EmergencyAccessComponent } from "../settings/emergency-access.component";
-import { EmergencyAddEditComponent } from "../settings/emergency-add-edit.component";
-import { LinkSsoComponent } from "../settings/link-sso.component";
-import { OrganizationPlansComponent } from "../settings/organization-plans.component";
-import { PaymentMethodComponent } from "../settings/payment-method.component";
-import { PaymentComponent } from "../settings/payment.component";
-import { PreferencesComponent } from "../settings/preferences.component";
-import { PremiumComponent } from "../settings/premium.component";
-import { ProfileComponent } from "../settings/profile.component";
-import { PurgeVaultComponent } from "../settings/purge-vault.component";
-import { SecurityKeysComponent } from "../settings/security-keys.component";
-import { SecurityComponent } from "../settings/security.component";
-import { SettingsComponent } from "../settings/settings.component";
-import { SponsoredFamiliesComponent } from "../settings/sponsored-families.component";
-import { SponsoringOrgRowComponent } from "../settings/sponsoring-org-row.component";
-import { SubscriptionComponent } from "../settings/subscription.component";
-import { TaxInfoComponent } from "../settings/tax-info.component";
-import { TwoFactorAuthenticatorComponent } from "../settings/two-factor-authenticator.component";
-import { TwoFactorDuoComponent } from "../settings/two-factor-duo.component";
-import { TwoFactorEmailComponent } from "../settings/two-factor-email.component";
-import { TwoFactorRecoveryComponent } from "../settings/two-factor-recovery.component";
-import { TwoFactorSetupComponent } from "../settings/two-factor-setup.component";
-import { TwoFactorVerifyComponent } from "../settings/two-factor-verify.component";
-import { TwoFactorWebAuthnComponent } from "../settings/two-factor-webauthn.component";
-import { TwoFactorYubiKeyComponent } from "../settings/two-factor-yubikey.component";
-import { UpdateKeyComponent } from "../settings/update-key.component";
-import { UpdateLicenseComponent } from "../settings/update-license.component";
-import { UserBillingHistoryComponent } from "../settings/user-billing-history.component";
-import { UserSubscriptionComponent } from "../settings/user-subscription.component";
-import { VaultTimeoutInputComponent } from "../settings/vault-timeout-input.component";
-import { VerifyEmailComponent } from "../settings/verify-email.component";
-import { ExportComponent } from "../tools/export.component";
-import { GeneratorComponent } from "../tools/generator.component";
-import { ImportComponent } from "../tools/import.component";
-import { PasswordGeneratorHistoryComponent } from "../tools/password-generator-history.component";
-import { ToolsComponent } from "../tools/tools.component";
-import { AddEditCustomFieldsComponent } from "../vault/add-edit-custom-fields.component";
-import { AddEditComponent } from "../vault/add-edit.component";
-import { AttachmentsComponent } from "../vault/attachments.component";
-import { BulkActionsComponent } from "../vault/bulk-actions.component";
-import { BulkDeleteComponent } from "../vault/bulk-delete.component";
-import { BulkMoveComponent } from "../vault/bulk-move.component";
-import { BulkRestoreComponent } from "../vault/bulk-restore.component";
-import { BulkShareComponent } from "../vault/bulk-share.component";
-import { CiphersComponent } from "../vault/ciphers.component";
-import { CollectionsComponent } from "../vault/collections.component";
-import { FolderAddEditComponent } from "../vault/folder-add-edit.component";
-import { ShareComponent } from "../vault/share.component";
-
-import { PipesModule } from "./pipes/pipes.module";
-import { SharedModule } from "./shared.module";
-import { VaultFilterModule } from "./vault-filter/vault-filter.module";
-import { OrganizationBadgeModule } from "./vault/modules/organization-badge/organization-badge.module";
-
-// Please do not add to this list of declarations - we should refactor these into modules when doing so makes sense until there are none left.
-// If you are building new functionality, please create or extend a feature module instead.
-@NgModule({
-  imports: [SharedModule, VaultFilterModule, OrganizationBadgeModule, PipesModule],
-  declarations: [
-    PremiumBadgeComponent,
-    AcceptEmergencyComponent,
-    AcceptFamilySponsorshipComponent,
-    AcceptOrganizationComponent,
-    AccessComponent,
-    AccountComponent,
-    AddCreditComponent,
-    AddEditComponent,
-    AddEditCustomFieldsComponent,
-    AddEditCustomFieldsComponent,
-    AdjustPaymentComponent,
-    AdjustStorageComponent,
-    AdjustSubscription,
-    ApiKeyComponent,
-    AttachmentsComponent,
-    BillingSyncApiKeyComponent,
-    BillingSyncKeyComponent,
-    BreachReportComponent,
-    BulkActionsComponent,
-    BulkDeleteComponent,
-    BulkMoveComponent,
-    BulkRestoreComponent,
-    BulkShareComponent,
-    ChangeEmailComponent,
-    ChangeKdfComponent,
-    ChangePasswordComponent,
-    ChangePlanComponent,
-    CiphersComponent,
-    CollectionsComponent,
-    CreateOrganizationComponent,
-    DeauthorizeSessionsComponent,
-    DeleteAccountComponent,
-    DeleteOrganizationComponent,
-    DisableSendPolicyComponent,
-    DomainRulesComponent,
-    DownloadLicenseComponent,
-    EmergencyAccessAddEditComponent,
-    EmergencyAccessAttachmentsComponent,
-    EmergencyAccessComponent,
-    EmergencyAccessConfirmComponent,
-    EmergencyAccessTakeoverComponent,
-    EmergencyAccessViewComponent,
-    EmergencyAddEditComponent,
-    ExportComponent,
-    ExposedPasswordsReportComponent,
-    FamiliesForEnterpriseSetupComponent,
-    FolderAddEditComponent,
-    FooterComponent,
-    FrontendLayoutComponent,
-    HintComponent,
-    ImportComponent,
-    InactiveTwoFactorReportComponent,
-    LinkSsoComponent,
-    LockComponent,
-    LoginComponent,
-    MasterPasswordPolicyComponent,
-    NavbarComponent,
-    NestedCheckboxComponent,
-    OrganizationSwitcherComponent,
-    OrgAccountComponent,
-    OrgAddEditComponent,
-    OrganizationBillingComponent,
-    OrganizationLayoutComponent,
-    OrganizationPlansComponent,
-    OrganizationSubscriptionComponent,
-    OrgAttachmentsComponent,
-    OrgBulkConfirmComponent,
-    OrgBulkRemoveComponent,
-    OrgBulkStatusComponent,
-    OrgCiphersComponent,
-    OrgCollectionAddEditComponent,
-    OrgCollectionsComponent,
-    OrgEntityEventsComponent,
-    OrgEntityUsersComponent,
-    OrgEventsComponent,
-    OrgExportComponent,
-    OrgExposedPasswordsReportComponent,
-    OrgGroupAddEditComponent,
-    OrgGroupsComponent,
-    OrgImportComponent,
-    OrgInactiveTwoFactorReportComponent,
-    OrgManageCollectionsComponent,
-    OrgManageComponent,
-    OrgPeopleComponent,
-    OrgPoliciesComponent,
-    OrgPolicyEditComponent,
-    OrgResetPasswordComponent,
-    OrgReusedPasswordsReportComponent,
-    OrgSettingComponent,
-    OrgToolsComponent,
-    OrgTwoFactorSetupComponent,
-    OrgSubscriptionHiddenComponent,
-    OrgUnsecuredWebsitesReportComponent,
-    OrgUserAddEditComponent,
-    OrgUserConfirmComponent,
-    OrgUserGroupsComponent,
-    OrgWeakPasswordsReportComponent,
-    GeneratorComponent,
-    PasswordGeneratorHistoryComponent,
-    PasswordGeneratorPolicyComponent,
-    PasswordRepromptComponent,
-    PasswordStrengthComponent,
-    PaymentComponent,
-    PaymentMethodComponent,
-    PersonalOwnershipPolicyComponent,
-    PreferencesComponent,
-    PremiumBadgeComponent,
-    PremiumComponent,
-    ProfileComponent,
-    ProvidersComponent,
-    PurgeVaultComponent,
-    RecoverDeleteComponent,
-    RecoverTwoFactorComponent,
-    RegisterComponent,
-    RemovePasswordComponent,
-    ReportCardComponent,
-    ReportListComponent,
-    ReportsComponent,
-    RequireSsoPolicyComponent,
-    ResetPasswordPolicyComponent,
-    ReusedPasswordsReportComponent,
-    SecurityComponent,
-    SecurityKeysComponent,
-    SendAddEditComponent,
-    SendComponent,
-    SendEffluxDatesComponent,
-    SendOptionsPolicyComponent,
-    SetPasswordComponent,
-    SettingsComponent,
-    ShareComponent,
-    SingleOrgPolicyComponent,
-    SponsoredFamiliesComponent,
-    SponsoringOrgRowComponent,
-    SsoComponent,
-    SubscriptionComponent,
-    TaxInfoComponent,
-    ToolsComponent,
-    TwoFactorAuthenticationPolicyComponent,
-    TwoFactorAuthenticatorComponent,
-    TwoFactorComponent,
-    TwoFactorDuoComponent,
-    TwoFactorEmailComponent,
-    TwoFactorOptionsComponent,
-    TwoFactorRecoveryComponent,
-    TwoFactorSetupComponent,
-    TwoFactorVerifyComponent,
-    TwoFactorWebAuthnComponent,
-    TwoFactorYubiKeyComponent,
-    UnsecuredWebsitesReportComponent,
-    UpdateKeyComponent,
-    UpdateLicenseComponent,
-    UpdatePasswordComponent,
-    UpdateTempPasswordComponent,
-    UserBillingHistoryComponent,
-    UserLayoutComponent,
-    UserSubscriptionComponent,
-    UserVerificationComponent,
-    VaultTimeoutInputComponent,
-    VerifyEmailComponent,
-    VerifyEmailTokenComponent,
-    VerifyRecoverDeleteComponent,
-    WeakPasswordsReportComponent,
-  ],
-  exports: [
-    PremiumBadgeComponent,
-    AcceptEmergencyComponent,
-    AcceptOrganizationComponent,
-    AccessComponent,
-    AccountComponent,
-    AddCreditComponent,
-    AddEditComponent,
-    AddEditCustomFieldsComponent,
-    AddEditCustomFieldsComponent,
-    AdjustPaymentComponent,
-    AdjustStorageComponent,
-    AdjustSubscription,
-    ApiKeyComponent,
-    AttachmentsComponent,
-    BreachReportComponent,
-    BulkActionsComponent,
-    BulkDeleteComponent,
-    BulkMoveComponent,
-    BulkRestoreComponent,
-    BulkShareComponent,
-    ChangeEmailComponent,
-    ChangeKdfComponent,
-    ChangePasswordComponent,
-    ChangePlanComponent,
-    CiphersComponent,
-    CollectionsComponent,
-    CreateOrganizationComponent,
-    DeauthorizeSessionsComponent,
-    DeleteAccountComponent,
-    DeleteOrganizationComponent,
-    DisableSendPolicyComponent,
-    DomainRulesComponent,
-    DownloadLicenseComponent,
-    EmergencyAccessAddEditComponent,
-    EmergencyAccessAttachmentsComponent,
-    EmergencyAccessComponent,
-    EmergencyAccessConfirmComponent,
-    EmergencyAccessTakeoverComponent,
-    EmergencyAccessViewComponent,
-    EmergencyAddEditComponent,
-    ExportComponent,
-    ExposedPasswordsReportComponent,
-    FamiliesForEnterpriseSetupComponent,
-    FolderAddEditComponent,
-    FooterComponent,
-    FrontendLayoutComponent,
-    HintComponent,
-    ImportComponent,
-    InactiveTwoFactorReportComponent,
-    LinkSsoComponent,
-    LockComponent,
-    LoginComponent,
-    MasterPasswordPolicyComponent,
-    NavbarComponent,
-    NestedCheckboxComponent,
-    OrganizationSwitcherComponent,
-    OrgAccountComponent,
-    OrgAddEditComponent,
-    OrganizationBillingComponent,
-    OrganizationLayoutComponent,
-    OrganizationPlansComponent,
-    OrganizationSubscriptionComponent,
-    OrgAttachmentsComponent,
-    OrgBulkConfirmComponent,
-    OrgBulkRemoveComponent,
-    OrgBulkStatusComponent,
-    OrgCiphersComponent,
-    OrgCollectionAddEditComponent,
-    OrgCollectionsComponent,
-    OrgEntityEventsComponent,
-    OrgEntityUsersComponent,
-    OrgEventsComponent,
-    OrgExportComponent,
-    OrgExposedPasswordsReportComponent,
-    OrgGroupAddEditComponent,
-    OrgGroupsComponent,
-    OrgImportComponent,
-    OrgInactiveTwoFactorReportComponent,
-    OrgManageCollectionsComponent,
-    OrgManageComponent,
-    OrgPeopleComponent,
-    OrgPoliciesComponent,
-    OrgPolicyEditComponent,
-    OrgResetPasswordComponent,
-    OrgReusedPasswordsReportComponent,
-    OrgSettingComponent,
-    OrgToolsComponent,
-    OrgTwoFactorSetupComponent,
-    OrgUnsecuredWebsitesReportComponent,
-    OrgUserAddEditComponent,
-    OrgUserConfirmComponent,
-    OrgUserGroupsComponent,
-    OrgWeakPasswordsReportComponent,
-    GeneratorComponent,
-    PasswordGeneratorHistoryComponent,
-    PasswordGeneratorPolicyComponent,
-    PasswordRepromptComponent,
-    PasswordStrengthComponent,
-    PaymentComponent,
-    PaymentMethodComponent,
-    PersonalOwnershipPolicyComponent,
-    PreferencesComponent,
-    PremiumBadgeComponent,
-    PremiumComponent,
-    ProfileComponent,
-    ProvidersComponent,
-    PurgeVaultComponent,
-    RecoverDeleteComponent,
-    RecoverTwoFactorComponent,
-    RegisterComponent,
-    RemovePasswordComponent,
-    ReportCardComponent,
-    ReportListComponent,
-    ReportsComponent,
-    RequireSsoPolicyComponent,
-    ResetPasswordPolicyComponent,
-    ReusedPasswordsReportComponent,
-    SecurityComponent,
-    SecurityKeysComponent,
-    SendAddEditComponent,
-    SendComponent,
-    SendEffluxDatesComponent,
-    SendOptionsPolicyComponent,
-    SetPasswordComponent,
-    SettingsComponent,
-    ShareComponent,
-    SingleOrgPolicyComponent,
-    SponsoredFamiliesComponent,
-    SponsoringOrgRowComponent,
-    SsoComponent,
-    SubscriptionComponent,
-    TaxInfoComponent,
-    ToolsComponent,
-    TwoFactorAuthenticationPolicyComponent,
-    TwoFactorAuthenticatorComponent,
-    TwoFactorComponent,
-    TwoFactorDuoComponent,
-    TwoFactorEmailComponent,
-    TwoFactorOptionsComponent,
-    TwoFactorRecoveryComponent,
-    TwoFactorSetupComponent,
-    TwoFactorVerifyComponent,
-    TwoFactorWebAuthnComponent,
-    TwoFactorYubiKeyComponent,
-    UnsecuredWebsitesReportComponent,
-    UpdateKeyComponent,
-    UpdateLicenseComponent,
-    UpdatePasswordComponent,
-    UpdateTempPasswordComponent,
-    UserBillingHistoryComponent,
-    UserLayoutComponent,
-    UserSubscriptionComponent,
-    UserVerificationComponent,
-    VaultTimeoutInputComponent,
-    VerifyEmailComponent,
-    VerifyEmailTokenComponent,
-    VerifyRecoverDeleteComponent,
-    WeakPasswordsReportComponent,
-  ],
-})
-export class LooseComponentsModule {}

src/app/modules/pipes/get-organization-name.pipe.ts

@@ -1,14 +0,0 @@
-import { Pipe, PipeTransform } from "@angular/core";
-
-import { Organization } from "jslib-common/models/domain/organization";
-
-@Pipe({
-  name: "orgNameFromId",
-  pure: true,
-})
-export class GetOrgNameFromIdPipe implements PipeTransform {
-  transform(value: string, organizations: Organization[]) {
-    const orgName = organizations.find((o) => o.id === value)?.name;
-    return orgName;
-  }
-}

src/app/modules/pipes/pipes.module.ts

@@ -1,10 +0,0 @@
-import { NgModule } from "@angular/core";
-
-import { GetOrgNameFromIdPipe } from "./get-organization-name.pipe";
-
-@NgModule({
-  imports: [],
-  declarations: [GetOrgNameFromIdPipe],
-  exports: [GetOrgNameFromIdPipe],
-})
-export class PipesModule {}

src/app/modules/shared.module.ts

@@ -1,149 +0,0 @@
-import { DragDropModule } from "@angular/cdk/drag-drop";
-import { DatePipe, registerLocaleData, CommonModule } from "@angular/common";
-import localeAf from "@angular/common/locales/af";
-import localeAz from "@angular/common/locales/az";
-import localeBe from "@angular/common/locales/be";
-import localeBg from "@angular/common/locales/bg";
-import localeBn from "@angular/common/locales/bn";
-import localeBs from "@angular/common/locales/bs";
-import localeCa from "@angular/common/locales/ca";
-import localeCs from "@angular/common/locales/cs";
-import localeDa from "@angular/common/locales/da";
-import localeDe from "@angular/common/locales/de";
-import localeEl from "@angular/common/locales/el";
-import localeEnGb from "@angular/common/locales/en-GB";
-import localeEnIn from "@angular/common/locales/en-IN";
-import localeEo from "@angular/common/locales/eo";
-import localeEs from "@angular/common/locales/es";
-import localeEt from "@angular/common/locales/et";
-import localeFi from "@angular/common/locales/fi";
-import localeFil from "@angular/common/locales/fil";
-import localeFr from "@angular/common/locales/fr";
-import localeHe from "@angular/common/locales/he";
-import localeHi from "@angular/common/locales/hi";
-import localeHr from "@angular/common/locales/hr";
-import localeHu from "@angular/common/locales/hu";
-import localeId from "@angular/common/locales/id";
-import localeIt from "@angular/common/locales/it";
-import localeJa from "@angular/common/locales/ja";
-import localeKa from "@angular/common/locales/ka";
-import localeKm from "@angular/common/locales/km";
-import localeKn from "@angular/common/locales/kn";
-import localeKo from "@angular/common/locales/ko";
-import localeLv from "@angular/common/locales/lv";
-import localeMl from "@angular/common/locales/ml";
-import localeNb from "@angular/common/locales/nb";
-import localeNl from "@angular/common/locales/nl";
-import localeNn from "@angular/common/locales/nn";
-import localePl from "@angular/common/locales/pl";
-import localePtBr from "@angular/common/locales/pt";
-import localePtPt from "@angular/common/locales/pt-PT";
-import localeRo from "@angular/common/locales/ro";
-import localeRu from "@angular/common/locales/ru";
-import localeSi from "@angular/common/locales/si";
-import localeSk from "@angular/common/locales/sk";
-import localeSl from "@angular/common/locales/sl";
-import localeSr from "@angular/common/locales/sr";
-import localeSv from "@angular/common/locales/sv";
-import localeTr from "@angular/common/locales/tr";
-import localeUk from "@angular/common/locales/uk";
-import localeVi from "@angular/common/locales/vi";
-import localeZhCn from "@angular/common/locales/zh-Hans";
-import localeZhTw from "@angular/common/locales/zh-Hant";
-import { NgModule } from "@angular/core";
-import { FormsModule, ReactiveFormsModule } from "@angular/forms";
-import { RouterModule } from "@angular/router";
-import { BadgeModule, ButtonModule, CalloutModule, MenuModule } from "@bitwarden/components";
-import { InfiniteScrollModule } from "ngx-infinite-scroll";
-import { ToastrModule } from "ngx-toastr";
-
-import { JslibModule } from "jslib-angular/jslib.module";
-
-registerLocaleData(localeAf, "af");
-registerLocaleData(localeAz, "az");
-registerLocaleData(localeBe, "be");
-registerLocaleData(localeBg, "bg");
-registerLocaleData(localeBn, "bn");
-registerLocaleData(localeBs, "bs");
-registerLocaleData(localeCa, "ca");
-registerLocaleData(localeCs, "cs");
-registerLocaleData(localeDa, "da");
-registerLocaleData(localeDe, "de");
-registerLocaleData(localeEl, "el");
-registerLocaleData(localeEnGb, "en-GB");
-registerLocaleData(localeEnIn, "en-IN");
-registerLocaleData(localeEo, "eo");
-registerLocaleData(localeEs, "es");
-registerLocaleData(localeEt, "et");
-registerLocaleData(localeFi, "fi");
-registerLocaleData(localeFil, "fil");
-registerLocaleData(localeFr, "fr");
-registerLocaleData(localeHe, "he");
-registerLocaleData(localeHi, "hi");
-registerLocaleData(localeHr, "hr");
-registerLocaleData(localeHu, "hu");
-registerLocaleData(localeId, "id");
-registerLocaleData(localeIt, "it");
-registerLocaleData(localeJa, "ja");
-registerLocaleData(localeKa, "ka");
-registerLocaleData(localeKm, "km");
-registerLocaleData(localeKn, "kn");
-registerLocaleData(localeKo, "ko");
-registerLocaleData(localeLv, "lv");
-registerLocaleData(localeMl, "ml");
-registerLocaleData(localeNb, "nb");
-registerLocaleData(localeNl, "nl");
-registerLocaleData(localeNn, "nn");
-registerLocaleData(localePl, "pl");
-registerLocaleData(localePtBr, "pt-BR");
-registerLocaleData(localePtPt, "pt-PT");
-registerLocaleData(localeRo, "ro");
-registerLocaleData(localeRu, "ru");
-registerLocaleData(localeSi, "si");
-registerLocaleData(localeSk, "sk");
-registerLocaleData(localeSl, "sl");
-registerLocaleData(localeSr, "sr");
-registerLocaleData(localeSv, "sv");
-registerLocaleData(localeTr, "tr");
-registerLocaleData(localeUk, "uk");
-registerLocaleData(localeVi, "vi");
-registerLocaleData(localeZhCn, "zh-CN");
-registerLocaleData(localeZhTw, "zh-TW");
-
-@NgModule({
-  imports: [
-    CommonModule,
-    DragDropModule,
-    FormsModule,
-    InfiniteScrollModule,
-    JslibModule,
-    ReactiveFormsModule,
-    RouterModule,
-    BadgeModule,
-    ButtonModule,
-    CalloutModule,
-    ToastrModule,
-    BadgeModule,
-    ButtonModule,
-    MenuModule,
-  ],
-  exports: [
-    CommonModule,
-    DragDropModule,
-    FormsModule,
-    InfiniteScrollModule,
-    JslibModule,
-    ReactiveFormsModule,
-    RouterModule,
-    BadgeModule,
-    ButtonModule,
-    CalloutModule,
-    ToastrModule,
-    BadgeModule,
-    ButtonModule,
-    MenuModule,
-  ],
-  providers: [DatePipe],
-  bootstrap: [],
-})
-export class SharedModule {}

src/app/modules/vault-filter/components/collection-filter.component.html

@@ -1,74 +0,0 @@
-<ng-container *ngIf="show">
-  <div class="filter-heading">
-    <button
-      (click)="toggleCollapse(collectionsGrouping)"
-      [attr.aria-expanded]="!isCollapsed(collectionsGrouping)"
-      aria-controls="collection-filters"
-      title="{{ 'toggleCollapse' | i18n }}"
-      class="toggle-button"
-    >
-      <i
-        class="bwi bwi-fw"
-        [ngClass]="{
-          'bwi-angle-right': isCollapsed(collectionsGrouping),
-          'bwi-angle-down': !isCollapsed(collectionsGrouping)
-        }"
-        aria-hidden="true"
-      ></i>
-    </button>
-    <h3 class="filter-title">{{ collectionsGrouping.name | i18n }}</h3>
-  </div>
-  <ul id="collection-filters" *ngIf="!isCollapsed(collectionsGrouping)" class="filter-options">
-    <ng-template #recursiveCollections let-collections>
-      <li
-        *ngFor="let c of collections"
-        [ngClass]="{
-          active: c.node.id === activeFilter.selectedCollectionId
-        }"
-        class="filter-option"
-      >
-        <span class="filter-buttons">
-          <button
-            class="toggle-button"
-            *ngIf="c.children.length"
-            (click)="collapse(c.node)"
-            title="{{ 'toggleCollapse' | i18n }}"
-            [attr.aria-expanded]="!isCollapsed(c.node)"
-            [attr.aria-controls]="c.node.name + '_children'"
-          >
-            <i
-              class="bwi bwi-fw"
-              [ngClass]="{
-                'bwi-angle-right': isCollapsed(c.node),
-                'bwi-angle-down': !isCollapsed(c.node)
-              }"
-              aria-hidden="true"
-            ></i>
-          </button>
-          <button class="filter-button" (click)="applyFilter(c.node)">
-            <i
-              *ngIf="c.children.length === 0"
-              class="bwi bwi-collection bwi-fw"
-              aria-hidden="true"
-            ></i
-            >{{ c.node.name }}
-          </button>
-        </span>
-        <ul
-          [id]="c.node.name + '_children'"
-          class="nested-filter-options"
-          *ngIf="c.children.length && !isCollapsed(c.node)"
-        >
-          <ng-container
-            *ngTemplateOutlet="recursiveCollections; context: { $implicit: c.children }"
-          >
-          </ng-container>
-        </ul>
-      </li>
-    </ng-template>
-    <ng-container
-      *ngTemplateOutlet="recursiveCollections; context: { $implicit: nestedCollections }"
-    >
-    </ng-container>
-  </ul>
-</ng-container>

src/app/modules/vault-filter/components/collection-filter.component.ts

@@ -1,9 +0,0 @@
-import { Component } from "@angular/core";
-
-import { CollectionFilterComponent as BaseCollectionFilterComponent } from "jslib-angular/modules/vault-filter/components/collection-filter.component";
-
-@Component({
-  selector: "app-collection-filter",
-  templateUrl: "collection-filter.component.html",
-})
-export class CollectionFilterComponent extends BaseCollectionFilterComponent {}

src/app/modules/vault-filter/components/folder-filter.component.html

@@ -1,84 +0,0 @@
-<ng-container *ngIf="!hide && !activeFilter.selectedOrganizationId">
-  <div class="filter-heading">
-    <button
-      class="toggle-button"
-      (click)="toggleCollapse(foldersGrouping)"
-      [attr.aria-expanded]="!isCollapsed(foldersGrouping)"
-      aria-controls="folder-filters"
-      title="{{ 'toggleCollapse' | i18n }}"
-    >
-      <i
-        class="bwi bwi-fw"
-        aria-hidden="true"
-        [ngClass]="{
-          'bwi-angle-right': isCollapsed(foldersGrouping),
-          'bwi-angle-down': !isCollapsed(foldersGrouping)
-        }"
-      ></i>
-    </button>
-    <h3 class="filter-title">
-      {{ "folders" | i18n }}
-    </h3>
-    <button
-      class="text-muted ml-auto add-button"
-      (click)="addFolder()"
-      appA11yTitle="{{ 'addFolder' | i18n }}"
-    >
-      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
-    </button>
-  </div>
-  <ul id="folder-filters" *ngIf="!isCollapsed(foldersGrouping)" class="filter-options">
-    <ng-template #recursiveFolders let-folders>
-      <li
-        *ngFor="let f of folders"
-        [ngClass]="{
-          active: f.node.id === activeFilter.selectedFolderId && activeFilter.selectedFolder
-        }"
-        class="filter-option"
-      >
-        <span class="filter-buttons">
-          <button
-            *ngIf="f.children.length"
-            title="{{ 'toggleCollapse' | i18n }}"
-            (click)="toggleCollapse(f.node)"
-            [attr.aria-expanded]="!isCollapsed(f.node)"
-            [attr.aria-controls]="f.node.name + '_children'"
-            class="toggle-button"
-          >
-            <i
-              class="bwi bwi-fw"
-              [ngClass]="{
-                'bwi-angle-right': isCollapsed(f.node),
-                'bwi-angle-down': !isCollapsed(f.node)
-              }"
-              aria-hidden="true"
-            ></i>
-          </button>
-          <button class="filter-button" (click)="applyFilter(f.node)">
-            <i *ngIf="f.children.length === 0" class="bwi bwi-fw bwi-folder" aria-hidden="true"></i
-            >{{ f.node.name }}
-          </button>
-          <button
-            class="edit-button"
-            (click)="editFolder(f.node)"
-            appA11yTitle="{{ 'editFolder' | i18n }}"
-            *ngIf="f.node.id"
-          >
-            <i class="bwi bwi-pencil bwi-fw" aria-hidden="true"></i>
-          </button>
-        </span>
-        <ul
-          [id]="f.node.name + '_children'"
-          class="nested-filter-options"
-          *ngIf="f.children.length && !isCollapsed(f.node)"
-        >
-          <ng-container *ngTemplateOutlet="recursiveFolders; context: { $implicit: f.children }">
-          </ng-container>
-        </ul>
-      </li>
-    </ng-template>
-    <ng-container
-      *ngTemplateOutlet="recursiveFolders; context: { $implicit: nestedFolders }"
-    ></ng-container>
-  </ul>
-</ng-container>

src/app/modules/vault-filter/components/folder-filter.component.ts

@@ -1,9 +0,0 @@
-import { Component } from "@angular/core";
-
-import { FolderFilterComponent as BaseFolderFilterComponent } from "jslib-angular/modules/vault-filter/components/folder-filter.component";
-
-@Component({
-  selector: "app-folder-filter",
-  templateUrl: "folder-filter.component.html",
-})
-export class FolderFilterComponent extends BaseFolderFilterComponent {}

src/app/modules/vault-filter/components/organization-filter.component.html

@@ -1,155 +0,0 @@
-<ng-container *ngIf="!hide">
-  <ng-container [ngSwitch]="displayMode">
-    <ng-container *ngSwitchCase="'noOrganizations'">
-      <ul class="filter-options">
-        <li class="filter-option active">
-          <span class="filter-buttons">
-            <button class="filter-button">
-              <i class="bwi bwi-fw bwi-user" aria-hidden="true"></i>
-              {{ "myVault" | i18n }}
-            </button>
-          </span>
-        </li>
-        <li class="filter-option">
-          <span class="filter-buttons">
-            <a href="#" routerLink="/create-organization" class="filter-button">
-              <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
-              {{ "newOrganization" | i18n }}
-            </a>
-          </span>
-        </li>
-      </ul>
-    </ng-container>
-    <ng-container *ngSwitchCase="'personalOwnershipPolicy'">
-      <div class="filter-heading">
-        <button
-          (click)="toggleCollapse()"
-          title="{{ 'toggleCollapse' | i18n }}"
-          class="toggle-button"
-          [attr.aria-expanded]="!isCollapsed"
-          aria-controls="organization-filters"
-        >
-          <i
-            class="bwi bwi-fw"
-            aria-hidden="true"
-            [ngClass]="{
-              'bwi-angle-right': isCollapsed,
-              'bwi-angle-down': !isCollapsed
-            }"
-          ></i>
-        </button>
-        <button
-          class="filter-button"
-          (click)="clearFilter()"
-          [ngClass]="{ active: !hasActiveFilter }"
-        >
-          &nbsp;{{ organizationGrouping.name | i18n }}
-        </button>
-        <a
-          href="#"
-          routerLink="/create-organization"
-          class="text-muted ml-auto create-organization-link"
-          appA11yTitle="{{ 'newOrganization' | i18n }}"
-        >
-          <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
-        </a>
-      </div>
-      <ul id="organization-filters" *ngIf="!isCollapsed" class="filter-options">
-        <li
-          class="filter-option"
-          *ngFor="let organization of organizations"
-          [ngClass]="{ active: organization.id === activeFilter.selectedOrganizationId }"
-        >
-          <span class="filter-buttons">
-            <button class="filter-button" (click)="applyOrganizationFilter(organization)">
-              <i class="bwi bwi-fw bwi-business" aria-hidden="true"></i>
-              {{ organization.name }}
-            </button>
-            <ng-container *ngIf="organization.id === activeFilter.selectedOrganizationId">
-              <button [bitMenuTriggerFor]="orgMenu" class="org-options ml-auto">
-                <i class="bwi bwi-ellipsis-v" aria-hidden="true"></i>
-              </button>
-              <bit-menu class="filter-organization-options" #orgMenu>
-                <app-organization-options [organization]="organization"></app-organization-options>
-              </bit-menu>
-            </ng-container>
-          </span>
-        </li>
-      </ul>
-    </ng-container>
-    <ng-container *ngSwitchCase="'singleOrganizationAndPersonalOwnershipPolicies'">
-      <div class="filter-heading">
-        <button class="filter-button active">
-          <i class="bwi bwi-fw bwi-business" aria-hidden="true"></i>
-          {{ organizations[0].name }}
-        </button>
-      </div>
-    </ng-container>
-    <ng-container *ngSwitchCase="'organizationMember'">
-      <div class="filter-heading">
-        <button
-          class="toggle-button"
-          title="{{ 'toggleCollapse' | i18n }}"
-          (click)="toggleCollapse()"
-          [attr.aria-expanded]="!isCollapsed"
-          aria-controls="organization-filters"
-        >
-          <i
-            class="bwi bwi-fw"
-            aria-hidden="true"
-            [ngClass]="{
-              'bwi-angle-right': isCollapsed,
-              'bwi-angle-down': !isCollapsed
-            }"
-          ></i>
-        </button>
-        <button
-          class="filter-button"
-          (click)="clearFilter()"
-          [ngClass]="{ active: !hasActiveFilter }"
-        >
-          &nbsp;{{ organizationGrouping.name | i18n }}
-        </button>
-        <a
-          href="#"
-          routerLink="/create-organization"
-          class="text-muted ml-auto create-organization-link"
-          appA11yTitle="{{ 'newOrganization' | i18n }}"
-        >
-          <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
-        </a>
-      </div>
-      <ul id="organization-filters" *ngIf="!isCollapsed" class="filter-options">
-        <li class="filter-option" [ngClass]="{ active: activeFilter.myVaultOnly }">
-          <span class="filter-buttons">
-            <button class="filter-button" (click)="applyMyVaultFilter()">
-              <i class="bwi bwi-fw bwi-user" aria-hidden="true"></i>
-              {{ "myVault" | i18n }}
-            </button>
-          </span>
-        </li>
-        <li
-          class="filter-option"
-          *ngFor="let organization of organizations"
-          [ngClass]="{ active: organization.id === activeFilter.selectedOrganizationId }"
-        >
-          <span class="filter-buttons">
-            <button class="filter-button" (click)="applyOrganizationFilter(organization)">
-              <i class="bwi bwi-fw bwi-business" aria-hidden="true"></i>
-              {{ organization.name }}
-            </button>
-            <ng-container>
-              <button [bitMenuTriggerFor]="orgMenu" class="org-options ml-auto">
-                <i class="bwi bwi-ellipsis-v" aria-hidden="true"></i>
-              </button>
-              <bit-menu class="filter-organization-options" #orgMenu>
-                <app-organization-options [organization]="organization"></app-organization-options>
-              </bit-menu>
-            </ng-container>
-          </span>
-        </li>
-      </ul>
-    </ng-container>
-  </ng-container>
-  <hr />
-</ng-container>

src/app/modules/vault-filter/components/organization-filter.component.ts

@@ -1,11 +0,0 @@
-import { Component } from "@angular/core";
-
-import { OrganizationFilterComponent as BaseOrganizationFilterComponent } from "jslib-angular/modules/vault-filter/components/organization-filter.component";
-
-@Component({
-  selector: "app-organization-filter",
-  templateUrl: "organization-filter.component.html",
-})
-export class OrganizationFilterComponent extends BaseOrganizationFilterComponent {
-  displayText = "allVaults";
-}

src/app/modules/vault-filter/components/organization-options.component.html

@@ -1,43 +0,0 @@
-<ng-container *ngIf="!loaded">
-  <i
-    class="bwi bwi-spinner bwi-spin text-muted tw-m-2"
-    title="{{ 'loading' | i18n }}"
-    aria-hidden="true"
-  ></i>
-  <span class="sr-only">{{ "loading" | i18n }}</span>
-</ng-container>
-<div *ngIf="loaded" class="tw-max-w-[300px] tw-min-w-[200px] tw-flex tw-flex-col">
-  <button
-    *ngIf="allowEnrollmentChanges(organization) && !organization.resetPasswordEnrolled"
-    class="dropdown-item"
-    (click)="toggleResetPasswordEnrollment(organization)"
-  >
-    <i class="bwi bwi-fw bwi-key" aria-hidden="true"></i>
-    {{ "enrollPasswordReset" | i18n }}
-  </button>
-  <button
-    *ngIf="allowEnrollmentChanges(organization) && organization.resetPasswordEnrolled"
-    class="dropdown-item"
-    (click)="toggleResetPasswordEnrollment(organization)"
-  >
-    <i class="bwi bwi-fw bwi-undo" aria-hidden="true"></i>
-    {{ "withdrawPasswordReset" | i18n }}
-  </button>
-  <ng-container *ngIf="organization.useSso && organization.identifier">
-    <button
-      *ngIf="organization.ssoBound; else linkSso"
-      class="dropdown-item"
-      (click)="unlinkSso(organization)"
-    >
-      <i class="bwi bwi-fw bwi-chain-broken" aria-hidden="true"></i>
-      {{ "unlinkSso" | i18n }}
-    </button>
-    <ng-template #linkSso>
-      <app-link-sso [organization]="organization"> </app-link-sso>
-    </ng-template>
-  </ng-container>
-  <button class="dropdown-item text-danger" (click)="leave(organization)">
-    <i class="bwi bwi-fw bwi-sign-out" aria-hidden="true"></i>
-    {{ "leave" | i18n }}
-  </button>
-</div>

src/app/modules/vault-filter/components/status-filter.component.html

@@ -1,33 +0,0 @@
-<ng-container *ngIf="show">
-  <ul class="filter-options">
-    <li class="filter-option" [ngClass]="{ active: activeFilter.status === 'all' }">
-      <span class="filter-buttons">
-        <button class="filter-button" (click)="applyFilter('all')">
-          <i class="bwi bwi-fw bwi-filter" aria-hidden="true"></i>&nbsp;{{ "allItems" | i18n }}
-        </button>
-      </span>
-    </li>
-    <li
-      *ngIf="!hideFavorites"
-      class="filter-option"
-      [ngClass]="{ active: activeFilter.status === 'favorites' }"
-    >
-      <span class="filter-buttons">
-        <button class="filter-button" (click)="applyFilter('favorites')">
-          <i class="bwi bwi-fw bwi-star" aria-hidden="true"></i>&nbsp;{{ "favorites" | i18n }}
-        </button>
-      </span>
-    </li>
-    <li
-      *ngIf="!hideTrash"
-      class="filter-option"
-      [ngClass]="{ active: activeFilter.status === 'trash' }"
-    >
-      <span class="filter-buttons">
-        <button class="filter-button" (click)="applyFilter('trash')">
-          <i class="bwi bwi-fw bwi-trash" aria-hidden="true"></i>&nbsp;{{ "trash" | i18n }}
-        </button>
-      </span>
-    </li>
-  </ul>
-</ng-container>

src/app/modules/vault-filter/components/status-filter.component.ts

@@ -1,9 +0,0 @@
-import { Component } from "@angular/core";
-
-import { StatusFilterComponent as BaseStatusFilterComponent } from "jslib-angular/modules/vault-filter/components/status-filter.component";
-
-@Component({
-  selector: "app-status-filter",
-  templateUrl: "status-filter.component.html",
-})
-export class StatusFilterComponent extends BaseStatusFilterComponent {}

src/app/modules/vault-filter/components/type-filter.component.html

@@ -1,60 +0,0 @@
-<div class="filter-heading">
-  <button
-    class="toggle-button"
-    [attr.aria-expanded]="!isCollapsed"
-    aria-controls="type-filters"
-    (click)="toggleCollapse()"
-    title="{{ 'toggleCollapse' | i18n }}"
-  >
-    <i
-      class="bwi bwi-fw"
-      aria-hidden="true"
-      [ngClass]="{
-        'bwi-angle-right': isCollapsed,
-        'bwi-angle-down': !isCollapsed
-      }"
-    ></i>
-  </button>
-  <h3>
-    {{ "types" | i18n }}
-  </h3>
-</div>
-<ul id="type-filters" *ngIf="!isCollapsed" class="filter-options">
-  <li
-    class="filter-option"
-    [ngClass]="{ active: activeFilter.cipherType === cipherTypeEnum.Login }"
-  >
-    <span class="filter-buttons">
-      <button class="filter-button" (click)="applyFilter(cipherTypeEnum.Login)">
-        <i class="bwi bwi-fw bwi-globe" aria-hidden="true"></i>{{ "typeLogin" | i18n }}
-      </button>
-    </span>
-  </li>
-  <li class="filter-option" [ngClass]="{ active: activeFilter.cipherType === cipherTypeEnum.Card }">
-    <span class="filter-buttons">
-      <button class="filter-button" (click)="applyFilter(cipherTypeEnum.Card)">
-        <i class="bwi bwi-fw bwi-credit-card" aria-hidden="true"></i>{{ "typeCard" | i18n }}
-      </button>
-    </span>
-  </li>
-  <li
-    class="filter-option"
-    [ngClass]="{ active: activeFilter.cipherType === cipherTypeEnum.Identity }"
-  >
-    <span class="filter-buttons">
-      <button class="filter-button" (click)="applyFilter(cipherTypeEnum.Identity)">
-        <i class="bwi bwi-fw bwi-id-card" aria-hidden="true"></i>{{ "typeIdentity" | i18n }}
-      </button>
-    </span>
-  </li>
-  <li
-    class="filter-option"
-    [ngClass]="{ active: activeFilter.cipherType === cipherTypeEnum.SecureNote }"
-  >
-    <span class="filter-buttons">
-      <button class="filter-button" (click)="applyFilter(cipherTypeEnum.SecureNote)">
-        <i class="bwi bwi-fw bwi-sticky-note" aria-hidden="true"></i>{{ "typeSecureNote" | i18n }}
-      </button>
-    </span>
-  </li>
-</ul>

src/app/modules/vault-filter/components/type-filter.component.ts

@@ -1,9 +0,0 @@
-import { Component } from "@angular/core";
-
-import { TypeFilterComponent as BaseTypeFilterComponent } from "jslib-angular/modules/vault-filter/components/type-filter.component";
-
-@Component({
-  selector: "app-type-filter",
-  templateUrl: "type-filter.component.html",
-})
-export class TypeFilterComponent extends BaseTypeFilterComponent {}

src/app/modules/vault-filter/vault-filter.component.html

@@ -1,80 +0,0 @@
-<div class="card vault-filters">
-  <div class="container loading-spinner" *ngIf="!isLoaded">
-    <i class="bwi bwi-spinner bwi-spin bwi-3x" aria-hidden="true"></i>
-  </div>
-  <div *ngIf="isLoaded">
-    <div class="card-header d-flex">
-      {{ "filters" | i18n }}
-      <a
-        class="ml-auto"
-        href="https://bitwarden.com/help/searching-vault/"
-        target="_blank"
-        rel="noopener"
-        appA11yTitle="{{ 'learnMore' | i18n }}"
-      >
-        <i class="bwi bwi-question-circle" aria-hidden="true"></i>
-      </a>
-    </div>
-    <div class="card-body">
-      <input
-        type="search"
-        placeholder="{{ (searchPlaceholder | i18n) || ('searchVault' | i18n) }}"
-        id="search"
-        class="form-control"
-        [(ngModel)]="searchText"
-        (input)="searchTextChanged()"
-        autocomplete="off"
-        appAutofocus
-      />
-      <app-organization-filter
-        *ngIf="showOrgFilter"
-        [hide]="hideOrganizations"
-        [activeFilter]="activeFilter"
-        [collapsedFilterNodes]="collapsedFilterNodes"
-        [organizations]="organizations"
-        [activePersonalOwnershipPolicy]="activePersonalOwnershipPolicy"
-        [activeSingleOrganizationPolicy]="activeSingleOrganizationPolicy"
-        (onNodeCollapseStateChange)="toggleFilterNodeCollapseState($event)"
-        (onFilterChange)="applyFilter($event)"
-      ></app-organization-filter>
-      <div class="filter">
-        <app-status-filter
-          [hideFavorites]="!showFavorites"
-          [hideTrash]="hideTrash"
-          [activeFilter]="activeFilter"
-          (onFilterChange)="applyFilter($event)"
-        ></app-status-filter>
-      </div>
-      <div class="filter">
-        <app-type-filter
-          [activeFilter]="activeFilter"
-          [collapsedFilterNodes]="collapsedFilterNodes"
-          (onNodeCollapseStateChange)="toggleFilterNodeCollapseState($event)"
-          (onFilterChange)="applyFilter($event)"
-        ></app-type-filter>
-      </div>
-      <div class="filter">
-        <app-folder-filter
-          [hide]="!showFolders"
-          [activeFilter]="activeFilter"
-          [collapsedFilterNodes]="collapsedFilterNodes"
-          [folderNodes]="folders"
-          (onNodeCollapseStateChange)="toggleFilterNodeCollapseState($event)"
-          (onFilterChange)="applyFilter($event)"
-          (onAddFolder)="addFolder()"
-          (onEditFolder)="editFolder($event)"
-        ></app-folder-filter>
-      </div>
-      <div class="filter">
-        <app-collection-filter
-          [hide]="hideCollections"
-          [activeFilter]="activeFilter"
-          [collapsedFilterNodes]="collapsedFilterNodes"
-          [collectionNodes]="collections"
-          (onNodeCollapseStateChange)="toggleFilterNodeCollapseState($event)"
-          (onFilterChange)="applyFilter($event)"
-        ></app-collection-filter>
-      </div>
-    </div>
-  </div>
-</div>

src/app/modules/vault-filter/vault-filter.component.ts

@@ -1,40 +0,0 @@
-import { Component, EventEmitter, Input, Output } from "@angular/core";
-
-import { VaultFilterComponent as BaseVaultFilterComponent } from "jslib-angular/modules/vault-filter/vault-filter.component";
-import { VaultFilterService } from "jslib-angular/modules/vault-filter/vault-filter.service";
-import { Organization } from "jslib-common/models/domain/organization";
-
-@Component({
-  selector: "app-vault-filter",
-  templateUrl: "vault-filter.component.html",
-})
-export class VaultFilterComponent extends BaseVaultFilterComponent {
-  @Input() showOrgFilter = true;
-  @Input() showFolders = true;
-  @Input() showFavorites = true;
-
-  @Output() onSearchTextChanged = new EventEmitter<string>();
-
-  searchPlaceholder: string;
-  searchText = "";
-
-  organization: Organization;
-
-  constructor(vaultFilterService: VaultFilterService) {
-    super(vaultFilterService);
-  }
-
-  searchTextChanged() {
-    this.onSearchTextChanged.emit(this.searchText);
-  }
-
-  // This method exists because the vault component gets its data mixed up during the initial sync on first login. It looks for data before the sync is complete.
-  // It should be removed as soon as doing so makes sense.
-  async reloadOrganizations() {
-    this.organizations = await this.vaultFilterService.buildOrganizations();
-  }
-
-  async initCollections() {
-    return await this.vaultFilterService.buildCollections(this.organization?.id);
-  }
-}

src/app/modules/vault-filter/vault-filter.module.ts

@@ -1,48 +0,0 @@
-import { NgModule } from "@angular/core";
-
-import { VaultFilterService } from "jslib-angular/modules/vault-filter/vault-filter.service";
-import { CipherService } from "jslib-common/abstractions/cipher.service";
-import { CollectionService } from "jslib-common/abstractions/collection.service";
-import { FolderService } from "jslib-common/abstractions/folder.service";
-import { OrganizationService } from "jslib-common/abstractions/organization.service";
-import { PolicyService } from "jslib-common/abstractions/policy.service";
-import { StateService } from "jslib-common/abstractions/state.service";
-
-import { SharedModule } from "../shared.module";
-
-import { CollectionFilterComponent } from "./components/collection-filter.component";
-import { FolderFilterComponent } from "./components/folder-filter.component";
-import { OrganizationFilterComponent } from "./components/organization-filter.component";
-import { OrganizationOptionsComponent } from "./components/organization-options.component";
-import { StatusFilterComponent } from "./components/status-filter.component";
-import { TypeFilterComponent } from "./components/type-filter.component";
-import { VaultFilterComponent } from "./vault-filter.component";
-
-@NgModule({
-  imports: [SharedModule],
-  declarations: [
-    VaultFilterComponent,
-    CollectionFilterComponent,
-    FolderFilterComponent,
-    OrganizationFilterComponent,
-    OrganizationOptionsComponent,
-    StatusFilterComponent,
-    TypeFilterComponent,
-  ],
-  exports: [VaultFilterComponent],
-  providers: [
-    {
-      provide: VaultFilterService,
-      useClass: VaultFilterService,
-      deps: [
-        StateService,
-        OrganizationService,
-        FolderService,
-        CipherService,
-        CollectionService,
-        PolicyService,
-      ],
-    },
-  ],
-})
-export class VaultFilterModule {}

src/app/modules/vault-filter/vault-filter.service.ts

@@ -1,3 +0,0 @@
-import { VaultFilterService as BaseVaultFilterService } from "jslib-angular/modules/vault-filter/vault-filter.service";
-
-export class VaultFilterService extends BaseVaultFilterService {}

src/app/modules/vault/modules/individual-vault/individual-vault-routing.module.ts

@@ -1,16 +0,0 @@
-import { NgModule } from "@angular/core";
-import { RouterModule, Routes } from "@angular/router";
-
-import { IndividualVaultComponent } from "./individual-vault.component";
-const routes: Routes = [
-  {
-    path: "",
-    component: IndividualVaultComponent,
-    data: { titleId: "vaults" },
-  },
-];
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class IndividualVaultRoutingModule {}

src/app/modules/vault/modules/individual-vault/individual-vault.module.ts

@@ -1,13 +0,0 @@
-import { NgModule } from "@angular/core";
-
-import { VaultModule } from "../../vault.module";
-
-import { IndividualVaultRoutingModule } from "./individual-vault-routing.module";
-import { IndividualVaultComponent } from "./individual-vault.component";
-
-@NgModule({
-  imports: [VaultModule, IndividualVaultRoutingModule],
-  declarations: [IndividualVaultComponent],
-  exports: [IndividualVaultComponent],
-})
-export class IndividualVaultModule {}

src/app/modules/vault/modules/organization-badge/organization-badge.module.ts

@@ -1,12 +0,0 @@
-import { NgModule } from "@angular/core";
-
-import { SharedModule } from "../../../shared.module";
-
-import { OrganizationNameBadgeComponent } from "./organization-name-badge.component";
-
-@NgModule({
-  imports: [SharedModule],
-  declarations: [OrganizationNameBadgeComponent],
-  exports: [OrganizationNameBadgeComponent],
-})
-export class OrganizationBadgeModule {}

src/app/modules/vault/modules/organization-badge/organization-name-badge.component.html

@@ -1,9 +0,0 @@
-<button
-  bit-badge
-  [style.color]="textColor"
-  [style.background-color]="color"
-  appA11yTitle="{{ organizationName }}"
-  (click)="emitOnOrganizationClicked()"
->
-  {{ organizationName | ellipsis: 13 }}
-</button>

src/app/modules/vault/modules/organization-badge/organization-name-badge.component.ts

@@ -1,59 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
-
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-
-@Component({
-  selector: "app-org-badge",
-  templateUrl: "organization-name-badge.component.html",
-})
-export class OrganizationNameBadgeComponent implements OnInit {
-  @Input() organizationName: string;
-  @Input() profileName: string;
-
-  @Output() onOrganizationClicked = new EventEmitter<string>();
-
-  color: string;
-  textColor: string;
-
-  constructor(private i18nService: I18nService) {}
-
-  ngOnInit(): void {
-    if (this.organizationName == null || this.organizationName === "") {
-      this.organizationName = this.i18nService.t("me");
-      this.color = this.stringToColor(this.profileName.toUpperCase());
-    }
-    if (this.color == null) {
-      this.color = this.stringToColor(this.organizationName.toUpperCase());
-    }
-    this.textColor = this.pickTextColorBasedOnBgColor();
-  }
-
-  // This value currently isn't stored anywhere, only calculated in the app-avatar component
-  // Once we are allowing org colors to be changed and saved, change this out
-  private stringToColor(str: string): string {
-    let hash = 0;
-    for (let i = 0; i < str.length; i++) {
-      hash = str.charCodeAt(i) + ((hash << 5) - hash);
-    }
-    let color = "#";
-    for (let i = 0; i < 3; i++) {
-      const value = (hash >> (i * 8)) & 0xff;
-      color += ("00" + value.toString(16)).substr(-2);
-    }
-    return color;
-  }
-
-  // There are a few ways to calculate text color for contrast, this one seems to fit accessibility guidelines best.
-  // https://stackoverflow.com/a/3943023/6869691
-  private pickTextColorBasedOnBgColor() {
-    const color = this.color.charAt(0) === "#" ? this.color.substring(1, 7) : this.color;
-    const r = parseInt(color.substring(0, 2), 16); // hexToR
-    const g = parseInt(color.substring(2, 4), 16); // hexToG
-    const b = parseInt(color.substring(4, 6), 16); // hexToB
-    return r * 0.299 + g * 0.587 + b * 0.114 > 186 ? "black !important" : "white !important";
-  }
-
-  emitOnOrganizationClicked() {
-    this.onOrganizationClicked.emit();
-  }
-}

src/app/modules/vault/modules/organization-vault/organization-vault-routing.module.ts

@@ -1,16 +0,0 @@
-import { NgModule } from "@angular/core";
-import { RouterModule, Routes } from "@angular/router";
-
-import { OrganizationVaultComponent } from "./organization-vault.component";
-const routes: Routes = [
-  {
-    path: "",
-    component: OrganizationVaultComponent,
-    data: { titleId: "vaults" },
-  },
-];
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class OrganizationVaultRoutingModule {}

src/app/modules/vault/modules/organization-vault/organization-vault.module.ts

@@ -1,13 +0,0 @@
-import { NgModule } from "@angular/core";
-
-import { VaultModule } from "../../vault.module";
-
-import { OrganizationVaultRoutingModule } from "./organization-vault-routing.module";
-import { OrganizationVaultComponent } from "./organization-vault.component";
-
-@NgModule({
-  imports: [VaultModule, OrganizationVaultRoutingModule],
-  declarations: [OrganizationVaultComponent],
-  exports: [OrganizationVaultComponent],
-})
-export class OrganizationVaultModule {}

src/app/modules/vault/vault.module.ts

@@ -1,19 +0,0 @@
-import { NgModule } from "@angular/core";
-
-import { LooseComponentsModule } from "../loose-components.module";
-import { SharedModule } from "../shared.module";
-import { VaultFilterModule } from "../vault-filter/vault-filter.module";
-
-import { VaultService } from "./vault.service";
-
-@NgModule({
-  imports: [SharedModule, VaultFilterModule, LooseComponentsModule],
-  exports: [SharedModule, VaultFilterModule, LooseComponentsModule],
-  providers: [
-    {
-      provide: VaultService,
-      useClass: VaultService,
-    },
-  ],
-})
-export class VaultModule {}

src/app/modules/vault/vault.service.ts

@@ -1,29 +0,0 @@
-import { VaultFilter } from "jslib-angular/modules/vault-filter/models/vault-filter.model";
-
-export class VaultService {
-  calculateSearchBarLocalizationString(vaultFilter: VaultFilter): string {
-    if (vaultFilter.status === "favorites") {
-      return "searchFavorites";
-    }
-    if (vaultFilter.status === "trash") {
-      return "searchTrash";
-    }
-    if (vaultFilter.cipherType != null) {
-      return "searchType";
-    }
-    if (vaultFilter.selectedFolderId != null && vaultFilter.selectedFolderId != "none") {
-      return "searchFolder";
-    }
-    if (vaultFilter.selectedCollectionId != null) {
-      return "searchCollection";
-    }
-    if (vaultFilter.selectedOrganizationId != null) {
-      return "searchOrganization";
-    }
-    if (vaultFilter.myVaultOnly) {
-      return "searchMyVault";
-    }
-
-    return "searchVault";
-  }
-}

src/app/organizations/layouts/organization-layout.component.html

@@ -1,37 +0,0 @@
-<div class="org-nav" *ngIf="organization">
-  <div class="container d-flex">
-    <div class="d-flex flex-column">
-      <app-organization-switcher
-        class="my-auto pl-1"
-        [activeOrganization]="organization"
-      ></app-organization-switcher>
-      <ul class="nav nav-tabs">
-        <li class="nav-item">
-          <a class="nav-link" routerLink="vault" routerLinkActive="active">
-            <i class="bwi bwi-lock" aria-hidden="true"></i>
-            {{ "vault" | i18n }}
-          </a>
-        </li>
-        <li class="nav-item" *ngIf="showManageTab">
-          <a class="nav-link" [routerLink]="manageRoute" routerLinkActive="active">
-            <i class="bwi bwi-sliders" aria-hidden="true"></i>
-            {{ "manage" | i18n }}
-          </a>
-        </li>
-        <li class="nav-item" *ngIf="showToolsTab">
-          <a class="nav-link" [routerLink]="toolsRoute" routerLinkActive="active">
-            <i class="bwi bwi-wrench" aria-hidden="true"></i>
-            {{ "tools" | i18n }}
-          </a>
-        </li>
-        <li class="nav-item" *ngIf="showSettingsTab">
-          <a class="nav-link" routerLink="settings" routerLinkActive="active">
-            <i class="bwi bwi-cogs" aria-hidden="true"></i>
-            {{ "settings" | i18n }}
-          </a>
-        </li>
-      </ul>
-    </div>
-  </div>
-</div>
-<router-outlet></router-outlet>

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

@@ -1,222 +0,0 @@
-import { NgModule } from "@angular/core";
-import { RouterModule, Routes } from "@angular/router";
-
-import { AuthGuard } from "jslib-angular/guards/auth.guard";
-import { Permissions } from "jslib-common/enums/permissions";
-
-import { PermissionsGuard } from "./guards/permissions.guard";
-import { OrganizationLayoutComponent } from "./layouts/organization-layout.component";
-import { CollectionsComponent } from "./manage/collections.component";
-import { EventsComponent } from "./manage/events.component";
-import { GroupsComponent } from "./manage/groups.component";
-import { ManageComponent } from "./manage/manage.component";
-import { PeopleComponent } from "./manage/people.component";
-import { PoliciesComponent } from "./manage/policies.component";
-import { NavigationPermissionsService } from "./services/navigation-permissions.service";
-import { AccountComponent } from "./settings/account.component";
-import { OrganizationBillingComponent } from "./settings/organization-billing.component";
-import { OrganizationSubscriptionComponent } from "./settings/organization-subscription.component";
-import { SettingsComponent } from "./settings/settings.component";
-import { TwoFactorSetupComponent } from "./settings/two-factor-setup.component";
-import { ExportComponent } from "./tools/export.component";
-import { ExposedPasswordsReportComponent } from "./tools/exposed-passwords-report.component";
-import { ImportComponent } from "./tools/import.component";
-import { InactiveTwoFactorReportComponent } from "./tools/inactive-two-factor-report.component";
-import { ReusedPasswordsReportComponent } from "./tools/reused-passwords-report.component";
-import { ToolsComponent } from "./tools/tools.component";
-import { UnsecuredWebsitesReportComponent } from "./tools/unsecured-websites-report.component";
-import { WeakPasswordsReportComponent } from "./tools/weak-passwords-report.component";
-
-const routes: Routes = [
-  {
-    path: ":organizationId",
-    component: OrganizationLayoutComponent,
-    canActivate: [AuthGuard, PermissionsGuard],
-    data: {
-      permissions: NavigationPermissionsService.getPermissions("admin"),
-    },
-    children: [
-      { path: "", pathMatch: "full", redirectTo: "vault" },
-      {
-        path: "vault",
-        loadChildren: async () =>
-          (await import("../modules/vault/modules/organization-vault/organization-vault.module"))
-            .OrganizationVaultModule,
-      },
-      {
-        path: "tools",
-        component: ToolsComponent,
-        canActivate: [PermissionsGuard],
-        data: { permissions: NavigationPermissionsService.getPermissions("tools") },
-        children: [
-          {
-            path: "",
-            pathMatch: "full",
-            redirectTo: "import",
-          },
-          {
-            path: "import",
-            component: ImportComponent,
-            canActivate: [PermissionsGuard],
-            data: {
-              titleId: "importData",
-              permissions: [Permissions.AccessImportExport],
-            },
-          },
-          {
-            path: "export",
-            component: ExportComponent,
-            canActivate: [PermissionsGuard],
-            data: {
-              titleId: "exportVault",
-              permissions: [Permissions.AccessImportExport],
-            },
-          },
-          {
-            path: "exposed-passwords-report",
-            component: ExposedPasswordsReportComponent,
-            canActivate: [PermissionsGuard],
-            data: {
-              titleId: "exposedPasswordsReport",
-              permissions: [Permissions.AccessReports],
-            },
-          },
-          {
-            path: "inactive-two-factor-report",
-            component: InactiveTwoFactorReportComponent,
-            canActivate: [PermissionsGuard],
-            data: {
-              titleId: "inactive2faReport",
-              permissions: [Permissions.AccessReports],
-            },
-          },
-          {
-            path: "reused-passwords-report",
-            component: ReusedPasswordsReportComponent,
-            canActivate: [PermissionsGuard],
-            data: {
-              titleId: "reusedPasswordsReport",
-              permissions: [Permissions.AccessReports],
-            },
-          },
-          {
-            path: "unsecured-websites-report",
-            component: UnsecuredWebsitesReportComponent,
-            canActivate: [PermissionsGuard],
-            data: {
-              titleId: "unsecuredWebsitesReport",
-              permissions: [Permissions.AccessReports],
-            },
-          },
-          {
-            path: "weak-passwords-report",
-            component: WeakPasswordsReportComponent,
-            canActivate: [PermissionsGuard],
-            data: {
-              titleId: "weakPasswordsReport",
-              permissions: [Permissions.AccessReports],
-            },
-          },
-        ],
-      },
-      {
-        path: "manage",
-        component: ManageComponent,
-        canActivate: [PermissionsGuard],
-        data: {
-          permissions: NavigationPermissionsService.getPermissions("manage"),
-        },
-        children: [
-          {
-            path: "",
-            pathMatch: "full",
-            redirectTo: "people",
-          },
-          {
-            path: "collections",
-            component: CollectionsComponent,
-            canActivate: [PermissionsGuard],
-            data: {
-              titleId: "collections",
-              permissions: [
-                Permissions.CreateNewCollections,
-                Permissions.EditAnyCollection,
-                Permissions.DeleteAnyCollection,
-                Permissions.EditAssignedCollections,
-                Permissions.DeleteAssignedCollections,
-              ],
-            },
-          },
-          {
-            path: "events",
-            component: EventsComponent,
-            canActivate: [PermissionsGuard],
-            data: {
-              titleId: "eventLogs",
-              permissions: [Permissions.AccessEventLogs],
-            },
-          },
-          {
-            path: "groups",
-            component: GroupsComponent,
-            canActivate: [PermissionsGuard],
-            data: {
-              titleId: "groups",
-              permissions: [Permissions.ManageGroups],
-            },
-          },
-          {
-            path: "people",
-            component: PeopleComponent,
-            canActivate: [PermissionsGuard],
-            data: {
-              titleId: "people",
-              permissions: [Permissions.ManageUsers, Permissions.ManageUsersPassword],
-            },
-          },
-          {
-            path: "policies",
-            component: PoliciesComponent,
-            canActivate: [PermissionsGuard],
-            data: {
-              titleId: "policies",
-              permissions: [Permissions.ManagePolicies],
-            },
-          },
-        ],
-      },
-      {
-        path: "settings",
-        component: SettingsComponent,
-        canActivate: [PermissionsGuard],
-        data: { permissions: NavigationPermissionsService.getPermissions("settings") },
-        children: [
-          { path: "", pathMatch: "full", redirectTo: "account" },
-          { path: "account", component: AccountComponent, data: { titleId: "myOrganization" } },
-          {
-            path: "two-factor",
-            component: TwoFactorSetupComponent,
-            data: { titleId: "twoStepLogin" },
-          },
-          {
-            path: "billing",
-            component: OrganizationBillingComponent,
-            canActivate: [PermissionsGuard],
-            data: { titleId: "billing", permissions: [Permissions.ManageBilling] },
-          },
-          {
-            path: "subscription",
-            component: OrganizationSubscriptionComponent,
-            data: { titleId: "subscription" },
-          },
-        ],
-      },
-    ],
-  },
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class OrganizationsRoutingModule {}

src/app/organizations/services/navigation-permissions.service.ts

@@ -1,48 +0,0 @@
-import { Permissions } from "jslib-common/enums/permissions";
-import { Organization } from "jslib-common/models/domain/organization";
-
-const permissions = {
-  manage: [
-    Permissions.CreateNewCollections,
-    Permissions.EditAnyCollection,
-    Permissions.DeleteAnyCollection,
-    Permissions.EditAssignedCollections,
-    Permissions.DeleteAssignedCollections,
-    Permissions.AccessEventLogs,
-    Permissions.ManageGroups,
-    Permissions.ManageUsers,
-    Permissions.ManagePolicies,
-  ],
-  tools: [Permissions.AccessImportExport, Permissions.AccessReports],
-  settings: [Permissions.ManageOrganization],
-};
-
-export class NavigationPermissionsService {
-  static getPermissions(route: keyof typeof permissions | "admin") {
-    if (route === "admin") {
-      return Object.values(permissions).reduce((previous, current) => previous.concat(current), []);
-    }
-
-    return permissions[route];
-  }
-
-  static canAccessAdmin(organization: Organization): boolean {
-    return (
-      this.canAccessTools(organization) ||
-      this.canAccessSettings(organization) ||
-      this.canAccessManage(organization)
-    );
-  }
-
-  static canAccessTools(organization: Organization): boolean {
-    return organization.hasAnyPermission(NavigationPermissionsService.getPermissions("tools"));
-  }
-
-  static canAccessSettings(organization: Organization): boolean {
-    return organization.hasAnyPermission(NavigationPermissionsService.getPermissions("settings"));
-  }
-
-  static canAccessManage(organization: Organization): boolean {
-    return organization.hasAnyPermission(NavigationPermissionsService.getPermissions("manage"));
-  }
-}

src/app/organizations/settings/account.component.html

@@ -37,7 +37,7 @@
           type="text"
           name="BillingEmail"
           [(ngModel)]="org.billingEmail"
-          [disabled]="selfHosted || !canManageBilling"
+          [disabled]="selfHosted"
         />
       </div>
       <div class="form-group">
@@ -48,7 +48,7 @@
           type="text"
           name="BusinessName"
           [(ngModel)]="org.businessName"
-          [disabled]="selfHosted || !canManageBilling"
+          [disabled]="selfHosted"
         />
       </div>
       <div class="form-group">

src/app/organizations/settings/account.component.ts

@@ -6,7 +6,6 @@ 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 { OrganizationService } from "jslib-common/abstractions/organization.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { SyncService } from "jslib-common/abstractions/sync.service";
 import { OrganizationKeysRequest } from "jslib-common/models/request/organizationKeysRequest";
@@ -35,7 +34,6 @@ export class AccountComponent {
   @ViewChild(TaxInfoComponent) taxInfo: TaxInfoComponent;
 
   selfHosted = false;
-  canManageBilling = true;
   loading = true;
   canUseApi = false;
   org: OrganizationResponse;
@@ -53,18 +51,13 @@ export class AccountComponent {
     private platformUtilsService: PlatformUtilsService,
     private cryptoService: CryptoService,
     private logService: LogService,
-    private router: Router,
+    private router: Router
-    private organizationService: OrganizationService
   ) {}
 
   async ngOnInit() {
     this.selfHosted = this.platformUtilsService.isSelfHost();
-
     this.route.parent.parent.params.subscribe(async (params) => {
       this.organizationId = params.organizationId;
-      this.canManageBilling = (
-        await this.organizationService.get(this.organizationId)
-      ).canManageBilling;
       try {
         this.org = await this.apiService.getOrganization(this.organizationId);
         this.canUseApi = this.org.useApi;

src/app/organizations/settings/billing-sync-api-key.component.html

@@ -1,117 +0,0 @@
-<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="billingSyncApiKeyTitle">
-  <div class="modal-dialog modal-dialog-scrollable" role="document">
-    <form
-      class="modal-content"
-      #form
-      (ngSubmit)="submit()"
-      [appApiAction]="formPromise"
-      ngNativeValidate
-    >
-      <div class="modal-header">
-        <h2 class="modal-title" id="billingSyncApiKeyTitle">
-          {{ (hasBillingToken ? "viewBillingSyncToken" : "generateBillingSyncToken") | 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">
-        <app-user-verification
-          [(ngModel)]="masterPassword"
-          ngDefaultControl
-          name="secret"
-          *ngIf="!clientSecret"
-        >
-        </app-user-verification>
-        <ng-container *ngIf="clientSecret && showRotateScreen">
-          <p>{{ "rotateBillingSyncTokenTitle" | i18n }}</p>
-          <app-callout type="warning">
-            {{ "rotateBillingSyncTokenWarning" | i18n }}
-          </app-callout>
-        </ng-container>
-
-        <div *ngIf="clientSecret && !showRotateScreen">
-          <p>{{ "copyPasteBillingSync" | i18n }}</p>
-          <label for="clientSecret">Billing Sync Key</label>
-          <div class="input-group">
-            <input
-              id="clientSecret"
-              class="form-control text-monospace"
-              type="text"
-              [(ngModel)]="clientSecret"
-              name="clientSecret"
-              disabled
-            />
-            <div class="input-group-append">
-              <button
-                type="button"
-                class="btn btn-outline-secondary"
-                (click)="copy()"
-                [appA11yTitle]="'copy' | i18n"
-              >
-                <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-              </button>
-            </div>
-          </div>
-          <div class="small text-muted mt-2" *ngIf="showLastSyncText">
-            <b class="font-weight-semibold">{{ "lastSync" | i18n }}:</b>
-            {{ lastSyncDate | date: "medium" }}
-          </div>
-          <div class="small text-danger mt-2" *ngIf="showAwaitingSyncText">
-            <i class="bwi bwi-error"></i>
-            {{
-              (daysBetween === 1 ? "awaitingSyncSingular" : "awaitingSyncPlural")
-                | i18n: daysBetween
-            }}
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button
-          type="submit"
-          class="btn btn-primary btn-submit"
-          [disabled]="form.loading"
-          *ngIf="!clientSecret || showRotateScreen"
-        >
-          <i
-            class="bwi bwi-spinner bwi-spin"
-            title="{{ 'loading' | i18n }}"
-            *ngIf="form.loading"
-          ></i>
-          <span>
-            {{ submitButtonText }}
-          </span>
-        </button>
-        <button
-          type="button"
-          class="btn btn-outline-secondary"
-          data-dismiss="modal"
-          *ngIf="!showRotateScreen"
-        >
-          {{ "close" | i18n }}
-        </button>
-        <button
-          type="button"
-          class="btn btn-outline-secondary"
-          *ngIf="showRotateScreen"
-          (click)="cancelRotate()"
-        >
-          {{ "cancel" | i18n }}
-        </button>
-        <button
-          type="button"
-          class="btn btn-outline-secondary"
-          *ngIf="clientSecret && !showRotateScreen"
-          (click)="rotateToken()"
-        >
-          {{ "rotateToken" | i18n }}
-        </button>
-      </div>
-    </form>
-  </div>
-</div>

src/app/organizations/settings/billing-sync-api-key.component.ts

@@ -1,108 +0,0 @@
-import { Component } from "@angular/core";
-
-import { ApiService } from "jslib-common/abstractions/api.service";
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-import { UserVerificationService } from "jslib-common/abstractions/userVerification.service";
-import { OrganizationApiKeyType } from "jslib-common/enums/organizationApiKeyType";
-import { OrganizationApiKeyRequest } from "jslib-common/models/request/organizationApiKeyRequest";
-import { ApiKeyResponse } from "jslib-common/models/response/apiKeyResponse";
-import { Verification } from "jslib-common/types/verification";
-
-@Component({
-  selector: "app-billing-sync-api-key",
-  templateUrl: "billing-sync-api-key.component.html",
-})
-export class BillingSyncApiKeyComponent {
-  organizationId: string;
-  hasBillingToken: boolean;
-
-  showRotateScreen: boolean;
-  masterPassword: Verification;
-  formPromise: Promise<ApiKeyResponse>;
-  clientSecret?: string;
-  keyRevisionDate?: Date;
-  lastSyncDate?: Date = null;
-
-  constructor(
-    private userVerificationService: UserVerificationService,
-    private apiService: ApiService,
-    private platformUtilsService: PlatformUtilsService,
-    private i18nService: I18nService
-  ) {}
-
-  copy() {
-    this.platformUtilsService.copyToClipboard(this.clientSecret);
-  }
-
-  async submit() {
-    if (this.showRotateScreen) {
-      this.formPromise = this.userVerificationService
-        .buildRequest(this.masterPassword, OrganizationApiKeyRequest)
-        .then((request) => {
-          request.type = OrganizationApiKeyType.BillingSync;
-          return this.apiService.postOrganizationRotateApiKey(this.organizationId, request);
-        });
-      const response = await this.formPromise;
-      await this.load(response);
-      this.showRotateScreen = false;
-      this.platformUtilsService.showToast(
-        "success",
-        null,
-        this.i18nService.t("billingSyncApiKeyRotated")
-      );
-    } else {
-      this.formPromise = this.userVerificationService
-        .buildRequest(this.masterPassword, OrganizationApiKeyRequest)
-        .then((request) => {
-          request.type = OrganizationApiKeyType.BillingSync;
-          return this.apiService.postOrganizationApiKey(this.organizationId, request);
-        });
-      const response = await this.formPromise;
-      await this.load(response);
-    }
-  }
-
-  async load(response: ApiKeyResponse) {
-    this.clientSecret = response.apiKey;
-    this.keyRevisionDate = response.revisionDate;
-    this.hasBillingToken = true;
-    const syncStatus = await this.apiService.getSponsorshipSyncStatus(this.organizationId);
-    this.lastSyncDate = syncStatus.lastSyncDate;
-  }
-
-  cancelRotate() {
-    this.showRotateScreen = false;
-  }
-
-  rotateToken() {
-    this.showRotateScreen = true;
-  }
-
-  private dayDiff(date1: Date, date2: Date): number {
-    const diffTime = Math.abs(date2.getTime() - date1.getTime());
-    return Math.round(diffTime / (1000 * 60 * 60 * 24));
-  }
-
-  get submitButtonText(): string {
-    if (this.showRotateScreen) {
-      return this.i18nService.t("rotateToken");
-    }
-
-    return this.i18nService.t(this.hasBillingToken ? "continue" : "generateToken");
-  }
-
-  get showLastSyncText(): boolean {
-    // If the keyRevisionDate is later than the lastSyncDate we need to show
-    // a warning that they need to put the billing sync key in their self hosted install
-    return this.lastSyncDate && this.lastSyncDate > this.keyRevisionDate;
-  }
-
-  get showAwaitingSyncText(): boolean {
-    return this.lastSyncDate && this.lastSyncDate <= this.keyRevisionDate;
-  }
-
-  get daysBetween(): number {
-    return this.dayDiff(this.keyRevisionDate, new Date());
-  }
-}

src/app/organizations/settings/delete-organization.component.html

@@ -6,7 +6,6 @@
       (ngSubmit)="submit()"
       [appApiAction]="formPromise"
       ngNativeValidate
-      *ngIf="loaded"
     >
       <div class="modal-header">
         <h2 class="modal-title" id="deleteOrganizationTitle">{{ "deleteOrganization" | i18n }}</h2>
@@ -20,32 +19,10 @@
         </button>
       </div>
       <div class="modal-body">
-        <app-callout type="warning">{{
+        <p>{{ descriptionKey | i18n }}</p>
-          "deletingOrganizationIsPermanentWarning" | i18n: organizationName
+        <app-callout type="warning">{{ "deleteOrganizationWarning" | i18n }}</app-callout>
-        }}</app-callout>
+        <app-verify-master-password [(ngModel)]="masterPassword" ngDefaultControl name="secret">
-        <p id="organizationDeleteDescription">
+        </app-verify-master-password>
-          <ng-container
-            *ngIf="
-              deleteOrganizationRequestType === 'InvalidFamiliesForEnterprise';
-              else regularDelete
-            "
-          >
-            {{ "orgCreatedSponsorshipInvalid" | i18n }}
-          </ng-container>
-          <ng-template #regularDelete>
-            <ng-container *ngIf="organizationContentSummary.totalItemCount > 0">
-              {{ "deletingOrganizationContentWarning" | i18n: organizationName }}
-              <ul>
-                <li *ngFor="let type of organizationContentSummary.itemCountByType">
-                  {{ type.count }} {{ type.localizationKey | i18n }}
-                </li>
-              </ul>
-              {{ "deletingOrganizationActiveUserAccountsWarning" | i18n }}
-            </ng-container>
-          </ng-template>
-        </p>
-        <app-user-verification [(ngModel)]="masterPassword" ngDefaultControl name="secret">
-        </app-user-verification>
       </div>
       <div class="modal-footer">
         <button type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">

src/app/organizations/settings/delete-organization.component.ts

@@ -1,58 +1,19 @@
-import { Component, EventEmitter, OnInit, Output } from "@angular/core";
+import { Component, EventEmitter, Output } from "@angular/core";
 
 import { ApiService } from "jslib-common/abstractions/api.service";
-import { CipherService } from "jslib-common/abstractions/cipher.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 { UserVerificationService } from "jslib-common/abstractions/userVerification.service";
-import { CipherType } from "jslib-common/enums/cipherType";
-import { Utils } from "jslib-common/misc/utils";
-import { CipherView } from "jslib-common/models/view/cipherView";
 import { Verification } from "jslib-common/types/verification";
 
-class CountBasedLocalizationKey {
-  singular: string;
-  plural: string;
-
-  getKey(count: number) {
-    return count == 1 ? this.singular : this.plural;
-  }
-
-  constructor(singular: string, plural: string) {
-    this.singular = singular;
-    this.plural = plural;
-  }
-}
-
-class OrganizationContentSummaryItem {
-  count: number;
-  get localizationKey(): string {
-    return this.localizationKeyOptions.getKey(this.count);
-  }
-  private localizationKeyOptions: CountBasedLocalizationKey;
-  constructor(count: number, localizationKeyOptions: CountBasedLocalizationKey) {
-    this.count = count;
-    this.localizationKeyOptions = localizationKeyOptions;
-  }
-}
-
-class OrganizationContentSummary {
-  totalItemCount = 0;
-  itemCountByType: OrganizationContentSummaryItem[] = [];
-}
-
 @Component({
   selector: "app-delete-organization",
   templateUrl: "delete-organization.component.html",
 })
-export class DeleteOrganizationComponent implements OnInit {
+export class DeleteOrganizationComponent {
   organizationId: string;
-  loaded: boolean;
+  descriptionKey = "deleteOrganizationDesc";
-  deleteOrganizationRequestType: "InvalidFamiliesForEnterprise" | "RegularDelete" = "RegularDelete";
-  organizationName: string;
-  organizationContentSummary: OrganizationContentSummary = new OrganizationContentSummary();
   @Output() onSuccess: EventEmitter<any> = new EventEmitter();
 
   masterPassword: Verification;
@@ -63,15 +24,9 @@ export class DeleteOrganizationComponent implements OnInit {
     private i18nService: I18nService,
     private platformUtilsService: PlatformUtilsService,
     private userVerificationService: UserVerificationService,
-    private logService: LogService,
+    private logService: LogService
-    private cipherService: CipherService,
-    private organizationService: OrganizationService
   ) {}
 
-  async ngOnInit(): Promise<void> {
-    await this.load();
-  }
-
   async submit() {
     try {
       this.formPromise = this.userVerificationService
@@ -88,44 +43,4 @@ export class DeleteOrganizationComponent implements OnInit {
       this.logService.error(e);
     }
   }
-
-  private async load() {
-    this.organizationName = (await this.organizationService.get(this.organizationId)).name;
-    this.organizationContentSummary = await this.buildOrganizationContentSummary();
-    this.loaded = true;
-  }
-
-  private async buildOrganizationContentSummary(): Promise<OrganizationContentSummary> {
-    const organizationContentSummary = new OrganizationContentSummary();
-    const organizationItems = (
-      await this.cipherService.getAllFromApiForOrganization(this.organizationId)
-    ).filter((item) => item.deletedDate == null);
-
-    if (organizationItems.length < 1) {
-      return organizationContentSummary;
-    }
-
-    organizationContentSummary.totalItemCount = organizationItems.length;
-    for (const cipherType of Utils.iterateEnum(CipherType)) {
-      const count = this.getOrganizationItemCountByType(organizationItems, cipherType);
-      if (count > 0) {
-        organizationContentSummary.itemCountByType.push(
-          new OrganizationContentSummaryItem(
-            count,
-            this.getOrganizationItemLocalizationKeysByType(CipherType[cipherType])
-          )
-        );
-      }
-    }
-
-    return organizationContentSummary;
-  }
-
-  private getOrganizationItemCountByType(items: CipherView[], type: CipherType) {
-    return items.filter((item) => item.type == type).length;
-  }
-
-  private getOrganizationItemLocalizationKeysByType(type: string): CountBasedLocalizationKey {
-    return new CountBasedLocalizationKey(`type${type}`, `type${type}Plural`);
-  }
 }

src/app/organizations/settings/image-subscription-hidden.component.svg

@@ -1,20 +0,0 @@
-<svg width="216" height="231" viewBox="0 0 216 231" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M133.356 85.6618C133.136 85.43 132.871 85.2457 132.577 85.1198C132.283 84.9939 131.968 84.93 131.648 84.9318H87.8482C87.5289 84.93 87.2113 84.9939 86.9175 85.1198C86.6237 85.2457 86.359 85.43 86.14 85.6618C85.9083 85.8808 85.7239 86.1473 85.598 86.4411C85.4721 86.7349 85.4082 87.0506 85.41 87.37V116.57C85.4192 118.793 85.8499 120.994 86.6802 123.056C87.4705 125.091 88.5326 127.011 89.8375 128.761C91.1789 130.515 92.6808 132.137 94.3233 133.612C95.8472 135.01 97.4532 136.318 99.1304 137.528C100.59 138.565 102.123 139.547 103.729 140.474C105.335 141.401 106.469 142.027 107.131 142.354C107.799 142.682 108.339 142.941 108.741 143.113C109.055 143.264 109.4 143.339 109.748 143.332C110.091 143.337 110.431 143.257 110.737 143.102C111.146 142.923 111.679 142.671 112.354 142.343C113.03 142.014 114.179 141.386 115.756 140.463C117.333 139.539 118.884 138.554 120.355 137.517C122.034 136.306 123.642 134.999 125.169 133.601C126.814 132.128 128.316 130.504 129.655 128.75C130.958 126.998 132.021 125.08 132.813 123.045C133.645 120.983 134.075 118.782 134.083 116.559V87.3591C134.085 87.0415 134.021 86.7276 133.895 86.4356C133.769 86.1436 133.586 85.8808 133.356 85.6618ZM127.71 116.836C127.71 127.421 109.748 136.514 109.748 136.514V91.1879H127.71V116.836Z" fill="var(--color-secondary-700)"/>
-  <path d="M24.6216 122.3C24.7144 123.4 25.6819 124.217 26.7825 124.125C27.8832 124.032 28.7002 123.064 28.6074 121.964L24.6216 122.3ZM151.501 45.7445C152.57 45.4679 153.213 44.3768 152.936 43.3074L148.429 25.8809C148.152 24.8115 147.061 24.1688 145.992 24.4454C144.922 24.722 144.28 25.8131 144.556 26.8825L148.563 42.3728L133.073 46.3793C132.003 46.6559 131.361 47.747 131.637 48.8164C131.914 49.8858 133.005 50.5285 134.074 50.2519L151.501 45.7445ZM28.6074 121.964C26.6788 99.0874 34.4658 75.5543 51.9661 58.054L49.1377 55.2256C30.7695 73.5938 22.5982 98.2999 24.6216 122.3L28.6074 121.964ZM51.9661 58.054C78.5404 31.4797 119.036 27.3026 149.985 45.5315L152.015 42.0849C119.534 22.9534 77.0327 27.3306 49.1377 55.2256L51.9661 58.054Z" fill="var(--color-secondary-700)"/>
-  <path d="M67.4747 185.062C66.4089 185.352 65.7801 186.451 66.0701 187.517L70.797 204.885C71.0871 205.951 72.1862 206.58 73.252 206.29C74.3179 205.999 74.9467 204.9 74.6567 203.834L70.455 188.396L85.8934 184.194C86.9592 183.904 87.5881 182.805 87.298 181.739C87.008 180.674 85.9088 180.045 84.843 180.335L67.4747 185.062ZM192.478 100.283C192.286 99.1952 191.248 98.4697 190.16 98.6625C189.072 98.8552 188.347 99.8931 188.54 100.981L192.478 100.283ZM166.138 172.225C139.813 198.55 99.8271 202.897 68.9932 185.255L67.0068 188.727C99.3669 207.242 141.333 202.687 168.966 175.054L166.138 172.225ZM188.54 100.981C192.985 126.07 185.516 152.847 166.138 172.225L168.966 175.054C189.307 154.713 197.142 126.603 192.478 100.283L188.54 100.981Z" fill="var(--color-secondary-700)"/>
-  <path d="M37.726 108.132C39.283 92.1931 46.1655 76.6765 58.3734 64.4686C75.2893 47.5527 98.5583 40.8618 120.5 44.396" stroke="var(--color-secondary-700)" stroke-width="2" stroke-linecap="round"/>
-  <path d="M180.595 119.132C179.653 136.119 172.693 152.834 159.717 165.811C144.44 181.088 123.982 188.025 104 186.623" stroke="var(--color-secondary-700)" stroke-width="2" stroke-linecap="round"/>
-  <rect x="153.5" y="56.1317" width="49" height="34" rx="2.5" stroke="var(--color-secondary-700)" stroke-width="3"/>
-  <path d="M153.5 63.6317V63.6317C153.5 66.9454 156.186 69.6317 159.5 69.6317H172.509M202.5 63.6317V63.6317C202.5 66.9454 199.814 69.6317 196.5 69.6317H183.491" stroke="var(--color-secondary-700)" stroke-width="3"/>
-  <mask id="path-8-inside-1_1000_26057" fill="white">
-    <rect x="172" y="65.6317" width="12" height="9" rx="1.25"/>
-  </mask>
-  <rect x="172" y="65.6317" width="12" height="9" rx="1.25" stroke="var(--color-secondary-700)" stroke-width="6" mask="url(#path-8-inside-1_1000_26057)"/>
-  <path d="M187 54.6317C187 54.6317 187 53.6317 187 52.6317C187 51.6317 186.053 50.6317 185.105 50.6317C184.158 50.6317 171.842 50.6317 170.895 50.6317C169.947 50.6317 169 51.6317 169 52.6317C169 53.6317 169 54.6317 169 54.6317" stroke="var(--color-secondary-700)" stroke-width="3"/>
-  <circle cx="48" cy="141" r="10.5" fill="var(--color-background)" stroke="var(--color-secondary-700)" stroke-width="3"/>
-  <path d="M64.9935 168.5H64.9126H64.8318H64.7512H64.6708H64.5905H64.5104H64.4304H64.3506H64.2709H64.1914H64.1121H64.0329H63.9538H63.8749H63.7962H63.7176H63.6392H63.5609H63.4828H63.4048H63.3269H63.2492H63.1717H63.0943H63.017H62.9399H62.8629H62.7861H62.7094H62.6329H62.5565H62.4802H62.4041H62.3281H62.2523H62.1766H62.101H62.0256H61.9503H61.8751H61.8001H61.7252H61.6504H61.5758H61.5013H61.4269H61.3527H61.2786H61.2046H61.1308H61.0571H60.9835H60.91H60.8367H60.7635H60.6904H60.6175H60.5446H60.4719H60.3993H60.3269H60.2545H60.1823H60.1102H60.0382H59.9664H59.8946H59.823H59.7515H59.6801H59.6088H59.5376H59.4666H59.3956H59.3248H59.2541H59.1835H59.113H59.0426H58.9724H58.9022H58.8322H58.7622H58.6924H58.6226H58.553H58.4835H58.4141H58.3448H58.2756H58.2065H58.1375H58.0686H57.9998H57.9311H57.8625H57.794H57.7256H57.6572H57.589H57.5209H57.4529H57.385H57.3172H57.2494H57.1818H57.1142H57.0468H56.9794H56.9121H56.8449H56.7779H56.7108H56.6439H56.5771H56.5103H56.4437H56.3771H56.3106H56.2442H56.1779H56.1117H56.0455H55.9794H55.9134H55.8475H55.7817H55.7159H55.6502H55.5846H55.5191H55.4537H55.3883H55.323H55.2578H55.1926H55.1275H55.0625H54.9976H54.9328H54.868H54.8032H54.7386H54.674H54.6095H54.5451H54.4807H54.4164H54.3521H54.2879H54.2238H54.1598H54.0958H54.0318H53.968H53.9042H53.8404H53.7767H53.7131H53.6495H53.586H53.5226H53.4592H53.3958H53.3325H53.2693H53.2061H53.143H53.0799H53.0169H52.9539H52.891H52.8281H52.7653H52.7025H52.6398H52.5771H52.5145H52.4519H52.3894H52.3269H52.2645H52.202H52.1397H52.0774H52.0151H51.9528H51.8907H51.8285H51.7664H51.7043H51.6423H51.5803H51.5183H51.4564H51.3945H51.3326H51.2708H51.209H51.1472H51.0855H51.0238H50.9621H50.9005H50.8389H50.7773H50.7157H50.6542H50.5927H50.5312H50.4698H50.4084H50.347H50.2856H50.2243H50.1629H50.1016H50.0404H49.9791H49.9178H49.8566H49.7954H49.7342H49.6731H49.6119H49.5508H49.4896H49.4285H49.3674H49.3064H49.2453H49.1842H49.1232H49.0622H49.0011H48.9401H48.8791H48.8181H48.7571H48.6962H48.6352H48.5742H48.5133H48.4523H48.3913H48.3304H48.2694H48.2085H48.1475H48.0866H48.0257H47.9647H47.9038H47.8428H47.7819H47.7209H47.6599H47.599H47.538H47.477H47.416H47.3551H47.2941H47.2331H47.172H47.111H47.05H46.9889H46.9279H46.8668H46.8057H46.7446H46.6835H46.6224H46.5612H46.5001H46.4389H46.3777H46.3165H46.2553H46.194H46.1328H46.0715H46.0102H45.9489H45.8875H45.8261H45.7647H45.7033H45.6418H45.5804H45.5189H45.4573H45.3958H45.3342H45.2726H45.2109H45.1493H45.0876H45.0258H44.9641H44.9023H44.8404H44.7786H44.7166H44.6547H44.5927H44.5307H44.4687H44.4066H44.3445H44.2823H44.2201H44.1578H44.0956H44.0332H43.9709H43.9084H43.846H43.7835H43.7209H43.6583H43.5957H43.533H43.4703H43.4075H43.3447H43.2818H43.2189H43.1559H43.0929H43.0298H42.9666H42.9034H42.8402H42.7769H42.7135H42.6501H42.5867H42.5231H42.4596H42.3959H42.3322H42.2685H42.2046H42.1408H42.0768H42.0128H41.9487H41.8846H41.8204H41.7562H41.6918H41.6274H41.563H41.4985H41.4339H41.3692H41.3045H41.2397H41.1748H41.1098H41.0448H40.9797H40.9146H40.8493H40.784H40.7186H40.6532H40.5876H40.522H40.4563H40.3905H40.3247H40.2588H40.1928H40.1267H40.0605H39.9942H39.9279H39.8615H39.795H39.7284H39.6617H39.5949H39.5281H39.4611H39.3941H39.327H39.2598H39.1925H39.1251H39.0576H38.9901H38.9224H38.8547H38.7868H38.7189H38.6508H38.5827H38.5145H38.4461H38.3777H38.3092H38.2406H38.1719H38.103H38.0341H37.9651H37.896H37.8267H37.7574H37.688H37.6184H37.5488H37.479H37.4092H37.3392H37.2691H37.199H37.1287H37.0583H36.9878H36.9171H36.8464H36.7755H36.7046H36.6335H36.5623H36.491H36.4196H36.3481H36.2764H36.2046H36.1328H36.0607H35.9886H35.9164H35.844H35.7715H35.6989H35.6262H35.5533H35.4803H35.4072H35.334H35.2606H35.1872H35.1135H35.0398H34.9659H34.8919H34.8178H34.7436H34.6692H34.5947H34.52H34.4452H34.3703H34.2952H34.2201H34.1447H34.0693H33.9937H33.9179H33.8421H33.7661H33.6899H33.6136H33.5372H33.4606H33.3839H33.3071H33.2301H33.1529H33.0756H32.9982H32.9206H32.8429H32.765H32.687H32.6088H32.5305H32.452H32.3734H32.2946H32.2157H32.1367H32.0574H31.978H31.8985H31.8188H31.739H31.659H31.5788H31.4985H31.418H31.3374H31.2566H31.1757H31.0946H31.0133H30.9318H30.8503H30.7685H30.6866H30.6045H30.5222H30.4398H30.3572H30.2745H30.1915C30.0489 168.5 29.9693 168.466 29.9164 168.433C29.8553 168.394 29.7779 168.322 29.702 168.192C29.5361 167.906 29.4608 167.48 29.5197 167.111C30.9235 158.322 38.6474 151.574 47.9925 151.574C57.3375 151.574 65.0615 158.322 66.4652 167.111C66.5751 167.799 66.4037 168.054 66.3124 168.149C66.1888 168.278 65.8364 168.5 64.9935 168.5Z" fill="var(--color-background)" stroke="var(--color-secondary-700)" stroke-width="3"/>
-  <circle cx="20" cy="141" r="10.5" fill="var(--color-background)" stroke="var(--color-secondary-700)" stroke-width="3"/>
-  <path d="M36.9935 168.5H36.9126H36.8318H36.7512H36.6708H36.5905H36.5104H36.4304H36.3506H36.2709H36.1914H36.1121H36.0329H35.9538H35.8749H35.7962H35.7176H35.6392H35.5609H35.4828H35.4048H35.3269H35.2492H35.1717H35.0943H35.017H34.9399H34.8629H34.7861H34.7094H34.6329H34.5565H34.4802H34.4041H34.3281H34.2523H34.1766H34.101H34.0256H33.9503H33.8751H33.8001H33.7252H33.6504H33.5758H33.5013H33.4269H33.3527H33.2786H33.2046H33.1308H33.0571H32.9835H32.91H32.8367H32.7635H32.6904H32.6175H32.5446H32.4719H32.3993H32.3269H32.2545H32.1823H32.1102H32.0382H31.9664H31.8946H31.823H31.7515H31.6801H31.6088H31.5376H31.4666H31.3956H31.3248H31.2541H31.1835H31.113H31.0426H30.9724H30.9022H30.8322H30.7622H30.6924H30.6226H30.553H30.4835H30.4141H30.3448H30.2756H30.2065H30.1375H30.0686H29.9998H29.9311H29.8625H29.794H29.7256H29.6572H29.589H29.5209H29.4529H29.385H29.3172H29.2494H29.1818H29.1142H29.0468H28.9794H28.9121H28.8449H28.7779H28.7108H28.6439H28.5771H28.5103H28.4437H28.3771H28.3106H28.2442H28.1779H28.1117H28.0455H27.9794H27.9134H27.8475H27.7817H27.7159H27.6502H27.5846H27.5191H27.4537H27.3883H27.323H27.2578H27.1926H27.1275H27.0625H26.9976H26.9328H26.868H26.8032H26.7386H26.674H26.6095H26.5451H26.4807H26.4164H26.3521H26.2879H26.2238H26.1598H26.0958H26.0318H25.968H25.9042H25.8404H25.7767H25.7131H25.6495H25.586H25.5226H25.4592H25.3958H25.3325H25.2693H25.2061H25.143H25.0799H25.0169H24.9539H24.891H24.8281H24.7653H24.7025H24.6398H24.5771H24.5145H24.4519H24.3894H24.3269H24.2645H24.202H24.1397H24.0774H24.0151H23.9528H23.8907H23.8285H23.7664H23.7043H23.6423H23.5803H23.5183H23.4564H23.3945H23.3326H23.2708H23.209H23.1472H23.0855H23.0238H22.9621H22.9005H22.8389H22.7773H22.7157H22.6542H22.5927H22.5312H22.4698H22.4084H22.347H22.2856H22.2243H22.1629H22.1016H22.0404H21.9791H21.9178H21.8566H21.7954H21.7342H21.6731H21.6119H21.5508H21.4896H21.4285H21.3674H21.3064H21.2453H21.1842H21.1232H21.0622H21.0011H20.9401H20.8791H20.8181H20.7571H20.6962H20.6352H20.5742H20.5133H20.4523H20.3913H20.3304H20.2694H20.2085H20.1475H20.0866H20.0257H19.9647H19.9038H19.8428H19.7819H19.7209H19.6599H19.599H19.538H19.477H19.416H19.3551H19.2941H19.2331H19.172H19.111H19.05H18.9889H18.9279H18.8668H18.8057H18.7446H18.6835H18.6224H18.5612H18.5001H18.4389H18.3777H18.3165H18.2553H18.194H18.1328H18.0715H18.0102H17.9489H17.8875H17.8261H17.7647H17.7033H17.6418H17.5804H17.5189H17.4573H17.3958H17.3342H17.2726H17.2109H17.1493H17.0876H17.0258H16.9641H16.9023H16.8404H16.7786H16.7166H16.6547H16.5927H16.5307H16.4687H16.4066H16.3445H16.2823H16.2201H16.1578H16.0956H16.0332H15.9709H15.9084H15.846H15.7835H15.7209H15.6583H15.5957H15.533H15.4703H15.4075H15.3447H15.2818H15.2189H15.1559H15.0929H15.0298H14.9666H14.9034H14.8402H14.7769H14.7135H14.6501H14.5867H14.5231H14.4596H14.3959H14.3322H14.2685H14.2046H14.1408H14.0768H14.0128H13.9487H13.8846H13.8204H13.7562H13.6918H13.6274H13.563H13.4985H13.4339H13.3692H13.3045H13.2397H13.1748H13.1098H13.0448H12.9797H12.9146H12.8493H12.784H12.7186H12.6532H12.5876H12.522H12.4563H12.3905H12.3247H12.2588H12.1928H12.1267H12.0605H11.9942H11.9279H11.8615H11.795H11.7284H11.6617H11.5949H11.5281H11.4611H11.3941H11.327H11.2598H11.1925H11.1251H11.0576H10.9901H10.9224H10.8547H10.7868H10.7189H10.6508H10.5827H10.5145H10.4461H10.3777H10.3092H10.2406H10.1719H10.103H10.0341H9.9651H9.89597H9.82674H9.75741H9.68798H9.61843H9.54879H9.47904H9.40918H9.33921H9.26914H9.19896H9.12867H9.05826H8.98775H8.91713H8.8464H8.77555H8.70459H8.63351H8.56232H8.49102H8.4196H8.34807H8.27641H8.20464H8.13276H8.06075H7.98862H7.91638H7.84401H7.77152H7.69891H7.62617H7.55332H7.48034H7.40723H7.334H7.26064H7.18716H7.11355H7.03981H6.96594H6.89195H6.81782H6.74356H6.66918H6.59466H6.52H6.44522H6.3703H6.29525H6.22006H6.14474H6.06928H5.99368H5.91795H5.84208H5.76607H5.68992H5.61363H5.5372H5.46062H5.38391H5.30705H5.23005H5.15291H5.07562H4.99819H4.92061H4.84288H4.76501H4.68699H4.60882H4.5305H4.45203H4.37342H4.29465H4.21573H4.13665H4.05743H3.97805H3.89851H3.81882H3.73898H3.65898H3.57882H3.49851H3.41804H3.33741H3.25662H3.17566H3.09455H3.01328H2.93185H2.85025H2.76849H2.68657H2.60448H2.52223H2.43981H2.35722H2.27447H2.19155C2.04893 168.5 1.96927 168.466 1.91645 168.433C1.85532 168.394 1.77792 168.322 1.702 168.192C1.53613 167.906 1.46078 167.48 1.51975 167.111C2.92347 158.322 10.6474 151.574 19.9925 151.574C29.3375 151.574 37.0615 158.322 38.4652 167.111C38.5751 167.799 38.4037 168.054 38.3124 168.149C38.1888 168.278 37.8364 168.5 36.9935 168.5Z" fill="var(--color-background)" stroke="var(--color-secondary-700)" stroke-width="3"/>
-  <circle cx="34" cy="154" r="10.5" fill="var(--color-background)" stroke="var(--color-secondary-700)" stroke-width="3"/>
-  <path d="M50.9935 181.5H50.9126H50.8318H50.7512H50.6708H50.5905H50.5104H50.4304H50.3506H50.2709H50.1914H50.1121H50.0329H49.9538H49.8749H49.7962H49.7176H49.6392H49.5609H49.4828H49.4048H49.3269H49.2492H49.1717H49.0943H49.017H48.9399H48.8629H48.7861H48.7094H48.6329H48.5565H48.4802H48.4041H48.3281H48.2523H48.1766H48.101H48.0256H47.9503H47.8751H47.8001H47.7252H47.6504H47.5758H47.5013H47.4269H47.3527H47.2786H47.2046H47.1308H47.0571H46.9835H46.91H46.8367H46.7635H46.6904H46.6175H46.5446H46.4719H46.3993H46.3269H46.2545H46.1823H46.1102H46.0382H45.9664H45.8946H45.823H45.7515H45.6801H45.6088H45.5376H45.4666H45.3956H45.3248H45.2541H45.1835H45.113H45.0426H44.9724H44.9022H44.8322H44.7622H44.6924H44.6226H44.553H44.4835H44.4141H44.3448H44.2756H44.2065H44.1375H44.0686H43.9998H43.9311H43.8625H43.794H43.7256H43.6572H43.589H43.5209H43.4529H43.385H43.3172H43.2494H43.1818H43.1142H43.0468H42.9794H42.9121H42.8449H42.7779H42.7108H42.6439H42.5771H42.5103H42.4437H42.3771H42.3106H42.2442H42.1779H42.1117H42.0455H41.9794H41.9134H41.8475H41.7817H41.7159H41.6502H41.5846H41.5191H41.4537H41.3883H41.323H41.2578H41.1926H41.1275H41.0625H40.9976H40.9328H40.868H40.8032H40.7386H40.674H40.6095H40.5451H40.4807H40.4164H40.3521H40.2879H40.2238H40.1598H40.0958H40.0318H39.968H39.9042H39.8404H39.7767H39.7131H39.6495H39.586H39.5226H39.4592H39.3958H39.3325H39.2693H39.2061H39.143H39.0799H39.0169H38.9539H38.891H38.8281H38.7653H38.7025H38.6398H38.5771H38.5145H38.4519H38.3894H38.3269H38.2645H38.202H38.1397H38.0774H38.0151H37.9528H37.8907H37.8285H37.7664H37.7043H37.6423H37.5803H37.5183H37.4564H37.3945H37.3326H37.2708H37.209H37.1472H37.0855H37.0238H36.9621H36.9005H36.8389H36.7773H36.7157H36.6542H36.5927H36.5312H36.4698H36.4084H36.347H36.2856H36.2243H36.1629H36.1016H36.0404H35.9791H35.9178H35.8566H35.7954H35.7342H35.6731H35.6119H35.5508H35.4896H35.4285H35.3674H35.3064H35.2453H35.1842H35.1232H35.0622H35.0011H34.9401H34.8791H34.8181H34.7571H34.6962H34.6352H34.5742H34.5133H34.4523H34.3913H34.3304H34.2694H34.2085H34.1475H34.0866H34.0257H33.9647H33.9038H33.8428H33.7819H33.7209H33.6599H33.599H33.538H33.477H33.416H33.3551H33.2941H33.2331H33.172H33.111H33.05H32.9889H32.9279H32.8668H32.8057H32.7446H32.6835H32.6224H32.5612H32.5001H32.4389H32.3777H32.3165H32.2553H32.194H32.1328H32.0715H32.0102H31.9489H31.8875H31.8261H31.7647H31.7033H31.6418H31.5804H31.5189H31.4573H31.3958H31.3342H31.2726H31.2109H31.1493H31.0876H31.0258H30.9641H30.9023H30.8404H30.7786H30.7166H30.6547H30.5927H30.5307H30.4687H30.4066H30.3445H30.2823H30.2201H30.1578H30.0956H30.0332H29.9709H29.9084H29.846H29.7835H29.7209H29.6583H29.5957H29.533H29.4703H29.4075H29.3447H29.2818H29.2189H29.1559H29.0929H29.0298H28.9666H28.9034H28.8402H28.7769H28.7135H28.6501H28.5867H28.5231H28.4596H28.3959H28.3322H28.2685H28.2046H28.1408H28.0768H28.0128H27.9487H27.8846H27.8204H27.7562H27.6918H27.6274H27.563H27.4985H27.4339H27.3692H27.3045H27.2397H27.1748H27.1098H27.0448H26.9797H26.9146H26.8493H26.784H26.7186H26.6532H26.5876H26.522H26.4563H26.3905H26.3247H26.2588H26.1928H26.1267H26.0605H25.9942H25.9279H25.8615H25.795H25.7284H25.6617H25.5949H25.5281H25.4611H25.3941H25.327H25.2598H25.1925H25.1251H25.0576H24.9901H24.9224H24.8547H24.7868H24.7189H24.6508H24.5827H24.5145H24.4461H24.3777H24.3092H24.2406H24.1719H24.103H24.0341H23.9651H23.896H23.8267H23.7574H23.688H23.6184H23.5488H23.479H23.4092H23.3392H23.2691H23.199H23.1287H23.0583H22.9878H22.9171H22.8464H22.7755H22.7046H22.6335H22.5623H22.491H22.4196H22.3481H22.2764H22.2046H22.1328H22.0607H21.9886H21.9164H21.844H21.7715H21.6989H21.6262H21.5533H21.4803H21.4072H21.334H21.2606H21.1872H21.1135H21.0398H20.9659H20.8919H20.8178H20.7436H20.6692H20.5947H20.52H20.4452H20.3703H20.2952H20.2201H20.1447H20.0693H19.9937H19.9179H19.8421H19.7661H19.6899H19.6136H19.5372H19.4606H19.3839H19.3071H19.2301H19.1529H19.0756H18.9982H18.9206H18.8429H18.765H18.687H18.6088H18.5305H18.452H18.3734H18.2946H18.2157H18.1367H18.0574H17.978H17.8985H17.8188H17.739H17.659H17.5788H17.4985H17.418H17.3374H17.2566H17.1757H17.0946H17.0133H16.9318H16.8503H16.7685H16.6866H16.6045H16.5222H16.4398H16.3572H16.2745H16.1915C16.045 181.5 15.9628 181.465 15.9092 181.432C15.8479 181.394 15.772 181.324 15.6978 181.198C15.5354 180.922 15.4617 180.509 15.5193 180.153C16.9196 171.496 24.6325 164.823 33.9925 164.823C43.3524 164.823 51.0654 171.496 52.4657 180.153C52.574 180.823 52.4052 181.064 52.319 181.152C52.1962 181.279 51.8413 181.5 50.9935 181.5Z" fill="var(--color-background)" stroke="var(--color-secondary-700)" stroke-width="3"/>
-</svg>

src/app/organizations/settings/image-subscription-hidden.component.ts

@@ -1,8 +0,0 @@
-import { Component } from "@angular/core";
-
-// Component is used so that the SVG can embed CSS color variables
-@Component({
-  selector: "app-image-org-subscription-hidden",
-  templateUrl: "image-subscription-hidden.component.svg",
-})
-export class ImageSubscriptionHiddenComponent {}

src/app/organizations/settings/organization-billing.component.ts

@@ -5,38 +5,23 @@ 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 { PaymentMethodType } from "jslib-common/enums/paymentMethodType";
+
-import { TransactionType } from "jslib-common/enums/transactionType";
+import { UserBillingComponent } from "../../settings/user-billing.component";
-import { VerifyBankRequest } from "jslib-common/models/request/verifyBankRequest";
-import { BillingResponse } from "jslib-common/models/response/billingResponse";
 
 @Component({
   selector: "app-org-billing",
-  templateUrl: "./organization-billing.component.html",
+  templateUrl: "../../settings/user-billing.component.html",
 })
-export class OrganizationBillingComponent implements OnInit {
+export class OrganizationBillingComponent extends UserBillingComponent implements OnInit {
-  loading = false;
-  firstLoaded = false;
-  showAdjustPayment = false;
-  showAddCredit = false;
-  billing: BillingResponse;
-  paymentMethodType = PaymentMethodType;
-  transactionType = TransactionType;
-  organizationId: string;
-  verifyAmount1: number;
-  verifyAmount2: number;
-
-  verifyBankPromise: Promise<any>;
-
-  // TODO - Make sure to properly split out the billing/invoice and payment method/account during org admin refresh
-
   constructor(
-    private apiService: ApiService,
+    apiService: ApiService,
-    private i18nService: I18nService,
+    i18nService: I18nService,
     private route: ActivatedRoute,
-    private platformUtilsService: PlatformUtilsService,
+    platformUtilsService: PlatformUtilsService,
-    private logService: LogService
+    logService: LogService
-  ) {}
+  ) {
+    super(apiService, i18nService, platformUtilsService, logService);
+  }
 
   async ngOnInit() {
     this.route.parent.parent.params.subscribe(async (params) => {
@@ -45,110 +30,4 @@ export class OrganizationBillingComponent implements OnInit {
       this.firstLoaded = true;
     });
   }
-
-  async load() {
-    if (this.loading) {
-      return;
-    }
-    this.loading = true;
-    if (this.organizationId != null) {
-      this.billing = await this.apiService.getOrganizationBilling(this.organizationId);
-    }
-    this.loading = false;
-  }
-
-  async verifyBank() {
-    if (this.loading) {
-      return;
-    }
-
-    try {
-      const request = new VerifyBankRequest();
-      request.amount1 = this.verifyAmount1;
-      request.amount2 = this.verifyAmount2;
-      this.verifyBankPromise = this.apiService.postOrganizationVerifyBank(
-        this.organizationId,
-        request
-      );
-      await this.verifyBankPromise;
-      this.platformUtilsService.showToast(
-        "success",
-        null,
-        this.i18nService.t("verifiedBankAccount")
-      );
-      this.load();
-    } catch (e) {
-      this.logService.error(e);
-    }
-  }
-
-  addCredit() {
-    if (this.paymentSourceInApp) {
-      this.platformUtilsService.showDialog(
-        this.i18nService.t("cannotPerformInAppPurchase"),
-        this.i18nService.t("addCredit"),
-        null,
-        null,
-        "warning"
-      );
-      return;
-    }
-    this.showAddCredit = true;
-  }
-
-  closeAddCredit(load: boolean) {
-    this.showAddCredit = false;
-    if (load) {
-      this.load();
-    }
-  }
-
-  changePayment() {
-    if (this.paymentSourceInApp) {
-      this.platformUtilsService.showDialog(
-        this.i18nService.t("cannotPerformInAppPurchase"),
-        this.i18nService.t("changePaymentMethod"),
-        null,
-        null,
-        "warning"
-      );
-      return;
-    }
-    this.showAdjustPayment = true;
-  }
-
-  closePayment(load: boolean) {
-    this.showAdjustPayment = false;
-    if (load) {
-      this.load();
-    }
-  }
-
-  get isCreditBalance() {
-    return this.billing == null || this.billing.balance <= 0;
-  }
-
-  get creditOrBalance() {
-    return Math.abs(this.billing != null ? this.billing.balance : 0);
-  }
-
-  get paymentSource() {
-    return this.billing != null ? this.billing.paymentSource : null;
-  }
-
-  get paymentSourceInApp() {
-    return (
-      this.paymentSource != null &&
-      (this.paymentSource.type === PaymentMethodType.AppleInApp ||
-        this.paymentSource.type === PaymentMethodType.GoogleInApp)
-    );
-  }
-
-  get invoices() {
-    return this.billing != null ? this.billing.invoices : null;
-  }
-
-  get transactions() {
-    return this.billing != null ? this.billing.transactions : null;
-  }
 }

src/app/organizations/settings/organization-subscription.component.html

@@ -16,14 +16,6 @@
   <span class="sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 
-<ng-container *ngIf="firstLoaded && !userOrg.canManageBilling">
-  <div class="tw-flex tw-flex-col tw-items-center tw-text-info">
-    <app-image-org-subscription-hidden></app-image-org-subscription-hidden>
-    <p class="tw-font-bold">{{ "billingManagedByProvider" | i18n: this.userOrg.providerName }}</p>
-    <p>{{ "billingContactProviderForAssistance" | i18n }}</p>
-  </div>
-</ng-container>
-
 <ng-container *ngIf="sub">
   <app-callout
     type="warning"
@@ -188,10 +180,10 @@
         ></app-adjust-storage>
       </div>
     </ng-container>
-    <!--Switch to i18n-->
+
-    <h2 class="spaced-header">{{ "selfHostingTitle" | i18n }}</h2>
+    <h2 class="spaced-header">{{ "additionalOptions" | i18n }}</h2>
     <p class="mb-4">
-      {{ "selfHostingEnterpriseOrganizationSectionCopy" | i18n }}
+      {{ "additionalOptionsDesc" | i18n }}
     </p>
     <div class="d-flex">
       <button
@@ -203,27 +195,6 @@
       >
         {{ "downloadLicense" | i18n }}
       </button>
-      <button
-        type="button"
-        class="btn btn-outline-secondary ml-1"
-        (click)="manageBillingSync()"
-        *ngIf="canManageBillingSync"
-      >
-        {{ (hasBillingSyncToken ? "manageBillingSync" : "setUpBillingSync") | i18n }}
-      </button>
-    </div>
-    <div class="mt-3" *ngIf="showDownloadLicense">
-      <app-download-license
-        [organizationId]="organizationId"
-        (onDownloaded)="closeDownloadLicense()"
-        (onCanceled)="closeDownloadLicense()"
-      ></app-download-license>
-    </div>
-    <h2 class="spaced-header">{{ "additionalOptions" | i18n }}</h2>
-    <p class="mb-4">
-      {{ "additionalOptionsDesc" | i18n }}
-    </p>
-    <div class="d-flex">
       <button
         #cancelBtn
         type="button"
@@ -237,6 +208,13 @@
         <span>{{ "cancelSubscription" | i18n }}</span>
       </button>
     </div>
+    <div class="mt-3" *ngIf="showDownloadLicense">
+      <app-download-license
+        [organizationId]="organizationId"
+        (onDownloaded)="closeDownloadLicense()"
+        (onCanceled)="closeDownloadLicense()"
+      ></app-download-license>
+    </div>
   </ng-container>
   <ng-container *ngIf="selfHosted">
     <dl>
@@ -283,31 +261,5 @@
         ></app-update-license>
       </div>
     </div>
-    <div *ngIf="showBillingSyncKey">
-      <h2 class="mt-5">
-        {{ "billingSync" | i18n }}
-      </h2>
-      <p>
-        {{ "billingSyncDesc" | i18n }}
-      </p>
-      <button
-        type="button"
-        class="btn btn-outline-secondary"
-        (click)="manageBillingSyncSelfHosted()"
-      >
-        {{ "manageBillingSync" | i18n }}
-      </button>
-      <small class="form-text text-muted" *ngIf="billingSyncSetUp">
-        {{ "lastSync" | i18n }}:
-        <span *ngIf="userOrg.familySponsorshipLastSyncDate != null">
-          {{ userOrg.familySponsorshipLastSyncDate | date: "medium" }}
-        </span>
-        <span *ngIf="userOrg.familySponsorshipLastSyncDate == null">
-          {{ "never" | i18n | lowercase }}
-        </span>
-      </small>
-    </div>
   </ng-container>
 </ng-container>
-<ng-template #setupBillingSyncTemplate></ng-template>
-<ng-template #rotateBillingSyncKeyTemplate></ng-template>

src/app/organizations/settings/organization-subscription.component.ts

@@ -1,34 +1,21 @@
-import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core";
+import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 
-import { ModalRef } from "jslib-angular/components/modal/modal.ref";
-import { ModalService } from "jslib-angular/services/modal.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 { MessagingService } from "jslib-common/abstractions/messaging.service";
 import { OrganizationService } from "jslib-common/abstractions/organization.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-import { OrganizationApiKeyType } from "jslib-common/enums/organizationApiKeyType";
-import { OrganizationConnectionType } from "jslib-common/enums/organizationConnectionType";
 import { PlanType } from "jslib-common/enums/planType";
-import { BillingSyncConfigApi } from "jslib-common/models/api/billingSyncConfigApi";
 import { Organization } from "jslib-common/models/domain/organization";
-import { OrganizationConnectionResponse } from "jslib-common/models/response/organizationConnectionResponse";
 import { OrganizationSubscriptionResponse } from "jslib-common/models/response/organizationSubscriptionResponse";
 
-import { BillingSyncKeyComponent } from "src/app/settings/billing-sync-key.component";
-
-import { BillingSyncApiKeyComponent } from "./billing-sync-api-key.component";
-
 @Component({
   selector: "app-org-subscription",
   templateUrl: "organization-subscription.component.html",
 })
 export class OrganizationSubscriptionComponent implements OnInit {
-  @ViewChild("setupBillingSyncTemplate", { read: ViewContainerRef, static: true })
-  setupBillingSyncModalRef: ViewContainerRef;
-
   loading = false;
   firstLoaded = false;
   organizationId: string;
@@ -38,24 +25,17 @@ export class OrganizationSubscriptionComponent implements OnInit {
   adjustStorageAdd = true;
   showAdjustStorage = false;
   showUpdateLicense = false;
-  showBillingSyncKey = false;
   showDownloadLicense = false;
   showChangePlan = false;
   sub: OrganizationSubscriptionResponse;
   selfHosted = false;
-  hasBillingSyncToken: boolean;
 
   userOrg: Organization;
-  existingBillingSyncConnection: OrganizationConnectionResponse<BillingSyncConfigApi>;
 
   removeSponsorshipPromise: Promise<any>;
   cancelPromise: Promise<any>;
   reinstatePromise: Promise<any>;
 
-  @ViewChild("rotateBillingSyncKeyTemplate", { read: ViewContainerRef, static: true })
-  billingSyncKeyViewContainerRef: ViewContainerRef;
-  billingSyncKeyRef: [ModalRef, BillingSyncKeyComponent];
-
   constructor(
     private apiService: ApiService,
     private platformUtilsService: PlatformUtilsService,
@@ -63,8 +43,7 @@ export class OrganizationSubscriptionComponent implements OnInit {
     private messagingService: MessagingService,
     private route: ActivatedRoute,
     private organizationService: OrganizationService,
-    private logService: LogService,
+    private logService: LogService
-    private modalService: ModalService
   ) {
     this.selfHosted = platformUtilsService.isSelfHost();
   }
@@ -84,28 +63,7 @@ export class OrganizationSubscriptionComponent implements OnInit {
 
     this.loading = true;
     this.userOrg = await this.organizationService.get(this.organizationId);
-    if (this.userOrg.canManageBilling) {
+    this.sub = await this.apiService.getOrganizationSubscription(this.organizationId);
-      this.sub = await this.apiService.getOrganizationSubscription(this.organizationId);
-    }
-    const apiKeyResponse = await this.apiService.getOrganizationApiKeyInformation(
-      this.organizationId
-    );
-    this.hasBillingSyncToken = apiKeyResponse.data.some(
-      (i) => i.keyType === OrganizationApiKeyType.BillingSync
-    );
-
-    if (this.selfHosted) {
-      this.showBillingSyncKey = await this.apiService.getCloudCommunicationsEnabled();
-    }
-
-    if (this.showBillingSyncKey) {
-      this.existingBillingSyncConnection = await this.apiService.getOrganizationConnection(
-        this.organizationId,
-        OrganizationConnectionType.CloudBillingSync,
-        BillingSyncConfigApi
-      );
-    }
-
     this.loading = false;
   }
 
@@ -176,20 +134,6 @@ export class OrganizationSubscriptionComponent implements OnInit {
     this.showDownloadLicense = !this.showDownloadLicense;
   }
 
-  async manageBillingSync() {
-    const [ref] = await this.modalService.openViewRef(
-      BillingSyncApiKeyComponent,
-      this.setupBillingSyncModalRef,
-      (comp) => {
-        comp.organizationId = this.organizationId;
-        comp.hasBillingToken = this.hasBillingSyncToken;
-      }
-    );
-    ref.onClosed.subscribe(async () => {
-      await this.load();
-    });
-  }
-
   closeDownloadLicense() {
     this.showDownloadLicense = false;
   }
@@ -252,24 +196,6 @@ export class OrganizationSubscriptionComponent implements OnInit {
     }
   }
 
-  async manageBillingSyncSelfHosted() {
-    this.billingSyncKeyRef = await this.modalService.openViewRef(
-      BillingSyncKeyComponent,
-      this.billingSyncKeyViewContainerRef,
-      (comp) => {
-        comp.entityId = this.organizationId;
-        comp.existingConnectionId = this.existingBillingSyncConnection?.id;
-        comp.billingSyncKey = this.existingBillingSyncConnection?.config?.billingSyncKey;
-        comp.setParentConnection = (
-          connection: OrganizationConnectionResponse<BillingSyncConfigApi>
-        ) => {
-          this.existingBillingSyncConnection = connection;
-          this.billingSyncKeyRef[0].close();
-        };
-      }
-    );
-  }
-
   get isExpired() {
     return (
       this.sub != null && this.sub.expiration != null && new Date(this.sub.expiration) < new Date()
@@ -336,16 +262,6 @@ export class OrganizationSubscriptionComponent implements OnInit {
     );
   }
 
-  get canManageBillingSync() {
-    return (
-      !this.selfHosted &&
-      (this.sub.planType === PlanType.EnterpriseAnnually ||
-        this.sub.planType === PlanType.EnterpriseMonthly ||
-        this.sub.planType === PlanType.EnterpriseAnnually2019 ||
-        this.sub.planType === PlanType.EnterpriseMonthly2019)
-    );
-  }
-
   get subscriptionDesc() {
     if (this.sub.planType === PlanType.Free) {
       return this.i18nService.t("subscriptionFreePlan", this.sub.seats.toString());
@@ -373,8 +289,4 @@ export class OrganizationSubscriptionComponent implements OnInit {
   get showChangePlanButton() {
     return this.subscription == null && this.sub.planType === PlanType.Free && !this.showChangePlan;
   }
-
-  get billingSyncSetUp() {
-    return this.existingBillingSyncConnection?.id != null;
-  }
 }