1
0
mirror of https://github.com/bitwarden/directory-connector synced 2026-02-24 08:33:14 +00:00

Compare commits

...

21 Commits

Author SHA1 Message Date
Vincent Salucci
42cf13df08 chore: bump version to 2026.2.0 (#993) 2026-02-09 14:11:35 -06:00
renovate[bot]
1a9f0a2ca7 [deps]: Update babel-loader to v10 (#987)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-02-06 15:08:41 +00:00
renovate[bot]
30b3595de3 [deps]: Update typescript-eslint monorepo to v8.54.0 (#976)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-02-06 14:34:42 +00:00
renovate[bot]
28f0ff4b24 [deps]: Update angular-cli monorepo to v21.1.2 (#982)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-02-05 10:11:28 -06:00
renovate[bot]
14fc69c810 [deps]: Update ngx-toastr to v20 (#989)
* [deps]: Update ngx-toastr to v20

* Adjust to toastr v20

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Sven <svernyi@bitwarden.com>
2026-02-04 13:44:40 -06:00
renovate[bot]
1ad0aea61f [deps]: Update prettier to v3.8.1 (#985)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-02-04 13:27:17 -05:00
renovate[bot]
f41156969c [deps]: Update angular monorepo (#981)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jared <TheWolfBadger@gmail.com>
2026-02-04 13:20:42 -05:00
renovate[bot]
39b151b1e0 [deps]: Update mini-css-extract-plugin to v2.10.0 (#984)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-02-04 13:05:34 -05:00
renovate[bot]
483f26fa6f [deps]: Update type-fest to v5.4.2 (#986)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-02-03 11:39:06 -05:00
renovate[bot]
8849385d1b [deps]: Update @angular/cdk to v21.1.1 (#980)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-02-03 09:41:55 -05:00
renovate[bot]
a7aff97360 [deps]: Lock file maintenance (#978)
* [deps]: Lock file maintenance

* add COEP and COOP headers to enabled SharedArrayBuffer

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Brandon <btreston@bitwarden.com>
2026-02-02 11:49:42 -05:00
renovate[bot]
7381857296 [deps]: Update gh minor (#973)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-01-29 14:19:11 -05:00
renovate[bot]
ba17d5b438 [deps]: Update electron-updater to v6.7.3 (#974)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-01-26 11:06:25 -06:00
Daniel James Smith
b5d31e693b Replace deprecated codecov/test-results-action with codecov/codecov-action with report_type set to test_results (#979)
https://github.com/codecov/test-results-action?tab=readme-ov-file#%EF%B8%8F-deprecation-warning-%EF%B8%8F

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
2026-01-23 08:06:18 -06:00
Brandon Treston
2854a2eba1 Update Angular to v21 (#972)
* update jest to v.30.2.0

* ng update 21 wip

* update @angular/cdk@21

* NG 21 WIP

* @ngtools-webpack@21 and jest-preset-angular@16

* updated jest, add babel & jest-enveironment-jsdom

* add missing polyfils for TextEncoder & TextDecoder

* cleanup lock file

* tsconfig cleanup

* fix import

* cleanup

* clean up
2026-01-21 08:37:52 +10:00
renovate[bot]
4485ecab3c [deps]: Update ldapts to v8.1.3 (#975)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-01-20 11:44:49 +10:00
renovate[bot]
9e3b2d2d95 [deps]: Update jest-mock-extended to v4 (#977)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-01-19 09:42:05 -05:00
renovate[bot]
b2997358dc [deps]: Lock file maintenance (#834)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-01-14 08:07:48 +10:00
renovate[bot]
db258f0191 [deps]: Update @angular/compiler to v20.3.16 [SECURITY] (#967)
* [deps]: Update @angular/compiler to v20.3.16 [SECURITY]

* Upgrade all Angular packages

* Downgrade jest-mock-extended to support Jest 29

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
2026-01-14 07:36:46 +10:00
Vincent Salucci
19d7884933 chore: bump version to 2026.1.0 (#969) 2026-01-12 11:32:43 -06:00
Jared McCannon
21ce02f431 [PM-26889] - Typescript 5.9 upgrade with updates (#965)
* [deps]: Update typescript to v5.9.3

* Updated return types.

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-01-09 10:07:27 -06:00
25 changed files with 4784 additions and 7569 deletions

View File

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

View File

@@ -40,7 +40,7 @@ jobs:
steps: steps:
- name: Check out repo - name: Check out repo
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with: with:
persist-credentials: false persist-credentials: false
@@ -52,7 +52,7 @@ jobs:
echo "node_version=$NODE_VERSION" >> "$GITHUB_OUTPUT" echo "node_version=$NODE_VERSION" >> "$GITHUB_OUTPUT"
- name: Set up Node - name: Set up Node
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0 uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
with: with:
cache: 'npm' cache: 'npm'
cache-dependency-path: '**/package-lock.json' cache-dependency-path: '**/package-lock.json'
@@ -129,7 +129,7 @@ jobs:
- name: Report test results - name: Report test results
id: report id: report
uses: dorny/test-reporter@fe45e9537387dac839af0d33ba56eed8e24189e8 # v2.3.0 uses: dorny/test-reporter@b082adf0eced0765477756c2a610396589b8c637 # v2.5.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. # 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. # 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() if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event.pull_request.head.repo.full_name == github.repository) && !cancelled()
@@ -143,4 +143,6 @@ jobs:
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2 uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
- name: Upload results to codecov.io - name: Upload results to codecov.io
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
with:
report_type: test_results

View File

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

View File

@@ -22,7 +22,7 @@ jobs:
steps: steps:
- name: Check out repo - name: Check out repo
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with: with:
persist-credentials: false persist-credentials: false
@@ -34,7 +34,7 @@ jobs:
echo "node_version=$NODE_VERSION" >> "$GITHUB_OUTPUT" echo "node_version=$NODE_VERSION" >> "$GITHUB_OUTPUT"
- name: Set up Node - name: Set up Node
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0 uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
with: with:
cache: 'npm' cache: 'npm'
cache-dependency-path: '**/package-lock.json' cache-dependency-path: '**/package-lock.json'
@@ -53,7 +53,7 @@ jobs:
run: npm run test --coverage run: npm run test --coverage
- name: Report test results - name: Report test results
uses: dorny/test-reporter@fe45e9537387dac839af0d33ba56eed8e24189e8 # v2.3.0 uses: dorny/test-reporter@b082adf0eced0765477756c2a610396589b8c637 # v2.5.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. # 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. # 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() if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event.pull_request.head.repo.full_name == github.repository) && !cancelled()
@@ -67,4 +67,6 @@ jobs:
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2 uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
- name: Upload results to codecov.io - name: Upload results to codecov.io
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
with:
report_type: test_results

View File

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

View File

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

View File

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

View File

@@ -9,7 +9,7 @@ describe("SymmetricCryptoKey", () => {
new SymmetricCryptoKey(null); new SymmetricCryptoKey(null);
}; };
expect(t).toThrowError("Must provide key"); expect(t).toThrow("Must provide key");
}); });
describe("guesses encKey from key length", () => { describe("guesses encKey from key length", () => {
@@ -63,7 +63,7 @@ describe("SymmetricCryptoKey", () => {
new SymmetricCryptoKey(makeStaticByteArray(30)); new SymmetricCryptoKey(makeStaticByteArray(30));
}; };
expect(t).toThrowError("Unable to determine encType."); expect(t).toThrow("Unable to determine encType.");
}); });
}); });
}); });

View File

@@ -33,5 +33,5 @@ export function makeStaticByteArray(length: number, start = 0) {
for (let i = 0; i < length; i++) { for (let i = 0; i < length; i++) {
arr[i] = start + i; arr[i] = start + i;
} }
return arr; return arr.buffer;
} }

View File

@@ -26,9 +26,4 @@ export class NodeUtils {
.on("error", (err) => reject(err)); .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);
}
} }

View File

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

View File

@@ -636,9 +636,9 @@ export class CryptoService implements CryptoServiceAbstraction {
const encBytes = new Uint8Array(encBuf); const encBytes = new Uint8Array(encBuf);
const encType = encBytes[0]; const encType = encBytes[0];
let ctBytes: Uint8Array = null; let ctBytes: Uint8Array<ArrayBuffer> = null;
let ivBytes: Uint8Array = null; let ivBytes: Uint8Array<ArrayBuffer> = null;
let macBytes: Uint8Array = null; let macBytes: Uint8Array<ArrayBuffer> = null;
switch (encType) { switch (encType) {
case EncryptionType.AesCbc128_HmacSha256_B64: case EncryptionType.AesCbc128_HmacSha256_B64:

View File

@@ -127,6 +127,13 @@ 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) { if (this.windowStates[mainWindowSizeKey].isMaximized) {
this.win.maximize(); this.win.maximize();
} }

View File

@@ -94,7 +94,7 @@ describe("NodeCrypto Function Service", () => {
it("should fail with prk too small", async () => { it("should fail with prk too small", async () => {
const cryptoFunctionService = new NodeCryptoFunctionService(); const cryptoFunctionService = new NodeCryptoFunctionService();
const f = cryptoFunctionService.hkdfExpand( const f = cryptoFunctionService.hkdfExpand(
Utils.fromB64ToArray(prk16Byte), Utils.fromB64ToArray(prk16Byte).buffer,
"info", "info",
32, 32,
"sha256", "sha256",
@@ -105,7 +105,7 @@ describe("NodeCrypto Function Service", () => {
it("should fail with outputByteSize is too large", async () => { it("should fail with outputByteSize is too large", async () => {
const cryptoFunctionService = new NodeCryptoFunctionService(); const cryptoFunctionService = new NodeCryptoFunctionService();
const f = cryptoFunctionService.hkdfExpand( const f = cryptoFunctionService.hkdfExpand(
Utils.fromB64ToArray(prk32Byte), Utils.fromB64ToArray(prk32Byte).buffer,
"info", "info",
8161, 8161,
"sha256", "sha256",
@@ -341,7 +341,7 @@ function testHkdf(
utf8Key: string, utf8Key: string,
unicodeKey: string, unicodeKey: string,
) { ) {
const ikm = Utils.fromB64ToArray("criAmKtfzxanbgea5/kelQ=="); const ikm = Utils.fromB64ToArray("criAmKtfzxanbgea5/kelQ==").buffer;
const regularSalt = "salt"; const regularSalt = "salt";
const utf8Salt = "üser_salt"; const utf8Salt = "üser_salt";
@@ -393,7 +393,7 @@ function testHkdfExpand(
it("should create valid " + algorithm + " " + outputByteSize + " byte okm", async () => { it("should create valid " + algorithm + " " + outputByteSize + " byte okm", async () => {
const cryptoFunctionService = new NodeCryptoFunctionService(); const cryptoFunctionService = new NodeCryptoFunctionService();
const okm = await cryptoFunctionService.hkdfExpand( const okm = await cryptoFunctionService.hkdfExpand(
Utils.fromB64ToArray(b64prk), Utils.fromB64ToArray(b64prk).buffer,
info, info,
outputByteSize, outputByteSize,
algorithm, algorithm,

11592
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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-container {
.toast-close-button { .toast-close-button {

View File

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

View File

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