[deps]: Lock file maintenance (#731 )

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 40a85bb875)
2025-12-29 22:53:55 +00:00 · 2025-03-24 17:02:06 +00:00
34 changed files with 1470 additions and 1912 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,15 +9,10 @@ on:
      - "hotfix-rc"
  workflow_dispatch: {}

-permissions:
-  contents: read
-
 jobs:
  cloc:
    name: CLOC
    runs-on: ubuntu-24.04
-    permissions:
-      contents: read
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -34,8 +29,6 @@ jobs:
  setup:
    name: Setup
    runs-on: ubuntu-24.04
-    permissions:
-      contents: read
    outputs:
      package_version: ${{ steps.retrieve-version.outputs.package_version }}
    steps:
@@ -57,8 +50,6 @@ jobs:
      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
      _PKG_FETCH_NODE_VERSION: 18.5.0
      _PKG_FETCH_VERSION: 3.4
-    permissions:
-      contents: read
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -104,6 +95,11 @@ jobs:
      - name: Zip
        run: zip -j dist-cli/bwdc-linux-$_PACKAGE_VERSION.zip dist-cli/linux/bwdc keytar/linux/build/Release/keytar.node

+      - name: Create checksums
+        run: |
+          shasum -a 256 dist-cli/bwdc-linux-$_PACKAGE_VERSION.zip | \
+            cut -d " " -f 1 > dist-cli/bwdc-linux-sha256-$_PACKAGE_VERSION.txt
+
      - name: Version Test
        run: |
          sudo apt-get update
@@ -133,13 +129,18 @@ jobs:
          path: ./dist-cli/bwdc-linux-${{ env._PACKAGE_VERSION }}.zip
          if-no-files-found: error

+      - name: Upload Linux checksum to GitHub
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        with:
+          name: bwdc-linux-sha256-${{ env._PACKAGE_VERSION }}.txt
+          path: ./dist-cli/bwdc-linux-sha256-${{ env._PACKAGE_VERSION }}.txt
+          if-no-files-found: error
+

  macos-cli:
    name: Build Mac CLI
    runs-on: macos-13
    needs: setup
-    permissions:
-      contents: read
    env:
      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
      _PKG_FETCH_NODE_VERSION: 18.5.0
@@ -189,6 +190,11 @@ jobs:
      - name: Zip
        run: zip -j dist-cli/bwdc-macos-$_PACKAGE_VERSION.zip dist-cli/macos/bwdc keytar/macos/build/Release/keytar.node

+      - name: Create checksums
+        run: |
+          shasum -a 256 dist-cli/bwdc-macos-$_PACKAGE_VERSION.zip | \
+            cut -d " " -f 1 > dist-cli/bwdc-macos-sha256-$_PACKAGE_VERSION.txt
+
      - name: Version Test
        run: |
          mkdir -p test/macos
@@ -211,13 +217,17 @@ jobs:
          path: ./dist-cli/bwdc-macos-${{ env._PACKAGE_VERSION }}.zip
          if-no-files-found: error

+      - name: Upload Mac checksum to GitHub
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        with:
+          name: bwdc-macos-sha256-${{ env._PACKAGE_VERSION }}.txt
+          path: ./dist-cli/bwdc-macos-sha256-${{ env._PACKAGE_VERSION }}.txt
+          if-no-files-found: error

  windows-cli:
    name: Build Windows CLI
    runs-on: windows-2022
    needs: setup
-    permissions:
-      contents: read
    env:
      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
      _WIN_PKG_FETCH_VERSION: 18.5.0
@@ -339,6 +349,11 @@ jobs:
            Throw "Version test failed."
          }

+      - name: Create checksums
+        run: |
+          checksum -f="./dist-cli/bwdc-windows-${env:_PACKAGE_VERSION}.zip" `
+            -t sha256 | Out-File ./dist-cli/bwdc-windows-sha256-${env:_PACKAGE_VERSION}.txt
+
      - name: Upload Windows Zip to GitHub
        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
        with:
@@ -346,14 +361,18 @@ jobs:
          path: ./dist-cli/bwdc-windows-${{ env._PACKAGE_VERSION }}.zip
          if-no-files-found: error

+      - name: Upload Windows checksum to GitHub
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        with:
+          name: bwdc-windows-sha256-${{ env._PACKAGE_VERSION }}.txt
+          path: ./dist-cli/bwdc-windows-sha256-${{ env._PACKAGE_VERSION }}.txt
+          if-no-files-found: error
+

  windows-gui:
    name: Build Windows GUI
    runs-on: windows-2022
    needs: setup
-    permissions:
-      contents: read
-      id-token: write
    env:
      NODE_OPTIONS: --max_old_space_size=4096
      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
@@ -385,36 +404,15 @@ jobs:
      - name: Install Node dependencies
        run: npm install

-      - name: Log in to Azure
-        uses: bitwarden/gh-actions/azure-login@main
-        with:
-          subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-          tenant_id: ${{ secrets.AZURE_TENANT_ID }}
-          client_id: ${{ secrets.AZURE_CLIENT_ID }}
-
-      - name: Retrieve secrets
-        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: "bitwarden-ci"
-          secrets: "code-signing-vault-url,
-            code-signing-client-id,
-            code-signing-tenant-id,
-            code-signing-client-secret,
-            code-signing-cert-name"
-
-      - name: Log out from Azure
-        uses: bitwarden/gh-actions/azure-logout@main
-
      - name: Build & Sign
        run: npm run dist:win
        env:
          ELECTRON_BUILDER_SIGN: 1
-          SIGNING_VAULT_URL: ${{ steps.retrieve-secrets.outputs.code-signing-vault-url }}
-          SIGNING_CLIENT_ID: ${{ steps.retrieve-secrets.outputs.code-signing-client-id }}
-          SIGNING_TENANT_ID: ${{ steps.retrieve-secrets.outputs.code-signing-tenant-id }}
-          SIGNING_CLIENT_SECRET: ${{ steps.retrieve-secrets.outputs.code-signing-client-secret }}
-          SIGNING_CERT_NAME: ${{ steps.retrieve-secrets.outputs.code-signing-cert-name }}
+          SIGNING_VAULT_URL: ${{ secrets.SIGNING_VAULT_URL }}
+          SIGNING_CLIENT_ID: ${{ secrets.SIGNING_CLIENT_ID }}
+          SIGNING_TENANT_ID: ${{ secrets.SIGNING_TENANT_ID }}
+          SIGNING_CLIENT_SECRET: ${{ secrets.SIGNING_CLIENT_SECRET }}
+          SIGNING_CERT_NAME: ${{ secrets.SIGNING_CERT_NAME }}

      - name: Upload Portable Executable to GitHub
        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
@@ -449,8 +447,6 @@ jobs:
    name: Build Linux GUI
    runs-on: ubuntu-24.04
    needs: setup
-    permissions:
-      contents: read
    env:
      NODE_OPTIONS: --max_old_space_size=4096
      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
@@ -505,9 +501,6 @@ jobs:
    name: Build MacOS GUI
    runs-on: macos-13
    needs: setup
-    permissions:
-      contents: read
-      id-token: write
    env:
      NODE_OPTIONS: --max_old_space_size=4096
      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
@@ -535,19 +528,10 @@ jobs:
          echo "GitHub ref: $GITHUB_REF"
          echo "GitHub event: $GITHUB_EVENT"

-      - name: Log in to Azure
-        uses: bitwarden/gh-actions/azure-login@main
+      - name: Login to Azure
+        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
        with:
-          subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-          tenant_id: ${{ secrets.AZURE_TENANT_ID }}
-          client_id: ${{ secrets.AZURE_CLIENT_ID }}
-
-      - name: Get Azure Key Vault secrets
-        id: get-kv-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: gh-directory-connector
-          secrets: "KEYCHAIN-PASSWORD,APP-STORE-CONNECT-AUTH-KEY,APP-STORE-CONNECT-TEAM-ISSUER"
+          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}

      - name: Get certificates
        run: |
@@ -562,12 +546,9 @@ jobs:
          az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/macdev-cert |
            jq -r .value | base64 -d > $HOME/certificates/macdev-cert.p12

-      - name: Log out from Azure
-        uses: bitwarden/gh-actions/azure-logout@main
-
      - name: Set up keychain
        env:
-          KEYCHAIN_PASSWORD: ${{ steps.get-kv-secrets.outputs.KEYCHAIN-PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
        run: |
          security create-keychain -p $KEYCHAIN_PASSWORD build.keychain
          security default-keychain -s build.keychain
@@ -601,13 +582,13 @@ jobs:
        run: |
          mkdir ~/private_keys
          cat << EOF > ~/private_keys/AuthKey_UFD296548T.p8
-          ${{ steps.get-kv-secrets.outputs.APP-STORE-CONNECT-AUTH-KEY }}
+          ${{ secrets.APP_STORE_CONNECT_AUTH_KEY }}
          EOF

      - name: Build application
        run: npm run dist:mac
        env:
-          APP_STORE_CONNECT_TEAM_ISSUER: ${{ steps.get-kv-secrets.outputs.APP-STORE-CONNECT-TEAM-ISSUER }}
+          APP_STORE_CONNECT_TEAM_ISSUER: ${{ secrets.APP_STORE_CONNECT_TEAM_ISSUER }}
          APP_STORE_CONNECT_AUTH_KEY: UFD296548T
          APP_STORE_CONNECT_AUTH_KEY_PATH: ~/private_keys/AuthKey_UFD296548T.p8
          CSC_FOR_PULL_REQUEST: true
@@ -653,8 +634,6 @@ jobs:
      - windows-gui
      - linux-gui
      - macos-gui
-    permissions:
-      id-token: write
    steps:
      - name: Check if any job failed
        if: |
@@ -664,13 +643,11 @@ jobs:
          && contains(needs.*.result, 'failure')
        run: exit 1

-      - name: Log in to Azure
+      - name: Login to Azure - CI subscription
+        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
        if: failure()
-        uses: bitwarden/gh-actions/azure-login@main
        with:
-          subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-          tenant_id: ${{ secrets.AZURE_TENANT_ID }}
-          client_id: ${{ secrets.AZURE_CLIENT_ID }}
+          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}

      - name: Retrieve secrets
        id: retrieve-secrets
@@ -680,9 +657,6 @@ jobs:
          keyvault: "bitwarden-ci"
          secrets: "devops-alerts-slack-webhook-url"

-      - name: Log out from Azure
-        uses: bitwarden/gh-actions/azure-logout@main
-
      - name: Notify Slack on failure
        uses: act10ns/slack@44541246747a30eb3102d87f7a4cc5471b0ffb7d # v2.1.0
        if: failure()
--- a/.github/workflows/enforce-labels.yml
+++ b/.github/workflows/enforce-labels.yml
@@ -3,9 +3,6 @@ name: Enforce PR labels
 on:
  pull_request:
    types: [labeled, unlabeled, opened, edited, synchronize]
-permissions:
-  contents: read
-  pull-requests: read
 jobs:
  enforce-label:
    name: EnforceLabel
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -74,3 +74,5 @@ jobs:

      - name: Upload results to codecov.io
        uses: codecov/test-results-action@4e79e65778be1cecd5df25e14af1eafb6df80ea9 # v1.0.2
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,15 +13,10 @@ on:
          - Redeploy
          - Dry Run

-permissions:
-  contents: read
-
 jobs:
  setup:
    name: Setup
    runs-on: ubuntu-24.04
-    permissions:
-      contents: read
    outputs:
      release_version: ${{ steps.version.outputs.version }}
    steps:
@@ -50,10 +45,6 @@ jobs:
    name: Release
    runs-on: ubuntu-24.04
    needs: setup
-    permissions:
-      actions: read
-      packages: read
-      contents: write
    steps:
      - name: Download all artifacts
        if: ${{ inputs.release_type != 'Dry Run' }}
@@ -80,6 +71,9 @@ jobs:
          artifacts: "./bwdc-windows-${{ env.PKG_VERSION }}.zip,
                      ./bwdc-macos-${{ env.PKG_VERSION }}.zip,
                      ./bwdc-linux-${{ env.PKG_VERSION }}.zip,
+                      ./bwdc-windows-sha256-${{ env.PKG_VERSION }}.txt,
+                      ./bwdc-macos-sha256-${{ env.PKG_VERSION }}.txt,
+                      ./bwdc-linux-sha256-${{ env.PKG_VERSION }}.txt,
                      ./Bitwarden-Connector-Portable-${{ env.PKG_VERSION }}.exe,
                      ./Bitwarden-Connector-Installer-${{ env.PKG_VERSION }}.exe,
                      ./Bitwarden-Connector-Installer-${{ env.PKG_VERSION }}.exe.blockmap,
--- a/.github/workflows/scan.yml
+++ b/.github/workflows/scan.yml
@@ -5,23 +5,13 @@ on:
  push:
    branches:
      - "main"
-  pull_request:
-    types: [opened, synchronize, reopened]
-    branches-ignore:
-      - main
  pull_request_target:
-    types: [opened, synchronize, reopened]
-    branches:
-      - main
-
-permissions: {}
+    types: [opened, synchronize]

 jobs:
  check-run:
    name: Check PR run
    uses: bitwarden/gh-actions/.github/workflows/check-run.yml@main
-    permissions:
-      contents: read

  sast:
    name: SAST scan
@@ -31,7 +21,6 @@ jobs:
      contents: read
      pull-requests: write
      security-events: write
-      id-token: write

    steps:
      - name: Check out repo
@@ -39,33 +28,16 @@ jobs:
        with:
          ref: ${{ github.event.pull_request.head.sha }}

-      - name: Log in to Azure
-        uses: bitwarden/gh-actions/azure-login@main
-        with:
-          subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-          tenant_id: ${{ secrets.AZURE_TENANT_ID }}
-          client_id: ${{ secrets.AZURE_CLIENT_ID }}
-
-      - name: Get Azure Key Vault secrets
-        id: get-kv-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: gh-org-bitwarden
-          secrets: "CHECKMARX-TENANT,CHECKMARX-CLIENT-ID,CHECKMARX-SECRET"
-
-      - name: Log out from Azure
-        uses: bitwarden/gh-actions/azure-logout@main
-
      - name: Scan with Checkmarx
        uses: checkmarx/ast-github-action@184bf2f64f55d1c93fd6636d539edf274703e434 # 2.0.41
        env:
          INCREMENTAL: "${{ contains(github.event_name, 'pull_request') && '--sast-incremental' || '' }}"
        with:
          project_name: ${{ github.repository }}
-          cx_tenant: ${{ steps.get-kv-secrets.outputs.CHECKMARX-TENANT }}
+          cx_tenant: ${{ secrets.CHECKMARX_TENANT }}
          base_uri: https://ast.checkmarx.net/
-          cx_client_id: ${{ steps.get-kv-secrets.outputs.CHECKMARX-CLIENT-ID }}
-          cx_client_secret: ${{ steps.get-kv-secrets.outputs.CHECKMARX-SECRET }}
+          cx_client_id: ${{ secrets.CHECKMARX_CLIENT_ID }}
+          cx_client_secret: ${{ secrets.CHECKMARX_SECRET }}
          additional_params: |
            --report-format sarif \
            --filter "state=TO_VERIFY;PROPOSED_NOT_EXPLOITABLE;CONFIRMED;URGENT" \
@@ -85,7 +57,6 @@ jobs:
    permissions:
      contents: read
      pull-requests: write
-      id-token: write

    steps:
      - name: Check out repo
@@ -94,27 +65,10 @@ jobs:
          fetch-depth: 0
          ref: ${{ github.event.pull_request.head.sha }}

-      - name: Log in to Azure
-        uses: bitwarden/gh-actions/azure-login@main
-        with:
-          subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-          tenant_id: ${{ secrets.AZURE_TENANT_ID }}
-          client_id: ${{ secrets.AZURE_CLIENT_ID }}
-
-      - name: Get Azure Key Vault secrets
-        id: get-kv-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: gh-org-bitwarden
-          secrets: "SONAR-TOKEN"
-
-      - name: Log out from Azure
-        uses: bitwarden/gh-actions/azure-logout@main
-
      - name: Scan with SonarCloud
-        uses: sonarsource/sonarqube-scan-action@2500896589ef8f7247069a56136f8dc177c27ccf # v5.2.0
+        uses: sonarsource/sonarqube-scan-action@bfd4e558cda28cda6b5defafb9232d191be8c203 # v4.2.1
        env:
-          SONAR_TOKEN: ${{ steps.get-kv-secrets.outputs.SONAR-TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
        with:
          args: >
            -Dsonar.organization=${{ github.repository_owner }}
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -64,3 +64,5 @@ jobs:

      - name: Upload results to codecov.io
        uses: codecov/test-results-action@4e79e65778be1cecd5df25e14af1eafb6df80ea9 # v1.0.2
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
--- a/.github/workflows/version-bump.yml
+++ b/.github/workflows/version-bump.yml
@@ -12,9 +12,6 @@ jobs:
  bump_version:
    name: Bump Version
    runs-on: ubuntu-24.04
-    permissions:
-      contents: write
-      id-token: write
    steps:
      - name: Validate version input
        if: ${{ inputs.version_number_override != '' }}
@@ -22,29 +19,12 @@ jobs:
        with:
          version: ${{ inputs.version_number_override }}

-      - name: Log in to Azure
-        uses: bitwarden/gh-actions/azure-login@main
-        with:
-          subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-          tenant_id: ${{ secrets.AZURE_TENANT_ID }}
-          client_id: ${{ secrets.AZURE_CLIENT_ID }}
-
-      - name: Get Azure Key Vault secrets
-        id: get-kv-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: gh-org-bitwarden
-          secrets: "BW-GHAPP-ID,BW-GHAPP-KEY"
-
-      - name: Log out from Azure
-        uses: bitwarden/gh-actions/azure-logout@main
-
      - name: Generate GH App token
        uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
        id: app-token
        with:
-          app-id: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-ID }}
-          private-key: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-KEY }}
+          app-id: ${{ secrets.BW_GHAPP_ID }}
+          private-key: ${{ secrets.BW_GHAPP_KEY }}

      - name: Checkout Branch
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Supported directories:

 - Active Directory
 - Any other LDAP-based directory
- Microsoft Entra ID
+- Azure Active Directory
 - G Suite (Google)
 - Okta

--- a/jslib/common/src/models/request/organizationImportRequest.ts
+++ b/jslib/common/src/models/request/organizationImportRequest.ts
@@ -8,12 +8,16 @@ export class OrganizationImportRequest {
  overwriteExisting = false;
  largeImport = false;

-  constructor(model: {
-    groups: Required<OrganizationImportGroupRequest>[];
-    users: Required<OrganizationImportMemberRequest>[];
-    overwriteExisting: boolean;
-    largeImport: boolean;
-  }) {
+  constructor(
+    model:
+      | {
+          groups: Required<OrganizationImportGroupRequest>[];
+          users: Required<OrganizationImportMemberRequest>[];
+          overwriteExisting: boolean;
+          largeImport: boolean;
+        }
+      | ImportDirectoryRequest,
+  ) {
    if (model instanceof ImportDirectoryRequest) {
      this.groups = model.groups.map((g) => new OrganizationImportGroupRequest(g));
      this.members = model.users.map((u) => new OrganizationImportMemberRequest(u));
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "@bitwarden/directory-connector",
  "productName": "Bitwarden Directory Connector",
  "description": "Sync your user directory to your Bitwarden organization.",
-  "version": "2025.6.1",
+  "version": "2025.3.0",
  "keywords": [
    "bitwarden",
    "password",
@@ -73,15 +73,15 @@
    "test:types": "npx tsc --noEmit"
  },
  "devDependencies": {
-    "@angular-devkit/build-angular": "17.3.17",
+    "@angular-devkit/build-angular": "17.3.11",
    "@angular-eslint/eslint-plugin-template": "17.5.3",
    "@angular-eslint/template-parser": "17.5.3",
    "@angular/compiler-cli": "17.3.12",
    "@electron/notarize": "2.5.0",
-    "@electron/rebuild": "3.7.2",
+    "@electron/rebuild": "3.7.1",
    "@fluffy-spoon/substitute": "1.208.0",
    "@microsoft/microsoft-graph-types": "2.40.0",
-    "@ngtools/webpack": "17.3.17",
+    "@ngtools/webpack": "17.3.11",
    "@types/inquirer": "8.2.10",
    "@types/jest": "29.5.14",
    "@types/lowdb": "1.0.15",
@@ -90,49 +90,50 @@
    "@types/node-forge": "1.3.11",
    "@types/proper-lockfile": "4.1.4",
    "@types/tldjs": "2.3.4",
-    "@typescript-eslint/eslint-plugin": "8.32.1",
-    "@typescript-eslint/parser": "8.32.1",
+    "@typescript-eslint/eslint-plugin": "8.23.0",
+    "@typescript-eslint/parser": "8.23.0",
    "clean-webpack-plugin": "4.0.0",
    "concurrently": "9.1.2",
    "copy-webpack-plugin": "12.0.2",
    "cross-env": "7.0.3",
    "css-loader": "7.1.2",
-    "dotenv": "16.5.0",
+    "dotenv": "16.4.7",
    "electron": "34.1.1",
    "electron-builder": "24.13.3",
-    "electron-log": "5.4.1",
+    "electron-log": "5.2.4",
    "electron-reload": "2.0.0-alpha.1",
    "electron-store": "8.2.0",
-    "electron-updater": "6.6.2",
+    "electron-updater": "6.3.9",
    "eslint": "8.57.1",
-    "eslint-config-prettier": "10.1.5",
+    "eslint-config-prettier": "10.0.1",
    "eslint-import-resolver-typescript": "3.7.0",
    "eslint-plugin-import": "2.31.0",
    "eslint-plugin-rxjs": "5.0.3",
    "eslint-plugin-rxjs-angular": "2.0.1",
-    "form-data": "4.0.3",
+    "form-data": "4.0.1",
    "html-loader": "5.1.0",
    "html-webpack-plugin": "5.6.3",
    "husky": "9.1.7",
    "jest": "29.7.0",
    "jest-junit": "16.0.0",
    "jest-mock-extended": "3.0.7",
-    "jest-preset-angular": "14.5.5",
-    "lint-staged": "15.5.2",
+    "jest-preset-angular": "14.5.0",
+    "lint-staged": "15.4.1",
    "mini-css-extract-plugin": "2.9.2",
-    "node-abi": "3.75.0",
+    "minimatch": "3.1.2",
+    "node-abi": "3.74.0",
    "node-forge": "1.3.1",
    "node-loader": "2.1.0",
    "pkg": "5.8.1",
-    "prettier": "3.5.3",
+    "prettier": "3.4.2",
    "rimraf": "6.0.1",
-    "rxjs": "7.8.2",
+    "rxjs": "7.8.1",
    "sass": "1.79.4",
-    "sass-loader": "16.0.5",
-    "ts-jest": "29.4.0",
+    "sass-loader": "16.0.4",
+    "ts-jest": "29.2.5",
    "ts-loader": "9.5.2",
    "tsconfig-paths-webpack-plugin": "4.2.0",
-    "type-fest": "4.41.0",
+    "type-fest": "4.32.0",
    "typescript": "5.4.5",
    "webpack": "5.97.1",
    "webpack-cli": "6.0.1",
@@ -156,22 +157,21 @@
    "browser-hrtime": "1.1.8",
    "chalk": "4.1.2",
    "commander": "13.1.0",
-    "core-js": "3.42.0",
-    "form-data": "4.0.3",
+    "core-js": "3.40.0",
+    "form-data": "4.0.1",
    "google-auth-library": "9.15.1",
    "googleapis": "144.0.0",
    "https-proxy-agent": "7.0.6",
    "inquirer": "8.2.6",
    "keytar": "7.9.0",
-    "ldapts": "7.4.0",
+    "ldapts": "7.3.1",
    "lowdb": "1.0.0",
    "ngx-toastr": "19.0.0",
    "node-fetch": "2.7.0",
    "proper-lockfile": "4.1.2",
-    "rxjs": "7.8.2",
+    "rxjs": "7.8.1",
    "tldjs": "2.3.1",
-    "zone.js": "0.14.10",
-    "parse5": "7.2.1"
+    "zone.js": "0.14.10"
  },
  "engines": {
    "node": "~22.13.0",
--- a/src/abstractions/request-builder.service.ts
+++ b/src/abstractions/request-builder.service.ts
@@ -3,15 +3,11 @@ import { OrganizationImportRequest } from "@/jslib/common/src/models/request/org
 import { GroupEntry } from "@/src/models/groupEntry";
 import { UserEntry } from "@/src/models/userEntry";

-export interface RequestBuilderOptions {
-  removeDisabled: boolean;
-  overwriteExisting: boolean;
-}
-
 export abstract class RequestBuilder {
  buildRequest: (
    groups: GroupEntry[],
    users: UserEntry[],
-    options: RequestBuilderOptions,
+    removeDisabled: boolean,
+    overwriteExisting: boolean,
  ) => OrganizationImportRequest[];
 }
--- a/src/abstractions/state.service.ts
+++ b/src/abstractions/state.service.ts
@@ -3,7 +3,7 @@ import { StorageOptions } from "@/jslib/common/src/models/domain/storageOptions"

 import { DirectoryType } from "@/src/enums/directoryType";
 import { Account } from "@/src/models/account";
-import { EntraIdConfiguration } from "@/src/models/entraIdConfiguration";
+import { AzureConfiguration } from "@/src/models/azureConfiguration";
 import { GSuiteConfiguration } from "@/src/models/gsuiteConfiguration";
 import { LdapConfiguration } from "@/src/models/ldapConfiguration";
 import { OktaConfiguration } from "@/src/models/oktaConfiguration";
@@ -17,7 +17,7 @@ export abstract class StateService extends BaseStateServiceAbstraction<Account>
    config:
      | LdapConfiguration
      | GSuiteConfiguration
-      | EntraIdConfiguration
+      | AzureConfiguration
      | OktaConfiguration
      | OneLoginConfiguration,
  ) => Promise<any>;
@@ -25,8 +25,8 @@ export abstract class StateService extends BaseStateServiceAbstraction<Account>
  setLdapConfiguration: (value: LdapConfiguration, options?: StorageOptions) => Promise<void>;
  getGsuiteConfiguration: (options?: StorageOptions) => Promise<GSuiteConfiguration>;
  setGsuiteConfiguration: (value: GSuiteConfiguration, options?: StorageOptions) => Promise<void>;
-  getEntraConfiguration: (options?: StorageOptions) => Promise<EntraIdConfiguration>;
-  setEntraConfiguration: (value: EntraIdConfiguration, options?: StorageOptions) => Promise<void>;
+  getAzureConfiguration: (options?: StorageOptions) => Promise<AzureConfiguration>;
+  setAzureConfiguration: (value: AzureConfiguration, options?: StorageOptions) => Promise<void>;
  getOktaConfiguration: (options?: StorageOptions) => Promise<OktaConfiguration>;
  setOktaConfiguration: (value: OktaConfiguration, options?: StorageOptions) => Promise<void>;
  getOneLoginConfiguration: (options?: StorageOptions) => Promise<OneLoginConfiguration>;
--- a/src/app/tabs/dashboard.component.html
+++ b/src/app/tabs/dashboard.component.html
@@ -22,15 +22,18 @@
        class="btn btn-primary"
        [disabled]="startForm.loading"
      >
+        <i class="bwi bwi-play bwi-fw" [hidden]="startForm.loading"></i>
        <i class="bwi bwi-spinner bwi-fw bwi-spin" [hidden]="!startForm.loading"></i>
        {{ "startSync" | i18n }}
      </button>
    </form>
-    <button type="button" (click)="stop()" class="btn btn-danger text-white">
+    <button type="button" (click)="stop()" class="btn btn-primary">
+      <i class="bwi bwi-stop bwi-fw"></i>
      {{ "stopSync" | i18n }}
    </button>
    <form #syncForm [appApiAction]="syncPromise" class="d-inline">
      <button type="button" (click)="sync()" class="btn btn-primary" [disabled]="syncForm.loading">
+        <i class="bwi bwi-refresh bwi-fw" [ngClass]="{ 'bwi-spin': syncForm.loading }"></i>
        {{ "syncNow" | i18n }}
      </button>
    </form>
@@ -48,6 +51,7 @@
        [disabled]="simForm.loading"
      >
        <i class="bwi bwi-spinner bwi-fw bwi-spin" [hidden]="!simForm.loading"></i>
+        <i class="bwi bwi-bug bwi-fw" [hidden]="simForm.loading"></i>
        {{ "testNow" | i18n }}
      </button>
    </form>
--- a/src/app/tabs/settings.component.html
+++ b/src/app/tabs/settings.component.html
@@ -242,7 +242,7 @@
            </div>
          </div>
        </div>
-        <div [hidden]="directory != directoryType.EntraID">
+        <div [hidden]="directory != directoryType.AzureActiveDirectory">
          <div class="mb-3">
            <label for="identityAuthority" class="form-label">{{
              "identityAuthority" | i18n
@@ -251,10 +251,10 @@
              class="form-select"
              id="identityAuthority"
              name="IdentityAuthority"
-              [(ngModel)]="entra.identityAuthority"
+              [(ngModel)]="azure.identityAuthority"
            >
-              <option value="login.microsoftonline.com">Entra Id Public</option>
-              <option value="login.microsoftonline.us">Entra Id Government</option>
+              <option value="login.microsoftonline.com">Azure AD Public</option>
+              <option value="login.microsoftonline.us">Azure AD Government</option>
            </select>
          </div>
          <div class="mb-3">
@@ -264,7 +264,7 @@
              class="form-control"
              id="tenant"
              name="Tenant"
-              [(ngModel)]="entra.tenant"
+              [(ngModel)]="azure.tenant"
            />
            <div class="form-text">{{ "ex" | i18n }} companyad.onmicrosoft.com</div>
          </div>
@@ -275,29 +275,29 @@
              class="form-control"
              id="applicationId"
              name="ApplicationId"
-              [(ngModel)]="entra.applicationId"
+              [(ngModel)]="azure.applicationId"
            />
          </div>
          <div class="mb-3">
            <label for="secretKey" class="form-label">{{ "secretKey" | i18n }}</label>
            <div class="input-group">
              <input
-                type="{{ showEntraKey ? 'text' : 'password' }}"
+                type="{{ showAzureKey ? 'text' : 'password' }}"
                class="form-control"
                id="secretKey"
                name="SecretKey"
-                [(ngModel)]="entra.key"
+                [(ngModel)]="azure.key"
              />
              <button
                type="button"
                class="btn btn-outline-secondary"
                appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-                (click)="toggleEntraKey()"
+                (click)="toggleAzureKey()"
              >
                <i
                  class="bwi bwi-lg"
                  aria-hidden="true"
-                  [ngClass]="showEntraKey ? 'bwi-eye-slash' : 'bwi-eye'"
+                  [ngClass]="showAzureKey ? 'bwi-eye-slash' : 'bwi-eye'"
                ></i>
              </button>
            </div>
@@ -607,14 +607,14 @@
            <div class="form-text" *ngIf="directory === directoryType.Ldap">
              {{ "ex" | i18n }} (&amp;(givenName=John)(|(l=Dallas)(l=Austin)))
            </div>
-            <div class="form-text" *ngIf="directory === directoryType.EntraID">
+            <div class="form-text" *ngIf="directory === directoryType.AzureActiveDirectory">
              {{ "ex" | i18n }} exclude:joe&#64;company.com
            </div>
            <div class="form-text" *ngIf="directory === directoryType.Okta">
              {{ "ex" | i18n }} exclude:joe&#64;company.com | profile.firstName eq "John"
            </div>
            <div class="form-text" *ngIf="directory === directoryType.GSuite">
-              {{ "ex" | i18n }} exclude:joe&#64;company.com | orgUnitPath=/Engineering
+              {{ "ex" | i18n }} exclude:joe&#64;company.com | orgName=Engineering
            </div>
          </div>
          <div class="mb-3" [hidden]="directory != directoryType.Ldap">
@@ -684,7 +684,7 @@
            <div class="form-text" *ngIf="directory === directoryType.Ldap">
              {{ "ex" | i18n }} (&amp;(objectClass=group)(!(cn=Sales*))(!(cn=IT*)))
            </div>
-            <div class="form-text" *ngIf="directory === directoryType.EntraID">
+            <div class="form-text" *ngIf="directory === directoryType.AzureActiveDirectory">
              {{ "ex" | i18n }} include:Sales,IT
            </div>
            <div class="form-text" *ngIf="directory === directoryType.Okta">
--- a/src/app/tabs/settings.component.ts
+++ b/src/app/tabs/settings.component.ts
@@ -5,7 +5,7 @@ import { LogService } from "@/jslib/common/src/abstractions/log.service";

 import { StateService } from "../../abstractions/state.service";
 import { DirectoryType } from "../../enums/directoryType";
-import { EntraIdConfiguration } from "../../models/entraIdConfiguration";
+import { AzureConfiguration } from "../../models/azureConfiguration";
 import { GSuiteConfiguration } from "../../models/gsuiteConfiguration";
 import { LdapConfiguration } from "../../models/ldapConfiguration";
 import { OktaConfiguration } from "../../models/oktaConfiguration";
@@ -22,13 +22,13 @@ export class SettingsComponent implements OnInit, OnDestroy {
  directoryType = DirectoryType;
  ldap = new LdapConfiguration();
  gsuite = new GSuiteConfiguration();
-  entra = new EntraIdConfiguration();
+  azure = new AzureConfiguration();
  okta = new OktaConfiguration();
  oneLogin = new OneLoginConfiguration();
  sync = new SyncConfiguration();
  directoryOptions: any[];
  showLdapPassword = false;
-  showEntraKey = false;
+  showAzureKey = false;
  showOktaKey = false;
  showOneLoginSecret = false;

@@ -42,7 +42,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
    this.directoryOptions = [
      { name: this.i18nService.t("select"), value: null },
      { name: "Active Directory / LDAP", value: DirectoryType.Ldap },
-      { name: "Entra ID", value: DirectoryType.EntraID },
+      { name: "Azure Active Directory", value: DirectoryType.AzureActiveDirectory },
      { name: "G Suite (Google)", value: DirectoryType.GSuite },
      { name: "Okta", value: DirectoryType.Okta },
      { name: "OneLogin", value: DirectoryType.OneLogin },
@@ -56,9 +56,10 @@ export class SettingsComponent implements OnInit, OnDestroy {
    this.gsuite =
      (await this.stateService.getDirectory<GSuiteConfiguration>(DirectoryType.GSuite)) ||
      this.gsuite;
-    this.entra =
-      (await this.stateService.getDirectory<EntraIdConfiguration>(DirectoryType.EntraID)) ||
-      this.entra;
+    this.azure =
+      (await this.stateService.getDirectory<AzureConfiguration>(
+        DirectoryType.AzureActiveDirectory,
+      )) || this.azure;
    this.okta =
      (await this.stateService.getDirectory<OktaConfiguration>(DirectoryType.Okta)) || this.okta;
    this.oneLogin =
@@ -79,7 +80,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
    await this.stateService.setDirectoryType(this.directory);
    await this.stateService.setDirectory(DirectoryType.Ldap, this.ldap);
    await this.stateService.setDirectory(DirectoryType.GSuite, this.gsuite);
-    await this.stateService.setDirectory(DirectoryType.EntraID, this.entra);
+    await this.stateService.setDirectory(DirectoryType.AzureActiveDirectory, this.azure);
    await this.stateService.setDirectory(DirectoryType.Okta, this.okta);
    await this.stateService.setDirectory(DirectoryType.OneLogin, this.oneLogin);
    await this.stateService.setSync(this.sync);
@@ -134,8 +135,8 @@ export class SettingsComponent implements OnInit, OnDestroy {
    document.getElementById("password").focus();
  }

-  toggleEntraKey() {
-    this.showEntraKey = !this.showEntraKey;
+  toggleAzureKey() {
+    this.showAzureKey = !this.showAzureKey;
    document.getElementById("secretKey").focus();
  }

--- a/src/app/tabs/tabs.component.html
+++ b/src/app/tabs/tabs.component.html
@@ -2,16 +2,19 @@
  <ul class="nav nav-tabs mb-3">
    <li class="nav-item">
      <a class="nav-link" routerLink="dashboard" routerLinkActive="active">
+        <i class="bwi bwi-dashboard"></i>
        {{ "dashboard" | i18n }}
      </a>
    </li>
    <li class="nav-item">
      <a class="nav-link" routerLink="settings" routerLinkActive="active">
+        <i class="bwi bwi-cogs"></i>
        {{ "settings" | i18n }}
      </a>
    </li>
    <li class="nav-item">
      <a class="nav-link" routerLink="more" routerLinkActive="active">
+        <i class="bwi bwi-sliders"></i>
        {{ "more" | i18n }}
      </a>
    </li>
--- a/src/commands/config.command.ts
+++ b/src/commands/config.command.ts
@@ -8,7 +8,7 @@ import { MessageResponse } from "@/jslib/node/src/cli/models/response/messageRes

 import { StateService } from "../abstractions/state.service";
 import { DirectoryType } from "../enums/directoryType";
-import { EntraIdConfiguration } from "../models/entraIdConfiguration";
+import { AzureConfiguration } from "../models/azureConfiguration";
 import { GSuiteConfiguration } from "../models/gsuiteConfiguration";
 import { LdapConfiguration } from "../models/ldapConfiguration";
 import { OktaConfiguration } from "../models/oktaConfiguration";
@@ -20,7 +20,7 @@ export class ConfigCommand {
  private directory: DirectoryType;
  private ldap = new LdapConfiguration();
  private gsuite = new GSuiteConfiguration();
-  private entra = new EntraIdConfiguration();
+  private azure = new AzureConfiguration();
  private okta = new OktaConfiguration();
  private oneLogin = new OneLoginConfiguration();
  private sync = new SyncConfiguration();
@@ -54,11 +54,8 @@ export class ConfigCommand {
        case "gsuite.key":
          await this.setGSuiteKey(value);
          break;
-        // Azure Active Directory was renamed to Entra ID, but we've kept the old key name
-        // to be backwards compatible with existing configurations.
        case "azure.key":
-        case "entra.key":
-          await this.setEntraIdKey(value);
+          await this.setAzureKey(value);
          break;
        case "okta.token":
          await this.setOktaToken(value);
@@ -105,9 +102,9 @@ export class ConfigCommand {
    await this.saveConfig();
  }

-  private async setEntraIdKey(key: string) {
+  private async setAzureKey(key: string) {
    await this.loadConfig();
-    this.entra.key = key;
+    this.azure.key = key;
    await this.saveConfig();
  }

@@ -130,9 +127,10 @@ export class ConfigCommand {
    this.gsuite =
      (await this.stateService.getDirectory<GSuiteConfiguration>(DirectoryType.GSuite)) ||
      this.gsuite;
-    this.entra =
-      (await this.stateService.getDirectory<EntraIdConfiguration>(DirectoryType.EntraID)) ||
-      this.entra;
+    this.azure =
+      (await this.stateService.getDirectory<AzureConfiguration>(
+        DirectoryType.AzureActiveDirectory,
+      )) || this.azure;
    this.okta =
      (await this.stateService.getDirectory<OktaConfiguration>(DirectoryType.Okta)) || this.okta;
    this.oneLogin =
@@ -146,7 +144,7 @@ export class ConfigCommand {
    await this.stateService.setDirectoryType(this.directory);
    await this.stateService.setDirectory(DirectoryType.Ldap, this.ldap);
    await this.stateService.setDirectory(DirectoryType.GSuite, this.gsuite);
-    await this.stateService.setDirectory(DirectoryType.EntraID, this.entra);
+    await this.stateService.setDirectory(DirectoryType.AzureActiveDirectory, this.azure);
    await this.stateService.setDirectory(DirectoryType.Okta, this.okta);
    await this.stateService.setDirectory(DirectoryType.OneLogin, this.oneLogin);
    await this.stateService.setSync(this.sync);
--- a/src/enums/directoryType.ts
+++ b/src/enums/directoryType.ts
@@ -1,6 +1,6 @@
 export enum DirectoryType {
  Ldap = 0,
-  EntraID = 1,
+  AzureActiveDirectory = 1,
  GSuite = 2,
  Okta = 3,
  OneLogin = 4,
--- a/src/models/account.ts
+++ b/src/models/account.ts
@@ -2,7 +2,7 @@ import { Account as BaseAccount } from "@/jslib/common/src/models/domain/account

 import { DirectoryType } from "@/src/enums/directoryType";

-import { EntraIdConfiguration } from "./entraIdConfiguration";
+import { AzureConfiguration } from "./azureConfiguration";
 import { GSuiteConfiguration } from "./gsuiteConfiguration";
 import { LdapConfiguration } from "./ldapConfiguration";
 import { OktaConfiguration } from "./oktaConfiguration";
@@ -29,10 +29,7 @@ export class ClientKeys {
 export class DirectoryConfigurations {
  ldap: LdapConfiguration;
  gsuite: GSuiteConfiguration;
-  entra: EntraIdConfiguration;
-  // Azure Active Directory was renamed to Entra ID, but we've kept the old account property name
-  // to be backwards compatible with existing configurations.
-  azure: EntraIdConfiguration;
+  azure: AzureConfiguration;
  okta: OktaConfiguration;
  oneLogin: OneLoginConfiguration;
 }
--- a/src/models/entraIdConfiguration.ts
+++ b/src/models/entraIdConfiguration.ts
@@ -1,6 +1,6 @@
 import { IConfiguration } from "./IConfiguration";

-export class EntraIdConfiguration implements IConfiguration {
+export class AzureConfiguration implements IConfiguration {
  identityAuthority: string;
  tenant: string;
  applicationId: string;
--- a/src/program.ts
+++ b/src/program.ts
@@ -190,7 +190,7 @@ export class Program extends BaseProgram {
        writeLn("    server - On-premise hosted installation URL.");
        writeLn("    directory - The type of directory to use.");
        writeLn("    ldap.password - The password for connection to this LDAP server.");
-        writeLn("    entra.key - The Entra Id secret key.");
+        writeLn("    azure.key - The Azure AD secret key.");
        writeLn("    gsuite.key - The G Suite private key.");
        writeLn("    okta.token - The Okta token.");
        writeLn("    onelogin.secret - The OneLogin client secret.");
@@ -202,7 +202,7 @@ export class Program extends BaseProgram {
        writeLn("    bwdc config directory 1");
        writeLn("    bwdc config ldap.password <password>");
        writeLn("    bwdc config ldap.password --secretenv LDAP_PWD");
-        writeLn("    bwdc config entra.key <key>");
+        writeLn("    bwdc config azure.key <key>");
        writeLn("    bwdc config gsuite.key <key>");
        writeLn("    bwdc config okta.token <token>");
        writeLn("    bwdc config onelogin.secret <secret>");
--- a/src/services/entra-id-directory.service.ts
+++ b/src/services/entra-id-directory.service.ts
@@ -9,7 +9,7 @@ import { LogService } from "@/jslib/common/src/abstractions/log.service";

 import { StateService } from "../abstractions/state.service";
 import { DirectoryType } from "../enums/directoryType";
-import { EntraIdConfiguration } from "../models/entraIdConfiguration";
+import { AzureConfiguration } from "../models/azureConfiguration";
 import { GroupEntry } from "../models/groupEntry";
 import { SyncConfiguration } from "../models/syncConfiguration";
 import { UserEntry } from "../models/userEntry";
@@ -17,10 +17,8 @@ import { UserEntry } from "../models/userEntry";
 import { BaseDirectoryService } from "./baseDirectory.service";
 import { IDirectoryService } from "./directory.service";

-const EntraIdPublicIdentityAuthority = "login.microsoftonline.com";
-const EntraIdPublicGraphEndpoint = "https://graph.microsoft.com";
-const EntraIdGovernmentIdentityAuthority = "login.microsoftonline.us";
-const EntraIdGovernmentGraphEndpoint = "https://graph.microsoft.us";
+const AzurePublicIdentityAuhtority = "login.microsoftonline.com";
+const AzureGovermentIdentityAuhtority = "login.microsoftonline.us";

 const NextLink = "@odata.nextLink";
 const DeltaLink = "@odata.deltaLink";
@@ -34,9 +32,9 @@ enum UserSetType {
  ExcludeGroup,
 }

-export class EntraIdDirectoryService extends BaseDirectoryService implements IDirectoryService {
+export class AzureDirectoryService extends BaseDirectoryService implements IDirectoryService {
  private client: graph.Client;
-  private dirConfig: EntraIdConfiguration;
+  private dirConfig: AzureConfiguration;
  private syncConfig: SyncConfiguration;
  private accessToken: string;
  private accessTokenExpiration: Date;
@@ -52,12 +50,12 @@ export class EntraIdDirectoryService extends BaseDirectoryService implements IDi

  async getEntries(force: boolean, test: boolean): Promise<[GroupEntry[], UserEntry[]]> {
    const type = await this.stateService.getDirectoryType();
-    if (type !== DirectoryType.EntraID) {
+    if (type !== DirectoryType.AzureActiveDirectory) {
      return;
    }

-    this.dirConfig = await this.stateService.getDirectory<EntraIdConfiguration>(
-      DirectoryType.EntraID,
+    this.dirConfig = await this.stateService.getDirectory<AzureConfiguration>(
+      DirectoryType.AzureActiveDirectory,
    );
    if (this.dirConfig == null) {
      return;
@@ -209,7 +207,7 @@ export class EntraIdDirectoryService extends BaseDirectoryService implements IDi
    if (keyword === "excludeadministrativeunit" || keyword === "includeadministrativeunit") {
      for (const p of pieces) {
        let auMembers = await this.client
-          .api(`${this.getGraphApiEndpoint()}/v1.0/directory/administrativeUnits/${p}/members`)
+          .api(`https://graph.microsoft.com/v1.0/directory/administrativeUnits/${p}/members`)
          .get();
        // eslint-disable-next-line
        while (true) {
@@ -459,10 +457,10 @@ export class EntraIdDirectoryService extends BaseDirectoryService implements IDi
        const identityAuthority =
          this.dirConfig.identityAuthority != null
            ? this.dirConfig.identityAuthority
-            : EntraIdPublicIdentityAuthority;
+            : AzurePublicIdentityAuhtority;
        if (
-          identityAuthority !== EntraIdPublicIdentityAuthority &&
-          identityAuthority !== EntraIdGovernmentIdentityAuthority
+          identityAuthority !== AzurePublicIdentityAuhtority &&
+          identityAuthority !== AzureGovermentIdentityAuhtority
        ) {
          done(new Error(this.i18nService.t("dirConfigIncomplete")), null);
          return;
@@ -480,7 +478,7 @@ export class EntraIdDirectoryService extends BaseDirectoryService implements IDi
          client_id: this.dirConfig.applicationId,
          client_secret: this.dirConfig.key,
          grant_type: "client_credentials",
-          scope: `${this.getGraphApiEndpoint()}/.default`,
+          scope: "https://graph.microsoft.com/.default",
        });

        const req = https
@@ -544,10 +542,4 @@ export class EntraIdDirectoryService extends BaseDirectoryService implements IDi
    exp.setSeconds(exp.getSeconds() + expSeconds);
    this.accessTokenExpiration = exp;
  }
-
-  private getGraphApiEndpoint(): string {
-    return this.dirConfig.identityAuthority === EntraIdGovernmentIdentityAuthority
-      ? EntraIdGovernmentGraphEndpoint
-      : EntraIdPublicGraphEndpoint;
-  }
 }
--- a/src/services/batch-request-builder.ts
+++ b/src/services/batch-request-builder.ts
@@ -3,7 +3,7 @@ import { OrganizationImportRequest } from "@/jslib/common/src/models/request/org
 import { GroupEntry } from "@/src/models/groupEntry";
 import { UserEntry } from "@/src/models/userEntry";

-import { RequestBuilder, RequestBuilderOptions } from "../abstractions/request-builder.service";
+import { RequestBuilder } from "../abstractions/request-builder.service";

 import { batchSize } from "./sync.service";

@@ -16,22 +16,17 @@ export class BatchRequestBuilder implements RequestBuilder {
  buildRequest(
    groups: GroupEntry[],
    users: UserEntry[],
-    options: RequestBuilderOptions,
+    removeDisabled: boolean,
+    overwriteExisting: boolean,
  ): OrganizationImportRequest[] {
-    if (options.overwriteExisting) {
-      throw new Error(
-        "You cannot use the 'Remove and re-add organization users during the next sync' option with large imports.",
-      );
-    }
-
    const requests: OrganizationImportRequest[] = [];

-    if (users?.length > 0) {
+    if (users.length > 0) {
      const usersRequest = users.map((u) => {
        return {
          email: u.email,
          externalId: u.externalId,
-          deleted: u.deleted || (options.removeDisabled && u.disabled),
+          deleted: u.deleted || (removeDisabled && u.disabled),
        };
      });

@@ -42,13 +37,13 @@ export class BatchRequestBuilder implements RequestBuilder {
          groups: [],
          users: u,
          largeImport: true,
-          overwriteExisting: false,
+          overwriteExisting,
        });
        requests.push(req);
      }
    }

-    if (groups?.length > 0) {
+    if (groups.length > 0) {
      const groupRequest = groups.map((g) => {
        return {
          name: g.name,
@@ -64,7 +59,7 @@ export class BatchRequestBuilder implements RequestBuilder {
          groups: g,
          users: [],
          largeImport: true,
-          overwriteExisting: false,
+          overwriteExisting,
        });
        requests.push(req);
      }
--- a/src/services/batch-requests-builder.spec.ts
+++ b/src/services/batch-requests-builder.spec.ts
@@ -1,74 +1,46 @@
-import { GetUniqueString } from "@/jslib/common/spec/utils";
-
+import { GroupEntry } from "@/src/models/groupEntry";
 import { UserEntry } from "@/src/models/userEntry";

-import { RequestBuilderOptions } from "../abstractions/request-builder.service";
-import { groupSimulator, userSimulator } from "../utils/request-builder-helper";
-
 import { BatchRequestBuilder } from "./batch-request-builder";
+import { SingleRequestBuilder } from "./single-request-builder";

 describe("BatchRequestBuilder", () => {
  let batchRequestBuilder: BatchRequestBuilder;
+  let singleRequestBuilder: SingleRequestBuilder;
+
+  function userSimulator(userCount: number) {
+    return Array(userCount).fill(new UserEntry());
+  }
+
+  function groupSimulator(groupCount: number) {
+    return Array(groupCount).fill(new GroupEntry());
+  }

  beforeEach(async () => {
    batchRequestBuilder = new BatchRequestBuilder();
-  });
-
-  const defaultOptions: RequestBuilderOptions = Object.freeze({
-    overwriteExisting: false,
-    removeDisabled: false,
+    singleRequestBuilder = new SingleRequestBuilder();
  });

  it("BatchRequestBuilder batches requests for > 2000 users", () => {
    const mockGroups = groupSimulator(11000);
    const mockUsers = userSimulator(11000);
-    const requests = batchRequestBuilder.buildRequest(mockGroups, mockUsers, defaultOptions);
+
+    const requests = batchRequestBuilder.buildRequest(mockGroups, mockUsers, true, true);

    expect(requests.length).toEqual(12);
  });

-  it("BatchRequestBuilder throws error when overwriteExisting is true", () => {
-    const mockGroups = groupSimulator(11000);
-    const mockUsers = userSimulator(11000);
-    const options = { ...defaultOptions, overwriteExisting: true };
+  it("SingleRequestBuilder returns single request for 200 users", () => {
+    const mockGroups = groupSimulator(200);
+    const mockUsers = userSimulator(200);

-    const r = () => batchRequestBuilder.buildRequest(mockGroups, mockUsers, options);
+    const requests = singleRequestBuilder.buildRequest(mockGroups, mockUsers, true, true);

-    expect(r).toThrow(
-      "You cannot use the 'Remove and re-add organization users during the next sync' option with large imports.",
-    );
-  });
-
-  it("BatchRequestBuilder returns requests with deleted users when removeDisabled is true", () => {
-    const mockGroups = groupSimulator(11000);
-    const mockUsers = userSimulator(11000);
-
-    const disabledUser1 = new UserEntry();
-    const disabledUserEmail1 = GetUniqueString() + "@email.com";
-
-    const disabledUser2 = new UserEntry();
-    const disabledUserEmail2 = GetUniqueString() + "@email.com";
-
-    disabledUser1.disabled = true;
-    disabledUser1.email = disabledUserEmail1;
-    disabledUser2.disabled = true;
-    disabledUser2.email = disabledUserEmail2;
-
-    mockUsers[0] = disabledUser1;
-    mockUsers.push(disabledUser2);
-
-    const options = { ...defaultOptions, removeDisabled: true };
-    const requests = batchRequestBuilder.buildRequest(mockGroups, mockUsers, options);
-
-    expect(requests[0].members).toContainEqual({ email: disabledUserEmail1, deleted: true });
-    expect(requests[1].members.find((m) => m.deleted)).toBeUndefined();
-    expect(requests[3].members.find((m) => m.deleted)).toBeUndefined();
-    expect(requests[4].members.find((m) => m.deleted)).toBeUndefined();
-    expect(requests[5].members).toContainEqual({ email: disabledUserEmail2, deleted: true });
+    expect(requests.length).toEqual(1);
  });

  it("BatchRequestBuilder retuns an empty array when there are no users or groups", () => {
-    const requests = batchRequestBuilder.buildRequest([], [], defaultOptions);
+    const requests = batchRequestBuilder.buildRequest([], [], true, true);

    expect(requests).toEqual([]);
  });
--- a/src/services/directory-factory.service.ts
+++ b/src/services/directory-factory.service.ts
@@ -5,7 +5,7 @@ import { DirectoryFactoryService } from "../abstractions/directory-factory.servi
 import { StateService } from "../abstractions/state.service";
 import { DirectoryType } from "../enums/directoryType";

-import { EntraIdDirectoryService } from "./entra-id-directory.service";
+import { AzureDirectoryService } from "./azure-directory.service";
 import { GSuiteDirectoryService } from "./gsuite-directory.service";
 import { LdapDirectoryService } from "./ldap-directory.service";
 import { OktaDirectoryService } from "./okta-directory.service";
@@ -22,8 +22,8 @@ export class DefaultDirectoryFactoryService implements DirectoryFactoryService {
    switch (directoryType) {
      case DirectoryType.GSuite:
        return new GSuiteDirectoryService(this.logService, this.i18nService, this.stateService);
-      case DirectoryType.EntraID:
-        return new EntraIdDirectoryService(this.logService, this.i18nService, this.stateService);
+      case DirectoryType.AzureActiveDirectory:
+        return new AzureDirectoryService(this.logService, this.i18nService, this.stateService);
      case DirectoryType.Ldap:
        return new LdapDirectoryService(this.logService, this.i18nService, this.stateService);
      case DirectoryType.Okta:
--- a/src/services/single-request-builder.spec.ts
+++ b/src/services/single-request-builder.spec.ts
@@ -1,79 +0,0 @@
-import { GetUniqueString } from "@/jslib/common/spec/utils";
-
-import { UserEntry } from "@/src/models/userEntry";
-
-import { RequestBuilderOptions } from "../abstractions/request-builder.service";
-import { groupSimulator, userSimulator } from "../utils/request-builder-helper";
-
-import { SingleRequestBuilder } from "./single-request-builder";
-
-describe("SingleRequestBuilder", () => {
-  let singleRequestBuilder: SingleRequestBuilder;
-
-  beforeEach(async () => {
-    singleRequestBuilder = new SingleRequestBuilder();
-  });
-
-  const defaultOptions: RequestBuilderOptions = Object.freeze({
-    overwriteExisting: false,
-    removeDisabled: false,
-  });
-
-  it("SingleRequestBuilder returns single request for 200 users", () => {
-    const mockGroups = groupSimulator(200);
-    const mockUsers = userSimulator(200);
-
-    const requests = singleRequestBuilder.buildRequest(mockGroups, mockUsers, defaultOptions);
-
-    expect(requests.length).toEqual(1);
-  });
-
-  it("SingleRequestBuilder returns request with overwriteExisting enabled", () => {
-    const mockGroups = groupSimulator(200);
-    const mockUsers = userSimulator(200);
-
-    const options = { ...defaultOptions, overwriteExisting: true };
-    const request = singleRequestBuilder.buildRequest(mockGroups, mockUsers, options)[0];
-
-    expect(request.overwriteExisting).toBe(true);
-  });
-
-  it("SingleRequestBuilder returns request with deleted user when removeDisabled is true", () => {
-    const mockGroups = groupSimulator(200);
-    const mockUsers = userSimulator(200);
-
-    const disabledUser = new UserEntry();
-    const disabledUserEmail = GetUniqueString() + "@example.com";
-    disabledUser.disabled = true;
-    disabledUser.email = disabledUserEmail;
-    mockUsers.push(disabledUser);
-
-    const options = { ...defaultOptions, removeDisabled: true };
-    const request = singleRequestBuilder.buildRequest(mockGroups, mockUsers, options)[0];
-
-    expect(request.members.length).toEqual(201);
-    expect(request.members.pop()).toEqual(
-      expect.objectContaining({ email: disabledUserEmail, deleted: true }),
-    );
-    expect(request.overwriteExisting).toBe(false);
-  });
-
-  it("SingleRequestBuilder returns request with deleted user and overwriteExisting enabled when overwriteExisting and removeDisabled are true", () => {
-    const mockGroups = groupSimulator(200);
-    const mockUsers = userSimulator(200);
-
-    const disabledUser = new UserEntry();
-    const disabledUserEmail = GetUniqueString() + "@example.com";
-    disabledUser.disabled = true;
-    disabledUser.email = disabledUserEmail;
-    mockUsers.push(disabledUser);
-
-    const options = { overwriteExisting: true, removeDisabled: true };
-    const request = singleRequestBuilder.buildRequest(mockGroups, mockUsers, options)[0];
-
-    expect(request.members.pop()).toEqual(
-      expect.objectContaining({ email: disabledUserEmail, deleted: true }),
-    );
-    expect(request.overwriteExisting).toBe(true);
-  });
-});
--- a/src/services/single-request-builder.ts
+++ b/src/services/single-request-builder.ts
@@ -3,7 +3,7 @@ import { OrganizationImportRequest } from "@/jslib/common/src/models/request/org
 import { GroupEntry } from "@/src/models/groupEntry";
 import { UserEntry } from "@/src/models/userEntry";

-import { RequestBuilder, RequestBuilderOptions } from "../abstractions/request-builder.service";
+import { RequestBuilder } from "../abstractions/request-builder.service";

 /**
 * This class is responsible for building small (<2k users) syncs as a single
@@ -15,7 +15,8 @@ export class SingleRequestBuilder implements RequestBuilder {
  buildRequest(
    groups: GroupEntry[],
    users: UserEntry[],
-    options: RequestBuilderOptions,
+    removeDisabled: boolean,
+    overwriteExisting: boolean,
  ): OrganizationImportRequest[] {
    return [
      new OrganizationImportRequest({
@@ -30,10 +31,10 @@ export class SingleRequestBuilder implements RequestBuilder {
          return {
            email: u.email,
            externalId: u.externalId,
-            deleted: u.deleted || (options.removeDisabled && u.disabled),
+            deleted: u.deleted || (removeDisabled && u.disabled),
          };
        }),
-        overwriteExisting: options.overwriteExisting,
+        overwriteExisting: overwriteExisting,
        largeImport: false,
      }),
    ];
--- a/src/services/state.service.ts
+++ b/src/services/state.service.ts
@@ -11,7 +11,7 @@ import { StateService as StateServiceAbstraction } from "@/src/abstractions/stat
 import { DirectoryType } from "@/src/enums/directoryType";
 import { IConfiguration } from "@/src/models/IConfiguration";
 import { Account } from "@/src/models/account";
-import { EntraIdConfiguration } from "@/src/models/entraIdConfiguration";
+import { AzureConfiguration } from "@/src/models/azureConfiguration";
 import { GSuiteConfiguration } from "@/src/models/gsuiteConfiguration";
 import { LdapConfiguration } from "@/src/models/ldapConfiguration";
 import { OktaConfiguration } from "@/src/models/oktaConfiguration";
@@ -21,10 +21,7 @@ import { SyncConfiguration } from "@/src/models/syncConfiguration";
 const SecureStorageKeys = {
  ldap: "ldapPassword",
  gsuite: "gsuitePrivateKey",
-  // Azure Active Directory was renamed to Entra ID, but we've kept the old property name
-  // to be backwards compatible with existing configurations.
  azure: "azureKey",
-  entra: "entraKey",
  okta: "oktaToken",
  oneLogin: "oneLoginClientSecret",
  userDelta: "userDeltaToken",
@@ -71,8 +68,8 @@ export class StateService
        case DirectoryType.Ldap:
          (configWithSecrets as any).password = await this.getLdapKey();
          break;
-        case DirectoryType.EntraID:
-          (configWithSecrets as any).key = await this.getEntraKey();
+        case DirectoryType.AzureActiveDirectory:
+          (configWithSecrets as any).key = await this.getAzureKey();
          break;
        case DirectoryType.Okta:
          (configWithSecrets as any).token = await this.getOktaKey();
@@ -96,7 +93,7 @@ export class StateService
    config:
      | LdapConfiguration
      | GSuiteConfiguration
-      | EntraIdConfiguration
+      | AzureConfiguration
      | OktaConfiguration
      | OneLoginConfiguration,
  ): Promise<any> {
@@ -109,11 +106,11 @@ export class StateService
          await this.setLdapConfiguration(ldapConfig);
          break;
        }
-        case DirectoryType.EntraID: {
-          const entraConfig = config as EntraIdConfiguration;
-          await this.setEntraKey(entraConfig.key);
-          entraConfig.key = StoredSecurely;
-          await this.setEntraConfiguration(entraConfig);
+        case DirectoryType.AzureActiveDirectory: {
+          const azureConfig = config as AzureConfiguration;
+          await this.setAzureKey(azureConfig.key);
+          azureConfig.key = StoredSecurely;
+          await this.setAzureConfiguration(azureConfig);
          break;
        }
        case DirectoryType.Okta: {
@@ -190,32 +187,23 @@ export class StateService
    );
  }

-  private async getEntraKey(options?: StorageOptions): Promise<string> {
+  private async getAzureKey(options?: StorageOptions): Promise<string> {
    options = this.reconcileOptions(options, await this.defaultSecureStorageOptions());
    if (options?.userId == null) {
      return null;
    }
-
-    const entraKey = await this.secureStorageService.get<string>(
-      `${options.userId}_${SecureStorageKeys.entra}`,
-    );
-
-    if (entraKey != null) {
-      return entraKey;
-    }
-
    return await this.secureStorageService.get<string>(
      `${options.userId}_${SecureStorageKeys.azure}`,
    );
  }

-  private async setEntraKey(value: string, options?: StorageOptions): Promise<void> {
+  private async setAzureKey(value: string, options?: StorageOptions): Promise<void> {
    options = this.reconcileOptions(options, await this.defaultSecureStorageOptions());
    if (options?.userId == null) {
      return;
    }
    await this.secureStorageService.save(
-      `${options.userId}_${SecureStorageKeys.entra}`,
+      `${options.userId}_${SecureStorageKeys.azure}`,
      value,
      options,
    );
@@ -271,8 +259,8 @@ export class StateService
        return await this.getLdapConfiguration();
      case DirectoryType.GSuite:
        return await this.getGsuiteConfiguration();
-      case DirectoryType.EntraID:
-        return await this.getEntraConfiguration();
+      case DirectoryType.AzureActiveDirectory:
+        return await this.getAzureConfiguration();
      case DirectoryType.Okta:
        return await this.getOktaConfiguration();
      case DirectoryType.OneLogin:
@@ -317,28 +305,17 @@ export class StateService
    );
  }

-  async getEntraConfiguration(options?: StorageOptions): Promise<EntraIdConfiguration> {
-    const entraConfig = (
-      await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskOptions()))
-    )?.directoryConfigurations?.entra;
-
-    if (entraConfig != null) {
-      return entraConfig;
-    }
-
+  async getAzureConfiguration(options?: StorageOptions): Promise<AzureConfiguration> {
    return (
      await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskOptions()))
    )?.directoryConfigurations?.azure;
  }

-  async setEntraConfiguration(
-    value: EntraIdConfiguration,
-    options?: StorageOptions,
-  ): Promise<void> {
+  async setAzureConfiguration(value: AzureConfiguration, options?: StorageOptions): Promise<void> {
    const account = await this.getAccount(
      this.reconcileOptions(options, await this.defaultOnDiskOptions()),
    );
-    account.directoryConfigurations.entra = value;
+    account.directoryConfigurations.azure = value;
    await this.saveAccount(
      account,
      this.reconcileOptions(options, await this.defaultOnDiskOptions()),
--- a/src/services/stateMigration.service.ts
+++ b/src/services/stateMigration.service.ts
@@ -3,7 +3,7 @@ import { StateMigrationService as BaseStateMigrationService } from "@/jslib/comm

 import { DirectoryType } from "@/src/enums/directoryType";
 import { Account, DirectoryConfigurations, DirectorySettings } from "@/src/models/account";
-import { EntraIdConfiguration } from "@/src/models/entraIdConfiguration";
+import { AzureConfiguration } from "@/src/models/azureConfiguration";
 import { GSuiteConfiguration } from "@/src/models/gsuiteConfiguration";
 import { LdapConfiguration } from "@/src/models/ldapConfiguration";
 import { OktaConfiguration } from "@/src/models/oktaConfiguration";
@@ -14,7 +14,6 @@ const SecureStorageKeys: { [key: string]: any } = {
  ldap: "ldapPassword",
  gsuite: "gsuitePrivateKey",
  azure: "azureKey",
-  entra: "entraIdKey",
  okta: "oktaToken",
  oneLogin: "oneLoginClientSecret",
  directoryConfigPrefix: "directoryConfig_",
@@ -105,16 +104,13 @@ export class StateMigrationService extends BaseStateMigrationService {
      }
    };

-    // Initialize typed objects from key/value pairs in storage to either be saved temporarily until an account is authed or applied to the active account
+    // Initilize typed objects from key/value pairs in storage to either be saved temporarily until an account is authed or applied to the active account
    const getDirectoryConfig = async <T>(type: DirectoryType) =>
      await this.get<T>(SecureStorageKeys.directoryConfigPrefix + type);
    const directoryConfigs: DirectoryConfigurations = {
      ldap: await getDirectoryConfig<LdapConfiguration>(DirectoryType.Ldap),
      gsuite: await getDirectoryConfig<GSuiteConfiguration>(DirectoryType.GSuite),
-      // Azure Active Directory was renamed to Entra ID, but we've kept the old property name
-      // to be backwards compatible with existing configurations.
-      azure: await getDirectoryConfig<EntraIdConfiguration>(DirectoryType.EntraID),
-      entra: await getDirectoryConfig<EntraIdConfiguration>(DirectoryType.EntraID),
+      azure: await getDirectoryConfig<AzureConfiguration>(DirectoryType.AzureActiveDirectory),
      okta: await getDirectoryConfig<OktaConfiguration>(DirectoryType.Okta),
      oneLogin: await getDirectoryConfig<OneLoginConfiguration>(DirectoryType.OneLogin),
    };
--- a/src/services/sync.service.integration.spec.ts
+++ b/src/services/sync.service.integration.spec.ts
@@ -1,132 +0,0 @@
-import { mock, MockProxy } from "jest-mock-extended";
-
-import { ApiService } from "@/jslib/common/src/abstractions/api.service";
-import { CryptoFunctionService } from "@/jslib/common/src/abstractions/cryptoFunction.service";
-import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service";
-import { EnvironmentService } from "@/jslib/common/src/services/environment.service";
-
-import { I18nService } from "../../jslib/common/src/abstractions/i18n.service";
-import { LogService } from "../../jslib/common/src/abstractions/log.service";
-import { groupFixtures } from "../../openldap/group-fixtures";
-import { userFixtures } from "../../openldap/user-fixtures";
-import { DirectoryFactoryService } from "../abstractions/directory-factory.service";
-import { DirectoryType } from "../enums/directoryType";
-import { getLdapConfiguration, getSyncConfiguration } from "../utils/test-fixtures";
-
-import { BatchRequestBuilder } from "./batch-request-builder";
-import { LdapDirectoryService } from "./ldap-directory.service";
-import { SingleRequestBuilder } from "./single-request-builder";
-import { StateService } from "./state.service";
-import { SyncService } from "./sync.service";
-import * as constants from "./sync.service";
-
-describe("SyncService", () => {
-  let logService: MockProxy<LogService>;
-  let i18nService: MockProxy<I18nService>;
-  let stateService: MockProxy<StateService>;
-  let cryptoFunctionService: MockProxy<CryptoFunctionService>;
-  let apiService: MockProxy<ApiService>;
-  let messagingService: MockProxy<MessagingService>;
-  let environmentService: MockProxy<EnvironmentService>;
-  let directoryFactory: MockProxy<DirectoryFactoryService>;
-
-  let batchRequestBuilder: BatchRequestBuilder;
-  let singleRequestBuilder: SingleRequestBuilder;
-  let syncService: SyncService;
-  let directoryService: LdapDirectoryService;
-
-  const originalBatchSize = constants.batchSize;
-
-  beforeEach(() => {
-    logService = mock();
-    i18nService = mock();
-    stateService = mock();
-    cryptoFunctionService = mock();
-    apiService = mock();
-    messagingService = mock();
-    environmentService = mock();
-    directoryFactory = mock();
-
-    stateService.getDirectoryType.mockResolvedValue(DirectoryType.Ldap);
-    stateService.getOrganizationId.mockResolvedValue("fakeId");
-
-    directoryService = new LdapDirectoryService(logService, i18nService, stateService);
-    directoryFactory.createService.mockReturnValue(directoryService);
-
-    batchRequestBuilder = new BatchRequestBuilder();
-    singleRequestBuilder = new SingleRequestBuilder();
-
-    syncService = new SyncService(
-      cryptoFunctionService,
-      apiService,
-      messagingService,
-      i18nService,
-      environmentService,
-      stateService,
-      batchRequestBuilder,
-      singleRequestBuilder,
-      directoryFactory,
-    );
-  });
-
-  describe("OpenLdap integration: ", () => {
-    it("with largeImport disabled matches directory fixture data", async () => {
-      stateService.getDirectory
-        .calledWith(DirectoryType.Ldap)
-        .mockResolvedValue(getLdapConfiguration());
-      stateService.getSync.mockResolvedValue(
-        getSyncConfiguration({
-          users: true,
-          groups: true,
-          largeImport: false,
-          overwriteExisting: false,
-        }),
-      );
-
-      cryptoFunctionService.hash.mockResolvedValue(new ArrayBuffer(1));
-      // This arranges the last hash to be differet from the ArrayBuffer after it is converted to b64
-      stateService.getLastSyncHash.mockResolvedValue("unique hash");
-
-      const syncResult = await syncService.sync(false, false);
-
-      expect(syncResult).toEqual([groupFixtures, userFixtures]);
-
-      expect(apiService.postPublicImportDirectory).toHaveBeenCalledWith(
-        expect.objectContaining({ overwriteExisting: false }),
-      );
-      expect(apiService.postPublicImportDirectory).toHaveBeenCalledTimes(1);
-    });
-
-    it("with largeImport enabled matches directory fixture data", async () => {
-      stateService.getDirectory
-        .calledWith(DirectoryType.Ldap)
-        .mockResolvedValue(getLdapConfiguration());
-      stateService.getSync.mockResolvedValue(
-        getSyncConfiguration({
-          users: true,
-          groups: true,
-          largeImport: true,
-          overwriteExisting: false,
-        }),
-      );
-
-      cryptoFunctionService.hash.mockResolvedValue(new ArrayBuffer(1));
-      // This arranges the last hash to be differet from the ArrayBuffer after it is converted to b64
-      stateService.getLastSyncHash.mockResolvedValue("unique hash");
-
-      // @ts-expect-error This is a workaround to make the batchsize smaller to trigger the batching logic since its a const.
-      constants.batchSize = 4;
-
-      const syncResult = await syncService.sync(false, false);
-
-      expect(syncResult).toEqual([groupFixtures, userFixtures]);
-      expect(apiService.postPublicImportDirectory).toHaveBeenCalledWith(
-        expect.objectContaining({ overwriteExisting: false }),
-      );
-      expect(apiService.postPublicImportDirectory).toHaveBeenCalledTimes(6);
-
-      // @ts-expect-error Reset batch size to original state.
-      constants.batchSize = originalBatchSize;
-    });
-  });
-});
--- a/src/services/sync.service.spec.ts
+++ b/src/services/sync.service.spec.ts
@@ -34,8 +34,6 @@ describe("SyncService", () => {

  let syncService: SyncService;

-  const originalBatchSize = constants.batchSize;
-
  beforeEach(() => {
    cryptoFunctionService = mock();
    apiService = mock();
@@ -117,12 +115,11 @@ describe("SyncService", () => {
    expect(apiService.postPublicImportDirectory).toHaveBeenCalledWith(mockRequests[3]);
    expect(apiService.postPublicImportDirectory).toHaveBeenCalledWith(mockRequests[4]);
    expect(apiService.postPublicImportDirectory).toHaveBeenCalledWith(mockRequests[5]);
-
-    // @ts-expect-error Reset batch size back to original value.
-    constants.batchSize = originalBatchSize;
  });

  it("does not post for the same hash", async () => {
+    // @ts-expect-error this sets the batch size back to its expexted value for this test.
+    constants.batchSize = 2000;
    stateService.getSync.mockResolvedValue(getSyncConfiguration({ groups: true, users: true }));
    cryptoFunctionService.hash.mockResolvedValue(new ArrayBuffer(1));
    // This arranges the last hash to be the same as the ArrayBuffer after it is converted to b64
--- a/src/services/sync.service.ts
+++ b/src/services/sync.service.ts
@@ -83,7 +83,13 @@ export class SyncService {
        return [groups, users];
      }

-      const reqs = this.buildRequest(groups, users, syncConfig);
+      const reqs = this.buildRequest(
+        groups,
+        users,
+        syncConfig.removeDisabled,
+        syncConfig.overwriteExisting,
+        syncConfig.largeImport,
+      );

      const result: HashResult = await this.generateHash(reqs);

@@ -213,12 +219,24 @@ export class SyncService {
  private buildRequest(
    groups: GroupEntry[],
    users: UserEntry[],
-    syncConfig: SyncConfiguration,
+    removeDisabled: boolean,
+    overwriteExisting: boolean,
+    largeImport = false,
  ): OrganizationImportRequest[] {
-    if (syncConfig.largeImport && (groups?.length ?? 0) + (users?.length ?? 0) > batchSize) {
-      return this.batchRequestBuilder.buildRequest(groups, users, syncConfig);
+    if (largeImport && groups.length + users.length > batchSize) {
+      return this.batchRequestBuilder.buildRequest(
+        groups,
+        users,
+        overwriteExisting,
+        removeDisabled,
+      );
    } else {
-      return this.singleRequestBuilder.buildRequest(groups, users, syncConfig);
+      return this.singleRequestBuilder.buildRequest(
+        groups,
+        users,
+        overwriteExisting,
+        removeDisabled,
+      );
    }
  }

--- a/src/utils/request-builder-helper.ts
+++ b/src/utils/request-builder-helper.ts
@@ -1,26 +0,0 @@
-import { GetUniqueString } from "@/jslib/common/spec/utils";
-
-import { GroupEntry } from "../models/groupEntry";
-import { UserEntry } from "../models/userEntry";
-
-export function userSimulator(userCount: number): UserEntry[] {
-  const users: UserEntry[] = [];
-  while (userCount > 0) {
-    const userEntry = new UserEntry();
-    userEntry.email = GetUniqueString() + "@example.com";
-    users.push(userEntry);
-    userCount--;
-  }
-  return users;
-}
-
-export function groupSimulator(groupCount: number): GroupEntry[] {
-  const groups: GroupEntry[] = [];
-  while (groupCount > 0) {
-    const groupEntry = new GroupEntry();
-    groupEntry.name = GetUniqueString();
-    groups.push(groupEntry);
-    groupCount--;
-  }
-  return groups;
-}