updating package lock

# Conflicts:
#	package-lock.json
#	package.json

.claude/CLAUDE.md

@@ -1,7 +1,3 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
 # Bitwarden Directory Connector
 
 ## Project Overview
@@ -24,392 +20,6 @@ Directory Connector is a TypeScript application that synchronizes users and grou
 - Node
 - Jest for testing
 
-### Current Project Status
-
-**Mission Critical but Deprioritized:** Directory Connector is used to sync customer directory services with their Bitwarden organization. While SCIM is the more modern cloud-hosted solution, not all directory services support SCIM, and SCIM is only available on Enterprise plans. Therefore, DC remains mission-critical infrastructure for many paying customers, but it's deprioritized in the codebase due to infrequent changes.
-
-**Isolated Repository:** Unlike other Bitwarden client applications that live in a monorepo with shared core libraries, Directory Connector was kept separate when other TypeScript clients moved to the monorepo. It got its own copy of the jslib repo to avoid unnecessary regressions from apparently unrelated code changes in other clients. This severed it from the rest of the codebase, causing:
-
-- Outdated dependencies that can't be updated (ES modules vs CommonJS conflicts)
-- File/folder structure that doesn't match modern Bitwarden client patterns
-- Accumulated technical debt requiring significant investment to pay down
-- jslib contains unused code from all clients, but cannot be deleted due to monolithic/tightly coupled architecture
-
-**Critical Issues (Current Status):**
-
-- ✅ ~~Electron, Node, and Angular are on unmaintained versions~~ **RESOLVED** - All updated (Electron 39, Node 20, Angular 21, TypeScript 5.9)
-- ❌ `keytar` is archived (Dec 2022) and incompatible with Node v22, **blocking Node upgrades beyond v20** - **PRIMARY BLOCKER**
-- ❌ No ESM support blocks dependency upgrades: googleapis, lowdb, chalk, inquirer, node-fetch, electron-store
-- ⚠️ 70 dev dependencies + 31 runtime dependencies = excessive maintenance burden (count increased with Angular 21 tooling)
-- ❌ StateService is a large pre-StateProvider monolith containing every getter/setter for all clients (PM-31159 In Progress)
-- ✅ ~~Angular CLI not used~~ **RESOLVED** - Angular CLI 21.1.2 now integrated with angular.json configuration
-
-**Development Approach:** When working on this codebase, prioritize sustainability and maintainability over adding new features. Consider how changes will affect long-term maintenance burden.
-
-## Tech Debt Roadmap
-
-### Progress Summary
-
-**Completed:**
-
-- ✅ Phase 0 (Immediate Priority): All major dependencies upgraded (Node 20, Angular 21, TypeScript 5.9, Electron 39)
-- ✅ Phase 6: Angular CLI integration complete
-
-**In Progress:**
-
-- 🔄 Phase 1: StateService rewrite (PM-31159)
-
-**Blocked/Todo:**
-
-- ❌ Phase 2: Remove remaining jslib code (blocked by Phase 1)
-- ❌ Phase 3: Repository restructure (should be done before Phase 5)
-- ⚠️ Phase 4: Replace Keytar **[CRITICAL BLOCKER]** - blocking Node v22+ upgrades
-- ❌ Phase 5: ESM Support (blocked by Phase 3, needed for googleapis, lowdb, chalk, inquirer, etc.)
-
-**Primary Blocker:** Keytar removal (Phase 4) is the most critical task as it blocks Node upgrades beyond v20.
-
----
-
-### ✅ Immediate Priority: Unsupported Dependencies (COMPLETED)
-
-**Upgrade Path (July 2025 release) - STATUS: COMPLETE**
-
-All major version upgrades have been completed and exceeded targets:
-
-1. ✅ Node 18.20.8 → 20.18 → **COMPLETE** (engines: `~20`, .nvmrc: `v20`)
-2. ✅ Angular 17 → 18.2.x → **EXCEEDED** (now at **21.1.1**)
-3. ✅ TypeScript 5.4.5 → 5.6.0 → **EXCEEDED** (now at **5.9.3**)
-4. ✅ Electron 34 → 36 → **EXCEEDED** (now at **39.2.1**)
-5. ✅ Angular matches clients monorepo version (21.x)
-
-**Current Versions:**
-
-- Node: v20 (project target), blocked from v22+ by keytar
-- TypeScript: 5.9.3
-- Angular: 21.1.1 (all packages)
-- Electron: 39.2.1 (well beyond EOL target of 36)
-- @yao-pkg/pkg: 5.16.1 (community fork replacing archived pkg)
-
-**Note:** Further Node upgrades to v22+ are **blocked by keytar** (see Phase 4). Electron 36 was EOL October 2028, but we're already on 39.2.1.
-
-### Phase 1: StateService Rewrite (PM-31159, In Progress)
-
-**Problem:** StateService is a post-account-switching, pre-StateProvider monolith containing every getter/setter for all clients. This prevents deletion of unused data models and code. Never very stable, and more complex than DC needs (DC doesn't need account switching).
-
-**Current Status:** 🔄 **Active PR** - [#990](https://github.com/bitwarden/directory-connector/pull/990) (Open, Author: @BTreston)
-
-- PR created: Feb 2, 2026
-- Last updated: Feb 5, 2026
-- Files changed: 17 files (+1,512, -41 lines)
-- Commits: 4 (scaffold, add tests, fix type issues, fix integration test)
-
-**Implementation Details:**
-
-**New Architecture:**
-
-- Created `StateServiceVNext` interface (`src/abstractions/state-vNext.service.ts`)
-- New implementation: `StateServiceVNextImplementation` (`src/services/state-service/state-vNext.service.ts`)
-- New state model with flat key-value structure (`src/models/state.model.ts`)
-- Comprehensive test suite: `state-vNext.service.spec.ts` (488 lines of tests)
-
-**Storage Key Structure:**
-
-```typescript
-// vNext Storage Keys (Flat key-value structure)
-StorageKeysVNext = {
-  stateVersion: "stateVersion",
-  directoryType: "directoryType",
-  organizationId: "organizationId",
-  directory_ldap: "directory_ldap",
-  directory_gsuite: "directory_gsuite",
-  directory_entra: "directory_entra",
-  directory_okta: "directory_okta",
-  directory_onelogin: "directory_onelogin",
-  sync: "sync",
-  syncingDir: "syncingDir",
-};
-
-// Secure storage keys for sensitive data
-SecureStorageKeysVNext = {
-  ldap: "secret_ldap",
-  gsuite: "secret_gsuite",
-  azure: "secret_azure", // Backwards compatible with old name
-  entra: "secret_entra",
-  okta: "secret_okta",
-  oneLogin: "secret_oneLogin",
-  userDelta: "userDeltaToken",
-  groupDelta: "groupDeltaToken",
-  lastUserSync: "lastUserSync",
-  lastGroupSync: "lastGroupSync",
-  lastSyncHash: "lastSyncHash",
-};
-```
-
-**Migration Strategy:**
-
-- State version bumped to `StateVersion.Five` (`jslib/common/src/enums/stateVersion.ts`)
-- Enhanced `StateMigrationService` to handle migration from old account-based structure to new flat structure
-- Migration keys defined for backwards compatibility (`MigrationKeys`, `SecureStorageKeysMigration`)
-- Temporary keys used during migration (`TempKeys`) to preserve data during transition
-
-**File Organization:**
-
-- State-related files moved to `src/services/state-service/` subdirectory:
-  - `state-vNext.service.ts` (new implementation)
-  - `state-vNext.service.spec.ts` (488 lines of tests)
-  - `state.service.ts` (legacy, moved from `src/services/`)
-  - `stateMigration.service.ts` (enhanced for v5 migration)
-- New abstraction: `src/abstractions/state-vNext.service.ts`
-- New model: `src/models/state.model.ts` (defines all storage keys)
-
-**Integration:**
-
-- Both old `StateService` and new `StateServiceVNext` injected in parallel during migration phase
-- `DirectoryFactoryService` updated to accept both services
-- Services module provides both implementations
-- CLI (`bwdc.ts`) and GUI (`main.ts`) both instantiate new service alongside old one
-
-**Chosen Approach Benefits:**
-
-- Clean break with old StateService - high degree of certainty
-- Simple and focused on DC's needs (no account switching, no rxjs)
-- Flat key-value structure easier to maintain
-- Versioning and migration capabilities included
-- Keeps existing data.json around during transition
-- All getters/setters in one place (acceptable for small application)
-
-**Rejected Approaches:**
-
-- Copy StateProvider from clients: Too complex (supports account switching, rxjs, syncing background/foreground contexts)
-- Rewrite simplified StateService keeping current data structure: Commits us to previous decisions, keeps monolithic account objects
-
-**Next Steps:**
-
-- Complete PR review and merge
-- Monitor for regressions during initial rollout
-- After several releases, can remove old StateService and migration code
-- Begin Phase 2: Remove remaining jslib code that was only needed by old StateService
-
-### Phase 2: Remove Remaining jslib Code
-
-After StateService is removed, review and delete old models and remaining services that referenced each other. jslib contains unused code from all clients that DC doesn't need.
-
-### Phase 3: Restructure Repository (PM-31852, To Do)
-
-**Current Structure:**
-
-```
-src/          # Both Electron and CLI app code
-src-cli/      # package.json entry point for CLI only, no code
-jslib/
-  ├── common/    # Shared common code
-  ├── node/      # Node specific code used in CLI
-  └── electron/  # Electron specific code used in GUI
-```
-
-**Target Structure:**
-
-```
-src-gui/      # Electron specific code only (combining src (partial) + jslib/electron)
-src-cli/      # Node and CLI specific code only (combining src (partial) + jslib/node)
-libs/         # Shared app-independent DC code, e.g. sync services (combining src (partial) + jslib/common)
-```
-
-**Why:** Makes subsequent changes (code reorganizing, ESM support) much easier. This should be done early in the modernization process.
-
-### Phase 4: Replace Keytar (PM-12436, To Do) ⚠️ **CRITICAL BLOCKER**
-
-**Problem:** `keytar` (OS secure storage for secrets) was archived December 2022 and is incompatible with Node v22, **actively blocking Node upgrades beyond v20**.
-
-**Current Status:**
-
-- `keytar`: **7.9.0** (still present in dependencies)
-- **This is the #1 blocker preventing Node v22+ upgrades**
-- All "Immediate Priority" dependencies have been upgraded, but further progress requires removing keytar
-
-**Solution:** Migrate to Bitwarden's Rust implementation in `desktop_native` (same as clients monorepo did)
-
-1. Implement Rust <-> NAPI integration (like `desktop_native/napi`) from Electron app to Rust code
-2. Copy, rename, and expose necessary functions
-3. Point to `desktop_native` crate using git link from DC repo (no need for SDK yet):
-   ```rust
-   desktop_core = { git = "https://github.com/bitwarden/clients", rev = "00cf24972d944638bbd1adc00a0ae3eeabb6eb9a" }
-   ```
-
-**Important:** `keytar` uses wrong encoding on Windows (UTF-8 instead of UTF-16). Bitwarden uses UTF-16. Code should contain a migration - ensure old values are migrated correctly during testing.
-
-**Priority:** This should be prioritized as it's blocking the Node upgrade path and has been archived for over 2 years.
-
-### Phase 5: Add ESM Support (PM-31850, To Do)
-
-**Problem:** No ESM module support prevents upgrading key dependencies.
-
-**Blocked Dependencies (Current Status):**
-
-- ❌ `googleapis`: **149.0.0** → current (major dependency, disabled in renovate.json5)
-- ❌ `lowdb`: **1.0.0** → v7
-- ❌ `@types/lowdb`: **1.0.15** (can be deleted once inquirer is upgraded)
-- ❌ `@electron/notarize`: **2.5.0** → v3.0.1
-- ❌ `chalk`: **4.1.2** → v5.3.0
-- ❌ `inquirer`: **8.2.6** → v12.1.0
-- ❌ `@types/inquirer`: **8.2.10** (should be deleted when inquirer upgraded)
-- ❌ `node-fetch`: **2.7.0** → v3.3.2 (should use native Node fetch API when on Node >=21)
-- ❌ `electron-store`: **8.2.0** → v10.1.0
-
-**Status:** These dependencies remain blocked as expected. They will stay on old versions until:
-
-1. Phase 3 (Repository Restructure) is complete
-2. ESM support is implemented
-3. Note: These ESM dependencies are primarily used in CLI build, so restructuring first (Phase 3) will limit the impact of ESM migration.
-
-**Implementation:**
-
-1. Update tsconfig.json and package.json configurations
-2. Update import/export syntax to no longer use `require` statements
-3. Upgrade dependencies to move away from CommonJS (ESM can import CommonJS, but not vice versa)
-4. Trial and error
-
-**Reference:** [Pure ESM package guide](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c)
-
-### Phase 6: Add Angular CLI (PM-31849, In Progress / Possibly Complete?)
-
-**Problem:** Angular CLI provides great DX and makes it easier to manage Angular changes (e.g. auto-migrations). DC didn't use it.
-
-**Current Status:**
-
-- ✅ `@angular/cli`: **21.1.2** is now present in **runtime dependencies**
-- ✅ `@angular/build`: **21.1.2** is present in dev dependencies
-- ✅ All Angular tooling has been updated to v21.x
-
-**Status:** ✅ **COMPLETE** - Angular CLI has been successfully integrated:
-
-- `angular.json` configuration file exists
-- `.angular/` cache directory present
-- `@angular/cli` 21.1.2 in runtime dependencies
-- `@angular/build` 21.1.2 in dev dependencies
-- All Angular packages updated to v21.x
-
-This migration provides improved DX and access to Angular's auto-migration tools for future updates.
-
-### Additional Considerations
-
-**Reduce Dependency Count:** Current state is 70 dev dependencies + 31 runtime dependencies (101 total). The dev dependency count increased from the original 66 due to Angular 21 upgrade adding additional tooling. After removing old code, review dependency list:
-
-- Can we remove some after code cleanup?
-- Could we reintegrate with monorepo to leverage Component Library and shared platform dependencies?
-  - **Risk:** Becomes tightly coupled with monorepo code → regression risk, move slower due to coupling
-
-**GitHub Workflows:** Need review and modernization:
-
-- PM-20478: Add check-run workflow for CI on community PRs
-- PM-18290: Add linting workflow
-- PM-18289: Update build workflow
-- `pkg` and `pkg-fetch` for packaging Node runtime in CLI release are archived (fork exists but untrusted; clients vets all changes manually)
-  - Options: Make our own fork, or use Node's single executable binary support (investigate)
-
-## Common Development Commands
-
-### Desktop App (Electron + Angular)
-
-**Initial Setup:**
-
-```bash
-npm install              # Install dependencies (runs git submodule init automatically)
-npm run rebuild          # Rebuild native modules for Electron
-```
-
-**Development:**
-
-```bash
-npm run electron         # Build and run desktop app with hot reload and debugging
-npm run electron:ignore  # Same as above but ignores certificate errors
-```
-
-**Building:**
-
-```bash
-npm run build            # Build both main and renderer processes
-npm run build:main       # Build Electron main process only
-npm run build:renderer   # Build Angular renderer process only
-npm run build:renderer:watch  # Build renderer with file watching
-```
-
-**Distribution:**
-
-```bash
-npm run dist:mac         # Create macOS distributable
-npm run dist:win         # Create Windows distributable
-npm run dist:lin         # Create Linux distributable
-```
-
-### CLI (bwdc)
-
-**Development:**
-
-```bash
-npm run build:cli:watch  # Build CLI with file watching
-node ./build-cli/bwdc.js --help  # Run the CLI from build output
-```
-
-**Production Build:**
-
-```bash
-npm run build:cli:prod   # Build CLI for production
-npm run dist:cli         # Create platform-specific CLI executables (all platforms)
-npm run dist:cli:mac     # Create macOS CLI executable only
-npm run dist:cli:win     # Create Windows CLI executable only
-npm run dist:cli:lin     # Create Linux CLI executable only
-```
-
-### Testing
-
-**Unit Tests:**
-
-```bash
-npm test                 # Run unit tests (excludes integration tests)
-npm run test:watch       # Run unit tests in watch mode
-npm run test:watch:all   # Run unit tests in watch mode (all files)
-npm run test:types       # Run TypeScript type checking without emitting files
-```
-
-**Integration Tests:**
-
-```bash
-npm run test:integration:setup  # Set up Docker containers for LDAP testing
-npm run test:integration        # Run integration tests
-npm run test:integration:watch  # Run integration tests in watch mode
-```
-
-Integration tests require Docker and test against live directory services. The setup command creates OpenLDAP containers using docker-compose.yml.
-
-### Linting & Formatting
-
-```bash
-npm run lint             # Run ESLint and Prettier checks
-npm run lint:fix         # Auto-fix ESLint issues
-npm run prettier         # Format all files with Prettier
-```
-
-### Submodule Management
-
-The `jslib` folder is a git submodule containing shared Bitwarden libraries:
-
-```bash
-npm run sub:update       # Update submodule to latest remote version
-npm run sub:pull         # Pull latest changes in submodule
-npm run sub:commit       # Pull and commit submodule update
-```
-
-### Utility Commands
-
-```bash
-npm run reset            # Remove keytar modules and reinstall (use when switching between CLI/desktop)
-npm run clean:dist       # Clean desktop distribution files
-npm run clean:dist:cli   # Clean CLI distribution files
-```
-
-**Important:** When switching between developing the desktop app and CLI, run `npm run reset` to avoid native module conflicts.
-
 ## Code Architecture & Structure
 
 ### Directory Organization
@@ -435,32 +45,6 @@ jslib/                 # Legacy folder structure (mix of deprecated/unused and c
 3. **Directory Service Pattern**: Each directory provider implements `IDirectoryService` interface
 4. **Separation of Concerns**: GUI (Angular app) and CLI (commands) share the same service layer
 
-### Core Synchronization Flow
-
-The sync process follows this pattern:
-
-1. **DirectoryFactoryService** (`src/services/directory-factory.service.ts`) - Creates the appropriate directory service based on DirectoryType configuration
-2. **IDirectoryService** implementation (`src/services/directory-services/*.service.ts`) - Each provider (LDAP, Entra ID, Google, Okta, OneLogin) implements:
-   - `getEntries(force, test)` - Returns `[GroupEntry[], UserEntry[]]`
-   - Provider-specific authentication and API calls
-3. **SyncService** (`src/services/sync.service.ts`) - Orchestrates the sync:
-   - Calls directory service to get entries
-   - Filters and deduplicates users/groups
-   - Uses BatchRequestBuilder or SingleRequestBuilder to format API requests
-   - Generates hash to detect changes and avoid redundant syncs
-   - Sends data to Bitwarden API via ApiService
-4. **Request Builders** (`src/services/*-request-builder.ts`) - Transform directory entries into Bitwarden API format
-
-### Shared Library (jslib)
-
-The `jslib` folder is a git submodule containing shared Bitwarden code:
-
-- Common services (API, Crypto, Storage, Auth)
-- Platform utilities
-- Shared models and abstractions
-
-**Important:** This is legacy structure - do not add new code to jslib. New code should go in `src/`.
-
 ## Development Conventions
 
 ### Code Organization

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,3 +9,26 @@
 ## 📸 Screenshots
 
 <!-- Required for any UI changes; delete if not applicable. Use fixed width images for better display. -->
+
+## ⏰ Reminders before review
+
+- Contributor guidelines followed
+- All formatters and local linters executed and passed
+- Written new unit and / or integration tests where applicable
+- Used internationalization (i18n) for all UI strings
+- CI builds passed
+- Communicated to DevOps any deployment requirements
+- Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team
+
+## 🦮 Reviewer guidelines
+
+<!-- Suggested interactions but feel free to use (or not) as you desire! -->
+
+- 👍 (`:+1:`) or similar for great changes
+- 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info
+- ❓ (`:question:`) for questions
+- 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
+- 🎨 (`:art:`) for suggestions / improvements
+- ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention
+- 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt
+- ⛏ (`:pick:`) for minor or nitpick changes

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
       node_version: ${{ steps.retrieve-node-version.outputs.node_version }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 
@@ -51,12 +51,12 @@ jobs:
       contents: read
     steps:
       - name: Checkout repo
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 
       - name: Set up Node
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
@@ -129,12 +129,12 @@ jobs:
       _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 
       - name: Set up Node
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
@@ -200,7 +200,7 @@ jobs:
       _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 
@@ -209,7 +209,7 @@ jobs:
           choco install checksum --no-progress
 
       - name: Set up Node
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
@@ -279,12 +279,12 @@ jobs:
       HUSKY: 0
     steps:
       - name: Checkout repo
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 
       - name: Set up Node
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
@@ -379,12 +379,12 @@ jobs:
       HUSKY: 0
     steps:
       - name: Checkout repo
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 
       - name: Set up Node
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
@@ -439,12 +439,12 @@ jobs:
       HUSKY: 0
     steps:
       - name: Checkout repo
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 
       - name: Set up Node
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'

.github/workflows/integration-test.yml

@@ -40,7 +40,7 @@ jobs:
 
     steps:
       - name: Check out repo
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 
@@ -52,7 +52,7 @@ jobs:
           echo "node_version=$NODE_VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Set up Node
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
@@ -129,7 +129,7 @@ jobs:
 
       - name: Report test results
         id: report
-        uses: dorny/test-reporter@b082adf0eced0765477756c2a610396589b8c637 # v2.5.0
+        uses: dorny/test-reporter@fe45e9537387dac839af0d33ba56eed8e24189e8 # v2.3.0
         # This will skip the job if it's a pull request from a fork, because that won't have permission to upload test results.
         # PRs from the repository and all other events are OK.
         if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event.pull_request.head.repo.full_name == github.repository) && !cancelled()
@@ -143,6 +143,4 @@ jobs:
         uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
 
       - name: Upload results to codecov.io
-        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
-        with:
-          report_type: test_results
+        uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
       release_version: ${{ steps.version.outputs.version }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 

.github/workflows/test.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Check out repo
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 
@@ -34,7 +34,7 @@ jobs:
           echo "node_version=$NODE_VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Set up Node
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
@@ -53,7 +53,7 @@ jobs:
         run: npm run test --coverage
 
       - name: Report test results
-        uses: dorny/test-reporter@b082adf0eced0765477756c2a610396589b8c637 # v2.5.0
+        uses: dorny/test-reporter@fe45e9537387dac839af0d33ba56eed8e24189e8 # v2.3.0
         # This will skip the job if it's a pull request from a fork, because that won't have permission to upload test results.
         # PRs from the repository and all other events are OK.
         if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event.pull_request.head.repo.full_name == github.repository) && !cancelled()
@@ -67,6 +67,4 @@ jobs:
         uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
 
       - name: Upload results to codecov.io
-        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
-        with:
-          report_type: test_results
+        uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1

.github/workflows/version-bump.yml

@@ -50,7 +50,7 @@ jobs:
           permission-contents: write
 
       - name: Checkout Branch
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           token: ${{ steps.app-token.outputs.token }}
           persist-credentials: true

angular.json

@@ -18,17 +18,15 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular/build:application",
+          "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": {
-              "base": "dist"
-            },
+            "outputPath": "dist",
             "index": "src/index.html",
+            "main": "src/main.ts",
             "tsConfig": "tsconfig.json",
             "assets": [],
             "styles": [],
-            "scripts": [],
-            "browser": "src/main.ts"
+            "scripts": []
           }
         }
       }

jslib/angular/src/components/toastr.component.ts

@@ -1,77 +1,75 @@
+import { animate, state, style, transition, trigger } from "@angular/animations";
 import { CommonModule } from "@angular/common";
 import { Component, ModuleWithProviders, NgModule } from "@angular/core";
-import { DefaultNoComponentGlobalConfig, GlobalConfig, Toast, TOAST_CONFIG } from "ngx-toastr";
+import {
+  DefaultNoComponentGlobalConfig,
+  GlobalConfig,
+  Toast as BaseToast,
+  ToastPackage,
+  ToastrService,
+  TOAST_CONFIG,
+} from "ngx-toastr";
 
 @Component({
   selector: "[toast-component2]",
   template: `
-    @if (options().closeButton) {
-      <button (click)="remove()" type="button" class="toast-close-button" aria-label="Close">
-        <span aria-hidden="true">&times;</span>
-      </button>
-    }
+    <button
+      *ngIf="options.closeButton"
+      (click)="remove()"
+      type="button"
+      class="toast-close-button"
+      aria-label="Close"
+    >
+      <span aria-hidden="true">&times;</span>
+    </button>
     <div class="icon">
       <i></i>
     </div>
     <div>
-      @if (title()) {
-        <div [class]="options().titleClass" [attr.aria-label]="title()">
-          {{ title() }}
-          @if (duplicatesCount) {
-            [{{ duplicatesCount + 1 }}]
-          }
-        </div>
-      }
-      @if (message() && options().enableHtml) {
-        <div
-          role="alertdialog"
-          aria-live="polite"
-          [class]="options().messageClass"
-          [innerHTML]="message()"
-        ></div>
-      }
-      @if (message() && !options().enableHtml) {
-        <div
-          role="alertdialog"
-          aria-live="polite"
-          [class]="options().messageClass"
-          [attr.aria-label]="message()"
-        >
-          {{ message() }}
-        </div>
-      }
-    </div>
-    @if (options().progressBar) {
-      <div>
-        <div class="toast-progress" [style.width]="width + '%'"></div>
+      <div *ngIf="title" [class]="options.titleClass" [attr.aria-label]="title">
+        {{ title }} <ng-container *ngIf="duplicatesCount">[{{ duplicatesCount + 1 }}]</ng-container>
       </div>
-    }
-  `,
-  styles: `
-    :host {
-      &.toast-in {
-        animation: toast-animation var(--animation-duration) var(--animation-easing);
-      }
-
-      &.toast-out {
-        animation: toast-animation var(--animation-duration) var(--animation-easing) reverse
-          forwards;
-      }
-    }
-
-    @keyframes toast-animation {
-      from {
-        opacity: 0;
-      }
-      to {
-        opacity: 1;
-      }
-    }
+      <div
+        *ngIf="message && options.enableHtml"
+        role="alertdialog"
+        aria-live="polite"
+        [class]="options.messageClass"
+        [innerHTML]="message"
+      ></div>
+      <div
+        *ngIf="message && !options.enableHtml"
+        role="alertdialog"
+        aria-live="polite"
+        [class]="options.messageClass"
+        [attr.aria-label]="message"
+      >
+        {{ message }}
+      </div>
+    </div>
+    <div *ngIf="options.progressBar">
+      <div class="toast-progress" [style.width]="width + '%'"></div>
+    </div>
   `,
+  animations: [
+    trigger("flyInOut", [
+      state("inactive", style({ opacity: 0 })),
+      state("active", style({ opacity: 1 })),
+      state("removed", style({ opacity: 0 })),
+      transition("inactive => active", animate("{{ easeTime }}ms {{ easing }}")),
+      transition("active => removed", animate("{{ easeTime }}ms {{ easing }}")),
+    ]),
+  ],
   preserveWhitespaces: false,
   standalone: false,
 })
-export class BitwardenToast extends Toast {}
+export class BitwardenToast extends BaseToast {
+  constructor(
+    protected toastrService: ToastrService,
+    public toastPackage: ToastPackage,
+  ) {
+    super(toastrService, toastPackage);
+  }
+}
 
 export const BitwardenToastGlobalConfig: GlobalConfig = {
   ...DefaultNoComponentGlobalConfig,

jslib/common/spec/domain/encString.spec.ts

@@ -0,0 +1,195 @@
+import { Substitute, Arg } from "@fluffy-spoon/substitute";
+
+import { CryptoService } from "@/jslib/common/src/abstractions/crypto.service";
+import { EncryptionType } from "@/jslib/common/src/enums/encryptionType";
+import { EncString } from "@/jslib/common/src/models/domain/encString";
+import { SymmetricCryptoKey } from "@/jslib/common/src/models/domain/symmetricCryptoKey";
+import { ContainerService } from "@/jslib/common/src/services/container.service";
+
+describe("EncString", () => {
+  afterEach(() => {
+    (window as any).bitwardenContainerService = undefined;
+  });
+
+  describe("Rsa2048_OaepSha256_B64", () => {
+    it("constructor", () => {
+      const encString = new EncString(EncryptionType.Rsa2048_OaepSha256_B64, "data");
+
+      expect(encString).toEqual({
+        data: "data",
+        encryptedString: "3.data",
+        encryptionType: 3,
+      });
+    });
+
+    describe("parse existing", () => {
+      it("valid", () => {
+        const encString = new EncString("3.data");
+
+        expect(encString).toEqual({
+          data: "data",
+          encryptedString: "3.data",
+          encryptionType: 3,
+        });
+      });
+
+      it("invalid", () => {
+        const encString = new EncString("3.data|test");
+
+        expect(encString).toEqual({
+          encryptedString: "3.data|test",
+          encryptionType: 3,
+        });
+      });
+    });
+
+    describe("decrypt", () => {
+      const encString = new EncString(EncryptionType.Rsa2048_OaepSha256_B64, "data");
+
+      const cryptoService = Substitute.for<CryptoService>();
+      cryptoService.getOrgKey(null).resolves(null);
+      cryptoService.decryptToUtf8(encString, Arg.any()).resolves("decrypted");
+
+      beforeEach(() => {
+        (window as any).bitwardenContainerService = new ContainerService(cryptoService);
+      });
+
+      it("decrypts correctly", async () => {
+        const decrypted = await encString.decrypt(null);
+
+        expect(decrypted).toBe("decrypted");
+      });
+
+      it("result should be cached", async () => {
+        const decrypted = await encString.decrypt(null);
+        cryptoService.received(1).decryptToUtf8(Arg.any(), Arg.any());
+
+        expect(decrypted).toBe("decrypted");
+      });
+    });
+  });
+
+  describe("AesCbc256_B64", () => {
+    it("constructor", () => {
+      const encString = new EncString(EncryptionType.AesCbc256_B64, "data", "iv");
+
+      expect(encString).toEqual({
+        data: "data",
+        encryptedString: "0.iv|data",
+        encryptionType: 0,
+        iv: "iv",
+      });
+    });
+
+    describe("parse existing", () => {
+      it("valid", () => {
+        const encString = new EncString("0.iv|data");
+
+        expect(encString).toEqual({
+          data: "data",
+          encryptedString: "0.iv|data",
+          encryptionType: 0,
+          iv: "iv",
+        });
+      });
+
+      it("invalid", () => {
+        const encString = new EncString("0.iv|data|mac");
+
+        expect(encString).toEqual({
+          encryptedString: "0.iv|data|mac",
+          encryptionType: 0,
+        });
+      });
+    });
+  });
+
+  describe("AesCbc256_HmacSha256_B64", () => {
+    it("constructor", () => {
+      const encString = new EncString(EncryptionType.AesCbc256_HmacSha256_B64, "data", "iv", "mac");
+
+      expect(encString).toEqual({
+        data: "data",
+        encryptedString: "2.iv|data|mac",
+        encryptionType: 2,
+        iv: "iv",
+        mac: "mac",
+      });
+    });
+
+    it("valid", () => {
+      const encString = new EncString("2.iv|data|mac");
+
+      expect(encString).toEqual({
+        data: "data",
+        encryptedString: "2.iv|data|mac",
+        encryptionType: 2,
+        iv: "iv",
+        mac: "mac",
+      });
+    });
+
+    it("invalid", () => {
+      const encString = new EncString("2.iv|data");
+
+      expect(encString).toEqual({
+        encryptedString: "2.iv|data",
+        encryptionType: 2,
+      });
+    });
+  });
+
+  it("Exit early if null", () => {
+    const encString = new EncString(null);
+
+    expect(encString).toEqual({
+      encryptedString: null,
+    });
+  });
+
+  describe("decrypt", () => {
+    it("throws exception when bitwarden container not initialized", async () => {
+      const encString = new EncString(null);
+
+      expect.assertions(1);
+      try {
+        await encString.decrypt(null);
+      } catch (e) {
+        expect(e.message).toEqual("global bitwardenContainerService not initialized.");
+      }
+    });
+
+    it("handles value it can't decrypt", async () => {
+      const encString = new EncString(null);
+
+      const cryptoService = Substitute.for<CryptoService>();
+      cryptoService.getOrgKey(null).resolves(null);
+      cryptoService.decryptToUtf8(encString, Arg.any()).throws("error");
+
+      (window as any).bitwardenContainerService = new ContainerService(cryptoService);
+
+      const decrypted = await encString.decrypt(null);
+
+      expect(decrypted).toBe("[error: cannot decrypt]");
+
+      expect(encString).toEqual({
+        decryptedValue: "[error: cannot decrypt]",
+        encryptedString: null,
+      });
+    });
+
+    it("passes along key", async () => {
+      const encString = new EncString(null);
+      const key = Substitute.for<SymmetricCryptoKey>();
+
+      const cryptoService = Substitute.for<CryptoService>();
+      cryptoService.getOrgKey(null).resolves(null);
+
+      (window as any).bitwardenContainerService = new ContainerService(cryptoService);
+
+      await encString.decrypt(null, key);
+
+      cryptoService.received().decryptToUtf8(encString, key);
+    });
+  });
+});

jslib/common/spec/domain/symmetricCryptoKey.spec.ts

@@ -9,19 +9,19 @@ describe("SymmetricCryptoKey", () => {
       new SymmetricCryptoKey(null);
     };
 
-    expect(t).toThrow("Must provide key");
+    expect(t).toThrowError("Must provide key");
   });
 
   describe("guesses encKey from key length", () => {
     it("AesCbc256_B64", () => {
       const key = makeStaticByteArray(32);
-      const cryptoKey = new SymmetricCryptoKey(key);
+      const cryptoKey = new SymmetricCryptoKey(key.buffer as ArrayBuffer);
 
       expect(cryptoKey).toEqual({
-        encKey: key,
+        encKey: key.buffer,
         encKeyB64: "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=",
         encType: 0,
-        key: key,
+        key: key.buffer,
         keyB64: "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=",
         macKey: null,
       });
@@ -29,41 +29,41 @@ describe("SymmetricCryptoKey", () => {
 
     it("AesCbc128_HmacSha256_B64", () => {
       const key = makeStaticByteArray(32);
-      const cryptoKey = new SymmetricCryptoKey(key, EncryptionType.AesCbc128_HmacSha256_B64);
+      const cryptoKey = new SymmetricCryptoKey(key.buffer as ArrayBuffer, EncryptionType.AesCbc128_HmacSha256_B64);
 
       expect(cryptoKey).toEqual({
-        encKey: key.slice(0, 16),
+        encKey: key.buffer.slice(0, 16),
         encKeyB64: "AAECAwQFBgcICQoLDA0ODw==",
         encType: 1,
-        key: key,
+        key: key.buffer,
         keyB64: "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=",
-        macKey: key.slice(16, 32),
+        macKey: key.buffer.slice(16, 32),
         macKeyB64: "EBESExQVFhcYGRobHB0eHw==",
       });
     });
 
     it("AesCbc256_HmacSha256_B64", () => {
       const key = makeStaticByteArray(64);
-      const cryptoKey = new SymmetricCryptoKey(key);
+      const cryptoKey = new SymmetricCryptoKey(key.buffer as ArrayBuffer);
 
       expect(cryptoKey).toEqual({
-        encKey: key.slice(0, 32),
+        encKey: key.buffer.slice(0, 32),
         encKeyB64: "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=",
         encType: 2,
-        key: key,
+        key: key.buffer,
         keyB64:
           "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+Pw==",
-        macKey: key.slice(32, 64),
+        macKey: key.buffer.slice(32, 64),
         macKeyB64: "ICEiIyQlJicoKSorLC0uLzAxMjM0NTY3ODk6Ozw9Pj8=",
       });
     });
 
     it("unknown length", () => {
       const t = () => {
-        new SymmetricCryptoKey(makeStaticByteArray(30));
+        new SymmetricCryptoKey(makeStaticByteArray(30).buffer as ArrayBuffer);
       };
 
-      expect(t).toThrow("Unable to determine encType.");
+      expect(t).toThrowError("Unable to determine encType.");
     });
   });
 });

jslib/common/spec/services/stateMigration.service.ts

@@ -0,0 +1,84 @@
+import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
+
+import { StorageService } from "@/jslib/common/src/abstractions/storage.service";
+import { StateVersion } from "@/jslib/common/src/enums/stateVersion";
+import { StateFactory } from "@/jslib/common/src/factories/stateFactory";
+import { Account } from "@/jslib/common/src/models/domain/account";
+import { GlobalState } from "@/jslib/common/src/models/domain/globalState";
+import { StateMigrationService } from "@/jslib/common/src/services/stateMigration.service";
+
+const userId = "USER_ID";
+
+describe("State Migration Service", () => {
+  let storageService: SubstituteOf<StorageService>;
+  let secureStorageService: SubstituteOf<StorageService>;
+  let stateFactory: SubstituteOf<StateFactory>;
+
+  let stateMigrationService: StateMigrationService;
+
+  beforeEach(() => {
+    storageService = Substitute.for<StorageService>();
+    secureStorageService = Substitute.for<StorageService>();
+    stateFactory = Substitute.for<StateFactory>();
+
+    stateMigrationService = new StateMigrationService(
+      storageService,
+      secureStorageService,
+      stateFactory,
+    );
+  });
+
+  describe("StateVersion 3 to 4 migration", async () => {
+    beforeEach(() => {
+      const globalVersion3: Partial<GlobalState> = {
+        stateVersion: StateVersion.Three,
+      };
+
+      storageService.get("global", Arg.any()).resolves(globalVersion3);
+      storageService.get("authenticatedAccounts", Arg.any()).resolves([userId]);
+    });
+
+    it("clears everBeenUnlocked", async () => {
+      const accountVersion3: Account = {
+        profile: {
+          apiKeyClientId: null,
+          convertAccountToKeyConnector: null,
+          email: "EMAIL",
+          emailVerified: true,
+          everBeenUnlocked: true,
+          hasPremiumPersonally: false,
+          kdfIterations: 100000,
+          kdfType: 0,
+          keyHash: "KEY_HASH",
+          lastSync: "LAST_SYNC",
+          userId: userId,
+          usesKeyConnector: false,
+          forcePasswordReset: false,
+        },
+      };
+
+      const expectedAccountVersion4: Account = {
+        profile: {
+          ...accountVersion3.profile,
+        },
+      };
+      delete expectedAccountVersion4.profile.everBeenUnlocked;
+
+      storageService.get(userId, Arg.any()).resolves(accountVersion3);
+
+      await stateMigrationService.migrate();
+
+      storageService.received(1).save(userId, expectedAccountVersion4, Arg.any());
+    });
+
+    it("updates StateVersion number", async () => {
+      await stateMigrationService.migrate();
+
+      storageService.received(1).save(
+        "global",
+        Arg.is((globals: GlobalState) => globals.stateVersion === StateVersion.Four),
+        Arg.any(),
+      );
+    });
+  });
+});

jslib/common/spec/utils.ts

@@ -1,3 +1,7 @@
+import { Substitute, Arg } from "@fluffy-spoon/substitute";
+
+import { EncString } from "@/jslib/common/src/models/domain/encString";
+
 function newGuid() {
   return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
     const r = (Math.random() * 16) | 0;
@@ -17,10 +21,17 @@ export function BuildTestObject<T, K extends keyof T = keyof T>(
   return Object.assign(constructor === null ? {} : new constructor(), def) as T;
 }
 
+export function mockEnc(s: string): EncString {
+  const mock = Substitute.for<EncString>();
+  mock.decrypt(Arg.any(), Arg.any()).resolves(s);
+
+  return mock;
+}
+
 export function makeStaticByteArray(length: number, start = 0) {
   const arr = new Uint8Array(length);
   for (let i = 0; i < length; i++) {
     arr[i] = start + i;
   }
-  return arr.buffer;
+  return arr;
 }

jslib/common/src/misc/nodeUtils.ts

@@ -26,4 +26,9 @@ export class NodeUtils {
         .on("error", (err) => reject(err));
     });
   }
+
+  // https://stackoverflow.com/a/31394257
+  static bufferToArrayBuffer(buf: Buffer): ArrayBuffer {
+    return buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength) as ArrayBuffer;
+  }
 }

jslib/common/src/misc/utils.ts

@@ -36,7 +36,7 @@ export class Utils {
     Utils.global = Utils.isNode && !Utils.isBrowser ? global : window;
   }
 
-  static fromB64ToArray(str: string): Uint8Array<ArrayBuffer> {
+  static fromB64ToArray(str: string): Uint8Array {
     if (Utils.isNode) {
       return new Uint8Array(Buffer.from(str, "base64"));
     } else {
@@ -49,11 +49,11 @@ export class Utils {
     }
   }
 
-  static fromUrlB64ToArray(str: string): Uint8Array<ArrayBuffer> {
+  static fromUrlB64ToArray(str: string): Uint8Array {
     return Utils.fromB64ToArray(Utils.fromUrlB64ToB64(str));
   }
 
-  static fromHexToArray(str: string): Uint8Array<ArrayBuffer> {
+  static fromHexToArray(str: string): Uint8Array {
     if (Utils.isNode) {
       return new Uint8Array(Buffer.from(str, "hex"));
     } else {
@@ -65,7 +65,7 @@ export class Utils {
     }
   }
 
-  static fromUtf8ToArray(str: string): Uint8Array<ArrayBuffer> {
+  static fromUtf8ToArray(str: string): Uint8Array {
     if (Utils.isNode) {
       return new Uint8Array(Buffer.from(str, "utf8"));
     } else {
@@ -78,7 +78,7 @@ export class Utils {
     }
   }
 
-  static fromByteStringToArray(str: string): Uint8Array<ArrayBuffer> {
+  static fromByteStringToArray(str: string): Uint8Array {
     const arr = new Uint8Array(str.length);
     for (let i = 0; i < str.length; i++) {
       arr[i] = str.charCodeAt(i);
@@ -99,8 +99,8 @@ export class Utils {
     }
   }
 
-  static fromBufferToUrlB64(buffer: Uint8Array<ArrayBuffer>): string {
-    return Utils.fromB64toUrlB64(Utils.fromBufferToB64(buffer.buffer));
+  static fromBufferToUrlB64(buffer: ArrayBuffer): string {
+    return Utils.fromB64toUrlB64(Utils.fromBufferToB64(buffer));
   }
 
   static fromB64toUrlB64(b64Str: string) {
@@ -164,7 +164,7 @@ export class Utils {
   }
 
   static fromUtf8ToUrlB64(utfStr: string): string {
-    return Utils.fromBufferToUrlB64(Utils.fromUtf8ToArray(utfStr));
+    return Utils.fromBufferToUrlB64(Utils.fromUtf8ToArray(utfStr).buffer as ArrayBuffer);
   }
 
   static fromB64ToUtf8(b64Str: string): string {

jslib/common/src/models/response/twoFactorWebAuthnResponse.ts

@@ -42,9 +42,9 @@ export class ChallengeResponse extends BaseResponse implements PublicKeyCredenti
     super(response);
     this.attestation = this.getResponseProperty("attestation");
     this.authenticatorSelection = this.getResponseProperty("authenticatorSelection");
-    this.challenge = Utils.fromUrlB64ToArray(this.getResponseProperty("challenge"));
+    this.challenge = Utils.fromUrlB64ToArray(this.getResponseProperty("challenge")) as Uint8Array<ArrayBuffer>;
     this.excludeCredentials = this.getResponseProperty("excludeCredentials").map((c: any) => {
-      c.id = Utils.fromUrlB64ToArray(c.id).buffer;
+      c.id = Utils.fromUrlB64ToArray(c.id).buffer as ArrayBuffer;
       return c;
     });
     this.extensions = this.getResponseProperty("extensions");

jslib/common/src/services/crypto.service.ts

@@ -109,7 +109,7 @@ export class CryptoService implements CryptoServiceAbstraction {
   ): Promise<SymmetricCryptoKey> {
     const key = await this.retrieveKeyFromStorage(keySuffix, userId);
     if (key != null) {
-      const symmetricKey = new SymmetricCryptoKey(Utils.fromB64ToArray(key).buffer);
+      const symmetricKey = new SymmetricCryptoKey(Utils.fromB64ToArray(key).buffer as ArrayBuffer);
 
       if (!(await this.validateKey(symmetricKey))) {
         this.logService.warning("Wrong key, throwing away stored key");
@@ -512,7 +512,7 @@ export class CryptoService implements CryptoServiceAbstraction {
 
     let plainBuf: ArrayBuffer;
     if (typeof plainValue === "string") {
-      plainBuf = Utils.fromUtf8ToArray(plainValue).buffer;
+      plainBuf = Utils.fromUtf8ToArray(plainValue).buffer as ArrayBuffer;
     } else {
       plainBuf = plainValue;
     }
@@ -539,7 +539,7 @@ export class CryptoService implements CryptoServiceAbstraction {
     }
 
     encBytes.set(new Uint8Array(encValue.data), 1 + encValue.iv.byteLength + macLen);
-    return new EncArrayBuffer(encBytes.buffer);
+    return new EncArrayBuffer(encBytes.buffer as ArrayBuffer);
   }
 
   async rsaEncrypt(data: ArrayBuffer, publicKey?: ArrayBuffer): Promise<EncString> {
@@ -585,7 +585,7 @@ export class CryptoService implements CryptoServiceAbstraction {
       throw new Error("encPieces unavailable.");
     }
 
-    const data = Utils.fromB64ToArray(encPieces[0]).buffer;
+    const data = Utils.fromB64ToArray(encPieces[0]).buffer as ArrayBuffer;
     const privateKey = privateKeyValue ?? (await this.getPrivateKey());
     if (privateKey == null) {
       throw new Error("No private key.");
@@ -608,9 +608,9 @@ export class CryptoService implements CryptoServiceAbstraction {
   }
 
   async decryptToBytes(encString: EncString, key?: SymmetricCryptoKey): Promise<ArrayBuffer> {
-    const iv = Utils.fromB64ToArray(encString.iv).buffer;
-    const data = Utils.fromB64ToArray(encString.data).buffer;
-    const mac = encString.mac ? Utils.fromB64ToArray(encString.mac).buffer : null;
+    const iv = Utils.fromB64ToArray(encString.iv).buffer as ArrayBuffer;
+    const data = Utils.fromB64ToArray(encString.data).buffer as ArrayBuffer;
+    const mac = encString.mac ? Utils.fromB64ToArray(encString.mac).buffer as ArrayBuffer : null;
     const decipher = await this.aesDecryptToBytes(encString.encryptionType, data, iv, mac, key);
     if (decipher == null) {
       return null;
@@ -636,9 +636,9 @@ export class CryptoService implements CryptoServiceAbstraction {
 
     const encBytes = new Uint8Array(encBuf);
     const encType = encBytes[0];
-    let ctBytes: Uint8Array<ArrayBuffer> = null;
-    let ivBytes: Uint8Array<ArrayBuffer> = null;
-    let macBytes: Uint8Array<ArrayBuffer> = null;
+    let ctBytes: Uint8Array = null;
+    let ivBytes: Uint8Array = null;
+    let macBytes: Uint8Array = null;
 
     switch (encType) {
       case EncryptionType.AesCbc128_HmacSha256_B64:
@@ -667,9 +667,9 @@ export class CryptoService implements CryptoServiceAbstraction {
 
     return await this.aesDecryptToBytes(
       encType,
-      ctBytes.buffer,
-      ivBytes.buffer,
-      macBytes != null ? macBytes.buffer : null,
+      ctBytes.buffer as ArrayBuffer,
+      ivBytes.buffer as ArrayBuffer,
+      macBytes != null ? macBytes.buffer as ArrayBuffer : null,
       key,
     );
   }
@@ -766,7 +766,7 @@ export class CryptoService implements CryptoServiceAbstraction {
       const macData = new Uint8Array(obj.iv.byteLength + obj.data.byteLength);
       macData.set(new Uint8Array(obj.iv), 0);
       macData.set(new Uint8Array(obj.data), obj.iv.byteLength);
-      obj.mac = await this.cryptoFunctionService.hmac(macData.buffer, obj.key.macKey, "sha256");
+      obj.mac = await this.cryptoFunctionService.hmac(macData.buffer as ArrayBuffer, obj.key.macKey, "sha256");
     }
 
     return obj;
@@ -832,7 +832,7 @@ export class CryptoService implements CryptoServiceAbstraction {
       macData.set(new Uint8Array(iv), 0);
       macData.set(new Uint8Array(data), iv.byteLength);
       const computedMac = await this.cryptoFunctionService.hmac(
-        macData.buffer,
+        macData.buffer as ArrayBuffer,
         theKey.macKey,
         "sha256",
       );
@@ -889,7 +889,7 @@ export class CryptoService implements CryptoServiceAbstraction {
     const macKey = await this.cryptoFunctionService.hkdfExpand(key.key, "mac", 32, "sha256");
     newKey.set(new Uint8Array(encKey));
     newKey.set(new Uint8Array(macKey), 32);
-    return new SymmetricCryptoKey(newKey.buffer);
+    return new SymmetricCryptoKey(newKey.buffer as ArrayBuffer);
   }
 
   private async hashPhrase(hash: ArrayBuffer, minimumEntropy = 64) {

jslib/electron/src/window.main.ts

@@ -127,13 +127,6 @@ export class WindowMain {
       },
     });
 
-    // Enable SharedArrayBuffer. See https://developer.chrome.com/blog/enabling-shared-array-buffer/#cross-origin-isolation
-    this.win.webContents.session.webRequest.onHeadersReceived((details, callback) => {
-      details.responseHeaders["Cross-Origin-Opener-Policy"] = ["same-origin"];
-      details.responseHeaders["Cross-Origin-Embedder-Policy"] = ["require-corp"];
-      callback({ responseHeaders: details.responseHeaders });
-    });
-
     if (this.windowStates[mainWindowSizeKey].isMaximized) {
       this.win.maximize();
     }

jslib/node/spec/services/nodeCryptoFunction.service.spec.ts

@@ -94,7 +94,7 @@ describe("NodeCrypto Function Service", () => {
     it("should fail with prk too small", async () => {
       const cryptoFunctionService = new NodeCryptoFunctionService();
       const f = cryptoFunctionService.hkdfExpand(
-        Utils.fromB64ToArray(prk16Byte).buffer,
+        Utils.fromB64ToArray(prk16Byte).buffer as ArrayBuffer,
         "info",
         32,
         "sha256",
@@ -105,7 +105,7 @@ describe("NodeCrypto Function Service", () => {
     it("should fail with outputByteSize is too large", async () => {
       const cryptoFunctionService = new NodeCryptoFunctionService();
       const f = cryptoFunctionService.hkdfExpand(
-        Utils.fromB64ToArray(prk32Byte).buffer,
+        Utils.fromB64ToArray(prk32Byte).buffer as ArrayBuffer,
         "info",
         8161,
         "sha256",
@@ -170,9 +170,9 @@ describe("NodeCrypto Function Service", () => {
       const key = makeStaticByteArray(32);
       const data = Utils.fromUtf8ToArray("EncryptMe!");
       const encValue = await nodeCryptoFunctionService.aesEncrypt(
-        data.buffer,
-        iv.buffer,
-        key.buffer,
+        data.buffer as ArrayBuffer,
+        iv.buffer as ArrayBuffer,
+        key.buffer as ArrayBuffer,
       );
       expect(Utils.fromBufferToB64(encValue)).toBe("ByUF8vhyX4ddU9gcooznwA==");
     });
@@ -184,11 +184,11 @@ describe("NodeCrypto Function Service", () => {
       const value = "EncryptMe!";
       const data = Utils.fromUtf8ToArray(value);
       const encValue = await nodeCryptoFunctionService.aesEncrypt(
-        data.buffer,
-        iv.buffer,
-        key.buffer,
+        data.buffer as ArrayBuffer,
+        iv.buffer as ArrayBuffer,
+        key.buffer as ArrayBuffer,
       );
-      const decValue = await nodeCryptoFunctionService.aesDecrypt(encValue, iv.buffer, key.buffer);
+      const decValue = await nodeCryptoFunctionService.aesDecrypt(encValue, iv.buffer as ArrayBuffer, key.buffer as ArrayBuffer);
       expect(Utils.fromBufferToUtf8(decValue)).toBe(value);
     });
   });
@@ -196,8 +196,8 @@ describe("NodeCrypto Function Service", () => {
   describe("aesDecryptFast", () => {
     it("should successfully decrypt data", async () => {
       const nodeCryptoFunctionService = new NodeCryptoFunctionService();
-      const iv = Utils.fromBufferToB64(makeStaticByteArray(16).buffer);
-      const symKey = new SymmetricCryptoKey(makeStaticByteArray(32).buffer);
+      const iv = Utils.fromBufferToB64(makeStaticByteArray(16).buffer as ArrayBuffer);
+      const symKey = new SymmetricCryptoKey(makeStaticByteArray(32).buffer as ArrayBuffer);
       const data = "ByUF8vhyX4ddU9gcooznwA==";
       const params = nodeCryptoFunctionService.aesDecryptFastParameters(data, iv, null, symKey);
       const decValue = await nodeCryptoFunctionService.aesDecryptFast(params);
@@ -212,9 +212,9 @@ describe("NodeCrypto Function Service", () => {
       const key = makeStaticByteArray(32);
       const data = Utils.fromB64ToArray("ByUF8vhyX4ddU9gcooznwA==");
       const decValue = await nodeCryptoFunctionService.aesDecrypt(
-        data.buffer,
-        iv.buffer,
-        key.buffer,
+        data.buffer as ArrayBuffer,
+        iv.buffer as ArrayBuffer,
+        key.buffer as ArrayBuffer,
       );
       expect(Utils.fromBufferToUtf8(decValue)).toBe("EncryptMe!");
     });
@@ -228,11 +228,11 @@ describe("NodeCrypto Function Service", () => {
       const value = "EncryptMe!";
       const data = Utils.fromUtf8ToArray(value);
       const encValue = await nodeCryptoFunctionService.rsaEncrypt(
-        data.buffer,
-        pubKey.buffer,
+        data.buffer as ArrayBuffer,
+        pubKey.buffer as ArrayBuffer,
         "sha1",
       );
-      const decValue = await nodeCryptoFunctionService.rsaDecrypt(encValue, privKey.buffer, "sha1");
+      const decValue = await nodeCryptoFunctionService.rsaDecrypt(encValue, privKey.buffer as ArrayBuffer, "sha1");
       expect(Utils.fromBufferToUtf8(decValue)).toBe(value);
     });
   });
@@ -248,8 +248,8 @@ describe("NodeCrypto Function Service", () => {
           "/5jcercUtK2o+XrzNrL4UQ7yLZcFz6Bfwb/j6ICYvqd/YJwXNE6dwlL57OfwJyCdw2rRYf0/qI00t9u8Iitw==",
       );
       const decValue = await nodeCryptoFunctionService.rsaDecrypt(
-        data.buffer,
-        privKey.buffer,
+        data.buffer as ArrayBuffer,
+        privKey.buffer as ArrayBuffer,
         "sha1",
       );
       expect(Utils.fromBufferToUtf8(decValue)).toBe("EncryptMe!");
@@ -260,7 +260,7 @@ describe("NodeCrypto Function Service", () => {
     it("should successfully extract key", async () => {
       const nodeCryptoFunctionService = new NodeCryptoFunctionService();
       const privKey = Utils.fromB64ToArray(RsaPrivateKey);
-      const publicKey = await nodeCryptoFunctionService.rsaExtractPublicKey(privKey.buffer);
+      const publicKey = await nodeCryptoFunctionService.rsaExtractPublicKey(privKey.buffer as ArrayBuffer);
       expect(Utils.fromBufferToB64(publicKey)).toBe(RsaPublicKey);
     });
   });
@@ -326,8 +326,8 @@ function testPbkdf2(
   it("should create valid " + algorithm + " key from array buffer input", async () => {
     const cryptoFunctionService = new NodeCryptoFunctionService();
     const key = await cryptoFunctionService.pbkdf2(
-      Utils.fromUtf8ToArray(regularPassword).buffer,
-      Utils.fromUtf8ToArray(regularEmail).buffer,
+      Utils.fromUtf8ToArray(regularPassword).buffer as ArrayBuffer,
+      Utils.fromUtf8ToArray(regularEmail).buffer as ArrayBuffer,
       algorithm,
       5000,
     );
@@ -341,7 +341,7 @@ function testHkdf(
   utf8Key: string,
   unicodeKey: string,
 ) {
-  const ikm = Utils.fromB64ToArray("criAmKtfzxanbgea5/kelQ==").buffer;
+  const ikm = Utils.fromB64ToArray("criAmKtfzxanbgea5/kelQ==").buffer as ArrayBuffer;
 
   const regularSalt = "salt";
   const utf8Salt = "üser_salt";
@@ -373,8 +373,8 @@ function testHkdf(
     const cryptoFunctionService = new NodeCryptoFunctionService();
     const key = await cryptoFunctionService.hkdf(
       ikm,
-      Utils.fromUtf8ToArray(regularSalt).buffer,
-      Utils.fromUtf8ToArray(regularInfo).buffer,
+      Utils.fromUtf8ToArray(regularSalt).buffer as ArrayBuffer,
+      Utils.fromUtf8ToArray(regularInfo).buffer as ArrayBuffer,
       32,
       algorithm,
     );
@@ -393,7 +393,7 @@ function testHkdfExpand(
   it("should create valid " + algorithm + " " + outputByteSize + " byte okm", async () => {
     const cryptoFunctionService = new NodeCryptoFunctionService();
     const okm = await cryptoFunctionService.hkdfExpand(
-      Utils.fromB64ToArray(b64prk).buffer,
+      Utils.fromB64ToArray(b64prk).buffer as ArrayBuffer,
       info,
       outputByteSize,
       algorithm,
@@ -433,7 +433,7 @@ function testHash(
   it("should create valid " + algorithm + " hash from array buffer input", async () => {
     const cryptoFunctionService = new NodeCryptoFunctionService();
     const hash = await cryptoFunctionService.hash(
-      Utils.fromUtf8ToArray(regularValue).buffer,
+      Utils.fromUtf8ToArray(regularValue).buffer as ArrayBuffer,
       algorithm,
     );
     expect(Utils.fromBufferToHex(hash)).toBe(regularHash);
@@ -443,8 +443,8 @@ function testHash(
 function testHmac(algorithm: "sha1" | "sha256" | "sha512", mac: string, fast = false) {
   it("should create valid " + algorithm + " hmac", async () => {
     const cryptoFunctionService = new NodeCryptoFunctionService();
-    const value = Utils.fromUtf8ToArray("SignMe!!").buffer;
-    const key = Utils.fromUtf8ToArray("secretkey").buffer;
+    const value = Utils.fromUtf8ToArray("SignMe!!").buffer as ArrayBuffer;
+    const key = Utils.fromUtf8ToArray("secretkey").buffer as ArrayBuffer;
     let computedMac: ArrayBuffer = null;
     if (fast) {
       computedMac = await cryptoFunctionService.hmacFast(value, key, algorithm);
@@ -462,8 +462,8 @@ function testCompare(fast = false) {
     a[0] = 1;
     a[1] = 2;
     const equal = fast
-      ? await cryptoFunctionService.compareFast(a.buffer, a.buffer)
-      : await cryptoFunctionService.compare(a.buffer, a.buffer);
+      ? await cryptoFunctionService.compareFast(a.buffer as ArrayBuffer, a.buffer as ArrayBuffer)
+      : await cryptoFunctionService.compare(a.buffer as ArrayBuffer, a.buffer as ArrayBuffer);
     expect(equal).toBe(true);
   });
 
@@ -476,8 +476,8 @@ function testCompare(fast = false) {
     b[0] = 3;
     b[1] = 4;
     const equal = fast
-      ? await cryptoFunctionService.compareFast(a.buffer, b.buffer)
-      : await cryptoFunctionService.compare(a.buffer, b.buffer);
+      ? await cryptoFunctionService.compareFast(a.buffer as ArrayBuffer, b.buffer as ArrayBuffer)
+      : await cryptoFunctionService.compare(a.buffer as ArrayBuffer, b.buffer as ArrayBuffer);
     expect(equal).toBe(false);
   });
 
@@ -489,8 +489,8 @@ function testCompare(fast = false) {
     const b = new Uint8Array(2);
     b[0] = 3;
     const equal = fast
-      ? await cryptoFunctionService.compareFast(a.buffer, b.buffer)
-      : await cryptoFunctionService.compare(a.buffer, b.buffer);
+      ? await cryptoFunctionService.compareFast(a.buffer as ArrayBuffer, b.buffer as ArrayBuffer)
+      : await cryptoFunctionService.compare(a.buffer as ArrayBuffer, b.buffer as ArrayBuffer);
     expect(equal).toBe(false);
   });
 }

jslib/node/src/services/nodeCryptoFunction.service.ts

@@ -67,14 +67,14 @@ export class NodeCryptoFunctionService implements CryptoFunctionService {
       t.set(previousT);
       t.set(infoArr, previousT.length);
       t.set([i + 1], t.length - 1);
-      previousT = new Uint8Array(await this.hmac(t.buffer, prk, algorithm));
+      previousT = new Uint8Array(await this.hmac(t.buffer as ArrayBuffer, prk, algorithm));
       okm.set(previousT, runningOkmLength);
       runningOkmLength += previousT.length;
       if (runningOkmLength >= outputByteSize) {
         break;
       }
     }
-    return okm.slice(0, outputByteSize).buffer;
+    return okm.slice(0, outputByteSize).buffer as ArrayBuffer;
   }
 
   hash(
@@ -147,19 +147,19 @@ export class NodeCryptoFunctionService implements CryptoFunctionService {
   ): DecryptParameters<ArrayBuffer> {
     const p = new DecryptParameters<ArrayBuffer>();
     p.encKey = key.encKey;
-    p.data = Utils.fromB64ToArray(data).buffer;
-    p.iv = Utils.fromB64ToArray(iv).buffer;
+    p.data = Utils.fromB64ToArray(data).buffer as ArrayBuffer;
+    p.iv = Utils.fromB64ToArray(iv).buffer as ArrayBuffer;
 
     const macData = new Uint8Array(p.iv.byteLength + p.data.byteLength);
     macData.set(new Uint8Array(p.iv), 0);
     macData.set(new Uint8Array(p.data), p.iv.byteLength);
-    p.macData = macData.buffer;
+    p.macData = macData.buffer as ArrayBuffer;
 
     if (key.macKey != null) {
       p.macKey = key.macKey;
     }
     if (mac != null) {
-      p.mac = Utils.fromB64ToArray(mac).buffer;
+      p.mac = Utils.fromB64ToArray(mac).buffer as ArrayBuffer;
     }
 
     return p;
@@ -215,7 +215,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService {
     const publicKeyAsn1 = forge.pki.publicKeyToAsn1(forgePublicKey);
     const publicKeyByteString = forge.asn1.toDer(publicKeyAsn1).data;
     const publicKeyArray = Utils.fromByteStringToArray(publicKeyByteString);
-    return Promise.resolve(publicKeyArray.buffer);
+    return Promise.resolve(publicKeyArray.buffer as ArrayBuffer);
   }
 
   async rsaGenerateKeyPair(length: 1024 | 2048 | 4096): Promise<[ArrayBuffer, ArrayBuffer]> {
@@ -241,7 +241,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService {
           const privateKeyByteString = forge.asn1.toDer(privateKeyPkcs8).getBytes();
           const privateKey = Utils.fromByteStringToArray(privateKeyByteString);
 
-          resolve([publicKey.buffer, privateKey.buffer]);
+          resolve([publicKey.buffer as ArrayBuffer, privateKey.buffer as ArrayBuffer]);
         },
       );
     });
@@ -276,9 +276,9 @@ export class NodeCryptoFunctionService implements CryptoFunctionService {
   private toArrayBuffer(value: Buffer | string | ArrayBuffer): ArrayBuffer {
     let buf: ArrayBuffer;
     if (typeof value === "string") {
-      buf = Utils.fromUtf8ToArray(value).buffer;
+      buf = Utils.fromUtf8ToArray(value).buffer as ArrayBuffer;
     } else {
-      buf = new Uint8Array(value).buffer;
+      buf = new Uint8Array(value).buffer as ArrayBuffer;
     }
     return buf;
   }

package.json

@@ -2,7 +2,7 @@
   "name": "@bitwarden/directory-connector",
   "productName": "Bitwarden Directory Connector",
   "description": "Sync your user directory to your Bitwarden organization.",
-  "version": "2026.2.0",
+  "version": "2025.12.0",
   "keywords": [
     "bitwarden",
     "password",
@@ -73,16 +73,17 @@
     "test:types": "npx tsc --noEmit"
   },
   "devDependencies": {
-    "@angular-eslint/eslint-plugin-template": "21.1.0",
-    "@angular-eslint/template-parser": "21.1.0",
-    "@angular/build": "21.1.2",
-    "@angular/compiler-cli": "21.1.1",
+    "@angular-devkit/build-angular": "20.3.3",
+    "@angular-eslint/eslint-plugin-template": "20.7.0",
+    "@angular-eslint/template-parser": "20.7.0",
+    "@angular/compiler-cli": "20.3.15",
     "@electron/notarize": "2.5.0",
     "@electron/rebuild": "4.0.1",
+    "@fluffy-spoon/substitute": "1.208.0",
     "@microsoft/microsoft-graph-types": "2.43.1",
-    "@ngtools/webpack": "21.1.2",
+    "@ngtools/webpack": "20.3.3",
     "@types/inquirer": "8.2.10",
-    "@types/jest": "30.0.0",
+    "@types/jest": "29.5.14",
     "@types/lowdb": "1.0.15",
     "@types/node": "22.19.2",
     "@types/node-fetch": "2.6.12",
@@ -90,12 +91,10 @@
     "@types/proper-lockfile": "4.1.4",
     "@types/semver": "7.7.1",
     "@types/tldjs": "2.3.4",
-    "@typescript-eslint/eslint-plugin": "8.54.0",
-    "@typescript-eslint/parser": "8.54.0",
+    "@typescript-eslint/eslint-plugin": "8.50.0",
+    "@typescript-eslint/parser": "8.50.0",
     "@yao-pkg/pkg": "5.16.1",
-    "babel-loader": "10.0.0",
     "clean-webpack-plugin": "4.0.0",
-    "jest-environment-jsdom": "30.2.0",
     "concurrently": "9.2.0",
     "copy-webpack-plugin": "13.0.0",
     "cross-env": "7.0.3",
@@ -106,7 +105,7 @@
     "electron-log": "5.4.1",
     "electron-reload": "2.0.0-alpha.1",
     "electron-store": "8.2.0",
-    "electron-updater": "6.7.3",
+    "electron-updater": "6.6.2",
     "eslint": "9.39.1",
     "eslint-config-prettier": "10.1.5",
     "eslint-import-resolver-typescript": "4.4.4",
@@ -118,16 +117,16 @@
     "html-loader": "5.1.0",
     "html-webpack-plugin": "5.6.3",
     "husky": "9.1.7",
-    "jest": "30.2.0",
+    "jest": "29.7.0",
     "jest-junit": "16.0.0",
     "jest-mock-extended": "4.0.0",
-    "jest-preset-angular": "16.0.0",
+    "jest-preset-angular": "14.6.0",
     "lint-staged": "16.2.6",
-    "mini-css-extract-plugin": "2.10.0",
+    "mini-css-extract-plugin": "2.9.2",
     "minimatch": "5.1.2",
     "node-forge": "1.3.2",
     "node-loader": "2.1.0",
-    "prettier": "3.8.1",
+    "prettier": "3.7.4",
     "rimraf": "6.1.0",
     "rxjs": "7.8.2",
     "sass": "1.97.1",
@@ -135,25 +134,25 @@
     "ts-jest": "29.4.1",
     "ts-loader": "9.5.2",
     "tsconfig-paths-webpack-plugin": "4.2.0",
-    "type-fest": "5.4.2",
+    "type-fest": "5.3.0",
     "typescript": "5.9.3",
     "webpack": "5.104.1",
     "webpack-cli": "6.0.1",
     "webpack-merge": "6.0.1",
     "webpack-node-externals": "3.0.0",
-    "zone.js": "0.16.0"
+    "zone.js": "0.15.1"
   },
   "dependencies": {
-    "@angular/animations": "21.1.1",
-    "@angular/cdk": "21.1.1",
-    "@angular/cli": "21.1.2",
-    "@angular/common": "21.1.1",
-    "@angular/compiler": "21.1.1",
-    "@angular/core": "21.1.1",
-    "@angular/forms": "21.1.1",
-    "@angular/platform-browser": "21.1.1",
-    "@angular/platform-browser-dynamic": "21.1.1",
-    "@angular/router": "21.1.1",
+    "@angular/animations": "20.3.15",
+    "@angular/cdk": "20.2.14",
+    "@angular/cli": "20.3.3",
+    "@angular/common": "20.3.15",
+    "@angular/compiler": "20.3.15",
+    "@angular/core": "20.3.15",
+    "@angular/forms": "20.3.15",
+    "@angular/platform-browser": "20.3.15",
+    "@angular/platform-browser-dynamic": "20.3.15",
+    "@angular/router": "20.3.15",
     "@microsoft/microsoft-graph-client": "3.0.7",
     "big-integer": "1.6.52",
     "bootstrap": "5.3.7",
@@ -165,16 +164,16 @@
     "https-proxy-agent": "7.0.6",
     "inquirer": "8.2.6",
     "keytar": "7.9.0",
-    "ldapts": "8.1.3",
+    "ldapts": "8.0.1",
     "lowdb": "1.0.0",
-    "ngx-toastr": "20.0.4",
+    "ngx-toastr": "19.1.0",
     "node-fetch": "2.7.0",
     "parse5": "8.0.0",
     "proper-lockfile": "4.1.2",
     "rxjs": "7.8.2",
     "tldjs": "2.3.1",
     "uuid": "11.1.0",
-    "zone.js": "0.16.0"
+    "zone.js": "0.15.1"
   },
   "engines": {
     "node": "~20",

src/app/main.ts

@@ -1,4 +1,4 @@
-import { enableProdMode, provideZoneChangeDetection } from "@angular/core";
+import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
 
 import { isDev } from "@/jslib/electron/src/utils";
@@ -11,7 +11,4 @@ if (!isDev()) {
   enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(AppModule, {
-  applicationProviders: [provideZoneChangeDetection()],
-  preserveWhitespaces: true,
-});
+platformBrowserDynamic().bootstrapModule(AppModule, { preserveWhitespaces: true });

src/app/tabs/dashboard.component.html

@@ -3,25 +3,17 @@
   <div class="card-body">
     <p>
       {{ "lastGroupSync" | i18n }}:
-      @if (!lastGroupSync) {
-        <span>-</span>
-      }
+      <span *ngIf="!lastGroupSync">-</span>
       {{ lastGroupSync | date: "medium" }}
       <br />
       {{ "lastUserSync" | i18n }}:
-      @if (!lastUserSync) {
-        <span>-</span>
-      }
+      <span *ngIf="!lastUserSync">-</span>
       {{ lastUserSync | date: "medium" }}
     </p>
     <p>
       {{ "syncStatus" | i18n }}:
-      @if (syncRunning) {
-        <strong class="text-success">{{ "running" | i18n }}</strong>
-      }
-      @if (!syncRunning) {
-        <strong class="text-danger">{{ "stopped" | i18n }}</strong>
-      }
+      <strong *ngIf="syncRunning" class="text-success">{{ "running" | i18n }}</strong>
+      <strong *ngIf="!syncRunning" class="text-danger">{{ "stopped" | i18n }}</strong>
     </p>
     <form #startForm [appApiAction]="startPromise" class="d-inline">
       <button
@@ -68,85 +60,57 @@
       />
       <label class="form-check-label" for="simSinceLast">{{ "testLastSync" | i18n }}</label>
     </div>
-    @if (!simForm.loading && (simUsers || simGroups)) {
+    <ng-container *ngIf="!simForm.loading && (simUsers || simGroups)">
       <hr />
       <div class="row">
         <div class="col-lg">
           <h4>{{ "users" | i18n }}</h4>
-          @if (simEnabledUsers && simEnabledUsers.length) {
-            <ul class="bwi-ul testing-list">
-              @for (u of simEnabledUsers; track u) {
-                <li title="{{ u.referenceId }}">
-                  <i class="bwi bwi-li bwi-user"></i>
-                  {{ u.displayName }}
-                </li>
-              }
-            </ul>
-          }
-          @if (!simEnabledUsers || !simEnabledUsers.length) {
-            <p>
-              {{ "noUsers" | i18n }}
-            </p>
-          }
+          <ul class="bwi-ul testing-list" *ngIf="simEnabledUsers && simEnabledUsers.length">
+            <li *ngFor="let u of simEnabledUsers" title="{{ u.referenceId }}">
+              <i class="bwi bwi-li bwi-user"></i>
+              {{ u.displayName }}
+            </li>
+          </ul>
+          <p *ngIf="!simEnabledUsers || !simEnabledUsers.length">
+            {{ "noUsers" | i18n }}
+          </p>
           <h4>{{ "disabledUsers" | i18n }}</h4>
-          @if (simDisabledUsers && simDisabledUsers.length) {
-            <ul class="bwi-ul testing-list">
-              @for (u of simDisabledUsers; track u) {
-                <li title="{{ u.referenceId }}">
-                  <i class="bwi bwi-li bwi-user"></i>
-                  {{ u.displayName }}
-                </li>
-              }
-            </ul>
-          }
-          @if (!simDisabledUsers || !simDisabledUsers.length) {
-            <p>
-              {{ "noUsers" | i18n }}
-            </p>
-          }
+          <ul class="bwi-ul testing-list" *ngIf="simDisabledUsers && simDisabledUsers.length">
+            <li *ngFor="let u of simDisabledUsers" title="{{ u.referenceId }}">
+              <i class="bwi bwi-li bwi-user"></i>
+              {{ u.displayName }}
+            </li>
+          </ul>
+          <p *ngIf="!simDisabledUsers || !simDisabledUsers.length">
+            {{ "noUsers" | i18n }}
+          </p>
           <h4>{{ "deletedUsers" | i18n }}</h4>
-          @if (simDeletedUsers && simDeletedUsers.length) {
-            <ul class="bwi-ul testing-list">
-              @for (u of simDeletedUsers; track u) {
-                <li title="{{ u.referenceId }}">
-                  <i class="bwi bwi-li bwi-user"></i>
-                  {{ u.displayName }}
-                </li>
-              }
-            </ul>
-          }
-          @if (!simDeletedUsers || !simDeletedUsers.length) {
-            <p>
-              {{ "noUsers" | i18n }}
-            </p>
-          }
+          <ul class="bwi-ul testing-list" *ngIf="simDeletedUsers && simDeletedUsers.length">
+            <li *ngFor="let u of simDeletedUsers" title="{{ u.referenceId }}">
+              <i class="bwi bwi-li bwi-user"></i>
+              {{ u.displayName }}
+            </li>
+          </ul>
+          <p *ngIf="!simDeletedUsers || !simDeletedUsers.length">
+            {{ "noUsers" | i18n }}
+          </p>
         </div>
         <div class="col-lg">
           <h4>{{ "groups" | i18n }}</h4>
-          @if (simGroups && simGroups.length) {
-            <ul class="bwi-ul testing-list">
-              @for (g of simGroups; track g) {
-                <li title="{{ g.referenceId }}">
-                  <i class="bwi bwi-li bwi-sitemap"></i>
-                  {{ g.displayName }}
-                  @if (g.users && g.users.length) {
-                    <ul class="small">
-                      @for (u of g.users; track u) {
-                        <li title="{{ u.referenceId }}">
-                          {{ u.displayName }}
-                        </li>
-                      }
-                    </ul>
-                  }
+          <ul class="bwi-ul testing-list" *ngIf="simGroups && simGroups.length">
+            <li *ngFor="let g of simGroups" title="{{ g.referenceId }}">
+              <i class="bwi bwi-li bwi-sitemap"></i>
+              {{ g.displayName }}
+              <ul class="small" *ngIf="g.users && g.users.length">
+                <li *ngFor="let u of g.users" title="{{ u.referenceId }}">
+                  {{ u.displayName }}
                 </li>
-              }
-            </ul>
-          }
-          @if (!simGroups || !simGroups.length) {
-            <p>{{ "noGroups" | i18n }}</p>
-          }
+              </ul>
+            </li>
+          </ul>
+          <p *ngIf="!simGroups || !simGroups.length">{{ "noGroups" | i18n }}</p>
         </div>
       </div>
-    }
+    </ng-container>
   </div>
 </div>

src/app/tabs/settings.component.html

@@ -6,11 +6,9 @@
         <div class="mb-3">
           <label for="directory" class="form-label">{{ "type" | i18n }}</label>
           <select class="form-select" id="directory" name="Directory" [(ngModel)]="directory">
-            @for (o of directoryOptions; track o) {
-              <option [ngValue]="o.value">
-                {{ o.name }}
-              </option>
-            }
+            <option *ngFor="let o of directoryOptions" [ngValue]="o.value">
+              {{ o.name }}
+            </option>
           </select>
         </div>
         <div [hidden]="directory != directoryType.Ldap">
@@ -53,22 +51,20 @@
               <label class="form-check-label" for="ad">{{ "ldapAd" | i18n }}</label>
             </div>
           </div>
-          @if (!ldap.ad) {
-            <div class="mb-3">
-              <div class="form-check">
-                <input
-                  class="form-check-input"
-                  type="checkbox"
-                  id="pagedSearch"
-                  [(ngModel)]="ldap.pagedSearch"
-                  name="PagedSearch"
-                />
-                <label class="form-check-label" for="pagedSearch">{{
-                  "ldapPagedResults" | i18n
-                }}</label>
-              </div>
+          <div class="mb-3" *ngIf="!ldap.ad">
+            <div class="form-check">
+              <input
+                class="form-check-input"
+                type="checkbox"
+                id="pagedSearch"
+                [(ngModel)]="ldap.pagedSearch"
+                name="PagedSearch"
+              />
+              <label class="form-check-label" for="pagedSearch">{{
+                "ldapPagedResults" | i18n
+              }}</label>
             </div>
-          }
+          </div>
           <div class="mb-3">
             <div class="form-check">
               <input
@@ -83,122 +79,116 @@
               }}</label>
             </div>
           </div>
-          @if (ldap.ssl) {
-            <div class="ms-4">
-              <div class="mb-3">
-                <div class="form-check">
-                  <input
-                    class="form-check-input"
-                    type="radio"
-                    [value]="false"
-                    id="ssl"
-                    [(ngModel)]="ldap.startTls"
-                    name="SSL"
-                  />
-                  <label class="form-check-label" for="ssl">{{ "ldapSsl" | i18n }}</label>
-                </div>
-                <div class="form-check">
-                  <input
-                    class="form-check-input"
-                    type="radio"
-                    [value]="true"
-                    id="startTls"
-                    [(ngModel)]="ldap.startTls"
-                    name="StartTLS"
-                  />
-                  <label class="form-check-label" for="startTls">{{ "ldapTls" | i18n }}</label>
-                </div>
+          <div class="ms-4" *ngIf="ldap.ssl">
+            <div class="mb-3">
+              <div class="form-check">
+                <input
+                  class="form-check-input"
+                  type="radio"
+                  [value]="false"
+                  id="ssl"
+                  [(ngModel)]="ldap.startTls"
+                  name="SSL"
+                />
+                <label class="form-check-label" for="ssl">{{ "ldapSsl" | i18n }}</label>
               </div>
-              @if (ldap.startTls) {
-                <div class="ms-4">
-                  <p>{{ "ldapTlsUntrustedDesc" | i18n }}</p>
-                  <div class="mb-3">
-                    <label for="tlsCaPath" class="form-label">{{ "ldapTlsCa" | i18n }}</label>
-                    <input
-                      type="file"
-                      class="form-control mb-2"
-                      id="tlsCaPath_file"
-                      (change)="setSslPath('tlsCaPath')"
-                    />
-                    <input
-                      type="text"
-                      class="form-control"
-                      id="tlsCaPath"
-                      name="TLSCaPath"
-                      [(ngModel)]="ldap.tlsCaPath"
-                    />
-                  </div>
-                </div>
-              }
-              @if (!ldap.startTls) {
-                <div class="ms-4">
-                  <p>{{ "ldapSslUntrustedDesc" | i18n }}</p>
-                  <div class="mb-3">
-                    <label for="sslCertPath" class="form-label">{{ "ldapSslCert" | i18n }}</label>
-                    <input
-                      type="file"
-                      class="form-control mb-2"
-                      id="sslCertPath_file"
-                      (change)="setSslPath('sslCertPath')"
-                    />
-                    <input
-                      type="text"
-                      class="form-control"
-                      id="sslCertPath"
-                      name="SSLCertPath"
-                      [(ngModel)]="ldap.sslCertPath"
-                    />
-                  </div>
-                  <div class="mb-3">
-                    <label for="sslKeyPath" class="form-label">{{ "ldapSslKey" | i18n }}</label>
-                    <input
-                      type="file"
-                      class="form-control mb-2"
-                      id="sslKeyPath_file"
-                      (change)="setSslPath('sslKeyPath')"
-                    />
-                    <input
-                      type="text"
-                      class="form-control"
-                      id="sslKeyPath"
-                      name="SSLKeyPath"
-                      [(ngModel)]="ldap.sslKeyPath"
-                    />
-                  </div>
-                  <div class="mb-3">
-                    <label for="sslCaPath" class="form-label">{{ "ldapSslCa" | i18n }}</label>
-                    <input
-                      type="file"
-                      class="form-control mb-2"
-                      id="sslCaPath_file"
-                      (change)="setSslPath('sslCaPath')"
-                    />
-                    <input
-                      type="text"
-                      class="form-control"
-                      id="sslCaPath"
-                      name="SSLCaPath"
-                      [(ngModel)]="ldap.sslCaPath"
-                    />
-                  </div>
-                </div>
-              }
-              <div class="mb-3">
-                <div class="form-check">
-                  <input
-                    class="form-check-input"
-                    type="checkbox"
-                    id="certDoNotVerify"
-                    [(ngModel)]="ldap.sslAllowUnauthorized"
-                    name="CertDoNoVerify"
-                  />
-                  <label class="form-check-label" for="certDoNotVerify">{{
-                    "ldapCertDoNotVerify" | i18n
-                  }}</label>
-                </div>
+              <div class="form-check">
+                <input
+                  class="form-check-input"
+                  type="radio"
+                  [value]="true"
+                  id="startTls"
+                  [(ngModel)]="ldap.startTls"
+                  name="StartTLS"
+                />
+                <label class="form-check-label" for="startTls">{{ "ldapTls" | i18n }}</label>
               </div>
             </div>
-          }
+            <div class="ms-4" *ngIf="ldap.startTls">
+              <p>{{ "ldapTlsUntrustedDesc" | i18n }}</p>
+              <div class="mb-3">
+                <label for="tlsCaPath" class="form-label">{{ "ldapTlsCa" | i18n }}</label>
+                <input
+                  type="file"
+                  class="form-control mb-2"
+                  id="tlsCaPath_file"
+                  (change)="setSslPath('tlsCaPath')"
+                />
+                <input
+                  type="text"
+                  class="form-control"
+                  id="tlsCaPath"
+                  name="TLSCaPath"
+                  [(ngModel)]="ldap.tlsCaPath"
+                />
+              </div>
+            </div>
+            <div class="ms-4" *ngIf="!ldap.startTls">
+              <p>{{ "ldapSslUntrustedDesc" | i18n }}</p>
+              <div class="mb-3">
+                <label for="sslCertPath" class="form-label">{{ "ldapSslCert" | i18n }}</label>
+                <input
+                  type="file"
+                  class="form-control mb-2"
+                  id="sslCertPath_file"
+                  (change)="setSslPath('sslCertPath')"
+                />
+                <input
+                  type="text"
+                  class="form-control"
+                  id="sslCertPath"
+                  name="SSLCertPath"
+                  [(ngModel)]="ldap.sslCertPath"
+                />
+              </div>
+              <div class="mb-3">
+                <label for="sslKeyPath" class="form-label">{{ "ldapSslKey" | i18n }}</label>
+                <input
+                  type="file"
+                  class="form-control mb-2"
+                  id="sslKeyPath_file"
+                  (change)="setSslPath('sslKeyPath')"
+                />
+                <input
+                  type="text"
+                  class="form-control"
+                  id="sslKeyPath"
+                  name="SSLKeyPath"
+                  [(ngModel)]="ldap.sslKeyPath"
+                />
+              </div>
+              <div class="mb-3">
+                <label for="sslCaPath" class="form-label">{{ "ldapSslCa" | i18n }}</label>
+                <input
+                  type="file"
+                  class="form-control mb-2"
+                  id="sslCaPath_file"
+                  (change)="setSslPath('sslCaPath')"
+                />
+                <input
+                  type="text"
+                  class="form-control"
+                  id="sslCaPath"
+                  name="SSLCaPath"
+                  [(ngModel)]="ldap.sslCaPath"
+                />
+              </div>
+            </div>
+            <div class="mb-3">
+              <div class="form-check">
+                <input
+                  class="form-check-input"
+                  type="checkbox"
+                  id="certDoNotVerify"
+                  [(ngModel)]="ldap.sslAllowUnauthorized"
+                  name="CertDoNoVerify"
+                />
+                <label class="form-check-label" for="certDoNotVerify">{{
+                  "ldapCertDoNotVerify" | i18n
+                }}</label>
+              </div>
+            </div>
+          </div>
           <div class="mb-3" [hidden]="true">
             <div class="form-check">
               <input
@@ -221,12 +211,10 @@
                 name="Username"
                 [(ngModel)]="ldap.username"
               />
-              @if (ldap.ad) {
-                <div class="form-text">{{ "ex" | i18n }} company\admin</div>
-              }
-              @if (!ldap.ad) {
-                <div class="form-text">{{ "ex" | i18n }} cn=admin,dc=company,dc=com</div>
-              }
+              <div class="form-text" *ngIf="ldap.ad">{{ "ex" | i18n }} company\admin</div>
+              <div class="form-text" *ngIf="!ldap.ad">
+                {{ "ex" | i18n }} cn=admin,dc=company,dc=com
+              </div>
             </div>
             <div class="mb-3">
               <label for="password" class="form-label">{{ "password" | i18n }}</label>
@@ -616,24 +604,18 @@
               name="UserFilter"
               [(ngModel)]="sync.userFilter"
             ></textarea>
-            @if (directory === directoryType.Ldap) {
-              <div class="form-text">
-                {{ "ex" | i18n }} (&amp;(givenName=John)(|(l=Dallas)(l=Austin)))
-              </div>
-            }
-            @if (directory === directoryType.EntraID) {
-              <div class="form-text">{{ "ex" | i18n }} exclude:joe&#64;company.com</div>
-            }
-            @if (directory === directoryType.Okta) {
-              <div class="form-text">
-                {{ "ex" | i18n }} exclude:joe&#64;company.com | profile.firstName eq "John"
-              </div>
-            }
-            @if (directory === directoryType.GSuite) {
-              <div class="form-text">
-                {{ "ex" | i18n }} exclude:joe&#64;company.com | orgUnitPath=/Engineering
-              </div>
-            }
+            <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">
+              {{ "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
+            </div>
           </div>
           <div class="mb-3" [hidden]="directory != directoryType.Ldap">
             <label for="userPath" class="form-label">{{ "userPath" | i18n }}</label>
@@ -699,20 +681,18 @@
               name="GroupFilter"
               [(ngModel)]="sync.groupFilter"
             ></textarea>
-            @if (directory === directoryType.Ldap) {
-              <div class="form-text">
-                {{ "ex" | i18n }} (&amp;(objectClass=group)(!(cn=Sales*))(!(cn=IT*)))
-              </div>
-            }
-            @if (directory === directoryType.EntraID) {
-              <div class="form-text">{{ "ex" | i18n }} include:Sales,IT</div>
-            }
-            @if (directory === directoryType.Okta) {
-              <div class="form-text">{{ "ex" | i18n }} include:Sales,IT | type eq "APP_GROUP"</div>
-            }
-            @if (directory === directoryType.GSuite) {
-              <div class="form-text">{{ "ex" | i18n }} include:Sales,IT</div>
-            }
+            <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">
+              {{ "ex" | i18n }} include:Sales,IT
+            </div>
+            <div class="form-text" *ngIf="directory === directoryType.Okta">
+              {{ "ex" | i18n }} include:Sales,IT | type eq "APP_GROUP"
+            </div>
+            <div class="form-text" *ngIf="directory === directoryType.GSuite">
+              {{ "ex" | i18n }} include:Sales,IT
+            </div>
           </div>
           <div class="mb-3" [hidden]="directory != directoryType.Ldap">
             <label for="groupPath" class="form-label">{{ "groupPath" | i18n }}</label>
@@ -723,12 +703,8 @@
               name="GroupPath"
               [(ngModel)]="sync.groupPath"
             />
-            @if (!ldap.ad) {
-              <div class="form-text">{{ "ex" | i18n }} CN=Groups</div>
-            }
-            @if (ldap.ad) {
-              <div class="form-text">{{ "ex" | i18n }} CN=Users</div>
-            }
+            <div class="form-text" *ngIf="!ldap.ad">{{ "ex" | i18n }} CN=Groups</div>
+            <div class="form-text" *ngIf="ldap.ad">{{ "ex" | i18n }} CN=Users</div>
           </div>
           <div [hidden]="directory != directoryType.Ldap || ldap.ad">
             <div class="mb-3">

src/scss/bootstrap.scss

@@ -28,4 +28,4 @@ $danger: map_get($theme-colors, "danger");
 $secondary: map_get($theme-colors, "secondary");
 $secondary-alt: map_get($theme-colors, "secondary-alt");
 
-@import "bootstrap/scss/bootstrap.scss";
+@import "~bootstrap/scss/bootstrap.scss";

src/scss/environment.scss

@@ -1,4 +1,4 @@
-@import "bootstrap/scss/_variables.scss";
+@import "~bootstrap/scss/_variables.scss";
 
 html.os_windows {
   body {

src/scss/misc.scss

@@ -1,4 +1,4 @@
-@import "bootstrap/scss/_variables.scss";
+@import "~bootstrap/scss/_variables.scss";
 
 body {
   padding: 10px 0 20px 0;

src/scss/plugins.scss

@@ -1,6 +1,6 @@
-@import "ngx-toastr/toastr";
+@import "~ngx-toastr/toastr";
 
-@import "bootstrap/scss/_variables.scss";
+@import "~bootstrap/scss/_variables.scss";
 
 .toast-container {
   .toast-close-button {

src/services/authService.spec.ts

@@ -1,8 +1,7 @@
-import { mock } from "jest-mock-extended";
+import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
 
 import { ApiService } from "@/jslib/common/src/abstractions/api.service";
 import { AppIdService } from "@/jslib/common/src/abstractions/appId.service";
-import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service";
 import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service";
 import { Utils } from "@/jslib/common/src/misc/utils";
 import {
@@ -12,6 +11,7 @@ import {
 } from "@/jslib/common/src/models/domain/account";
 import { IdentityTokenResponse } from "@/jslib/common/src/models/response/identityTokenResponse";
 
+import { MessagingService } from "../../jslib/common/src/abstractions/messaging.service";
 import { Account, DirectoryConfigurations, DirectorySettings } from "../models/account";
 
 import { AuthService } from "./auth.service";
@@ -35,22 +35,22 @@ export function identityTokenResponseFactory() {
 }
 
 describe("AuthService", () => {
-  let apiService: jest.Mocked<ApiService>;
-  let appIdService: jest.Mocked<AppIdService>;
-  let platformUtilsService: jest.Mocked<PlatformUtilsService>;
-  let messagingService: jest.Mocked<MessagingService>;
-  let stateService: jest.Mocked<StateService>;
+  let apiService: SubstituteOf<ApiService>;
+  let appIdService: SubstituteOf<AppIdService>;
+  let platformUtilsService: SubstituteOf<PlatformUtilsService>;
+  let messagingService: SubstituteOf<MessagingService>;
+  let stateService: SubstituteOf<StateService>;
 
   let authService: AuthService;
 
   beforeEach(async () => {
-    apiService = mock<ApiService>();
-    appIdService = mock<AppIdService>();
-    platformUtilsService = mock<PlatformUtilsService>();
-    stateService = mock<StateService>();
-    messagingService = mock<MessagingService>();
+    apiService = Substitute.for();
+    appIdService = Substitute.for();
+    platformUtilsService = Substitute.for();
+    stateService = Substitute.for();
+    messagingService = Substitute.for();
 
-    appIdService.getAppId.mockResolvedValue(deviceId);
+    appIdService.getAppId().resolves(deviceId);
 
     authService = new AuthService(
       apiService,
@@ -62,12 +62,11 @@ describe("AuthService", () => {
   });
 
   it("sets the local environment after a successful login", async () => {
-    apiService.postIdentityToken.mockResolvedValue(identityTokenResponseFactory());
+    apiService.postIdentityToken(Arg.any()).resolves(identityTokenResponseFactory());
 
     await authService.logIn({ clientId, clientSecret });
 
-    expect(stateService.addAccount).toHaveBeenCalledTimes(1);
-    expect(stateService.addAccount).toHaveBeenCalledWith(
+    stateService.received(1).addAccount(
       new Account({
         profile: {
           ...new AccountProfile(),

test.setup.ts

@@ -1,7 +1,7 @@
 import { webcrypto } from "crypto";
-import { TextEncoder, TextDecoder } from "util";
 
-Object.assign(globalThis, { TextEncoder, TextDecoder });
+import "jest-preset-angular/setup-jest";
+
 Object.defineProperty(window, "CSS", { value: null });
 Object.defineProperty(window, "getComputedStyle", {
   value: () => {

tsconfig.json

@@ -5,7 +5,7 @@
   },
   "compilerOptions": {
     "pretty": true,
-    "moduleResolution": "bundler",
+    "moduleResolution": "node",
     "noImplicitAny": true,
     "target": "ES2016",
     "module": "ES2020",