bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-06 03:33:30 +00:00
Code Issues Releases Wiki Activity

Merge branch 'main' into km/encstring-remove-decrypt

Browse Source
This commit is contained in:
Bernd Schoolmann
2025-10-28 11:22:14 +01:00
committed by GitHub
parent 36aa3d76ce 8eef78960d
commit 3795de6382
12 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/desktop/desktop_native/napi/index.d.ts vendored
View File

@@ -247,7 +247,6 @@ export declare namespace chromium_importer {
}
/** Returns OS aware metadata describing supported Chromium based importers as a JSON string. */
export function getMetadata(): Record<string, NativeImporterMetadata>
export function getInstalledBrowsers(): Array<string>
export function getAvailableProfiles(browser: string): Array<ProfileInfo>
export function importLogins(browser: string, profileId: string): Promise<Array<LoginImportResult>>
}

10
apps/desktop/desktop_native/napi/src/lib.rs
View File

@@ -1066,8 +1066,8 @@ pub mod logging {
pub mod chromium_importer {
use chromium_importer::{
chromium::{
DefaultInstalledBrowserRetriever, InstalledBrowserRetriever,
LoginImportResult as _LoginImportResult, ProfileInfo as _ProfileInfo,
DefaultInstalledBrowserRetriever, LoginImportResult as _LoginImportResult,
ProfileInfo as _ProfileInfo,
},
metadata::NativeImporterMetadata as _NativeImporterMetadata,
};
@@ -1159,12 +1159,6 @@ pub mod chromium_importer {
.collect()
}
#[napi]
pub fn get_installed_browsers() -> napi::Result<Vec<String>> {
chromium_importer::chromium::DefaultInstalledBrowserRetriever::get_installed_browsers()
.map_err(|e| napi::Error::from_reason(e.to_string()))
}
#[napi]
pub fn get_available_profiles(browser: String) -> napi::Result<Vec<ProfileInfo>> {
chromium_importer::chromium::get_available_profiles(&browser)

8
apps/desktop/native-messaging-test-runner/package-lock.json generated
View File

@@ -19,7 +19,7 @@
"yargs": "18.0.0"
},
"devDependencies": {
"@types/node": "22.15.3",
"@types/node": "22.18.11",
"typescript": "5.4.2"
}
},
@@ -117,9 +117,9 @@
"license": "MIT"
},
"node_modules/@types/node": {
"version": "22.15.3",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.3.tgz",
"integrity": "sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==",
"version": "22.18.11",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.11.tgz",
"integrity": "sha512-Gd33J2XIrXurb+eT2ktze3rJAfAp9ZNjlBdh4SVgyrKEOADwCbdUDaK7QgJno8Ue4kcajscsKqu6n8OBG3hhCQ==",
"license": "MIT",
"peer": true,
"dependencies": {

2
apps/desktop/native-messaging-test-runner/package.json
View File

@@ -24,7 +24,7 @@
"yargs": "18.0.0"
},
"devDependencies": {
"@types/node": "22.15.3",
"@types/node": "22.18.11",
"typescript": "5.4.2"
},
"_moduleAliases": {

4
apps/desktop/src/app/tools/import/chromium-importer.service.ts
View File

@@ -8,10 +8,6 @@ export class ChromiumImporterService {
return await chromium_importer.getMetadata();
});
ipcMain.handle("chromium_importer.getInstalledBrowsers", async (event) => {
return await chromium_importer.getInstalledBrowsers();
});
ipcMain.handle("chromium_importer.getAvailableProfiles", async (event, browser: string) => {
return await chromium_importer.getAvailableProfiles(browser);
});

2
apps/desktop/src/app/tools/preload.ts
View File

@@ -5,8 +5,6 @@ import type { chromium_importer } from "@bitwarden/desktop-napi";
const chromiumImporter = {
getMetadata: (): Promise<Record<string, chromium_importer.NativeImporterMetadata>> =>
ipcRenderer.invoke("chromium_importer.getMetadata"),
getInstalledBrowsers: (): Promise<string[]> =>
ipcRenderer.invoke("chromium_importer.getInstalledBrowsers"),
getAvailableProfiles: (browser: string): Promise<any[]> =>
ipcRenderer.invoke("chromium_importer.getAvailableProfiles", browser),
importLogins: (browser: string, profileId: string): Promise<any[]> =>

16
apps/web/src/app/admin-console/organizations/policies/auto-confirm-edit-policy-dialog.component.ts
View File

@@ -63,6 +63,8 @@ export type AutoConfirmPolicyDialogData = PolicyEditDialogData & {
* Satisfies the PolicyDialogComponent interface structurally
* via its static open() function.
*/
// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
@Component({
templateUrl: "auto-confirm-edit-policy-dialog.component.html",
imports: [SharedModule],
@@ -73,8 +75,8 @@ export class AutoConfirmPolicyDialogComponent
{
policyType = PolicyType;
protected firstTimeDialog = signal(false);
protected currentStep = signal(0);
protected readonly firstTimeDialog = signal(false);
protected readonly currentStep = signal(0);
protected multiStepSubmit: Observable<MultiStepSubmit[]> = of([]);
protected autoConfirmEnabled$: Observable<boolean> = this.accountService.activeAccount$.pipe(
getUserId,
@@ -82,11 +84,13 @@ export class AutoConfirmPolicyDialogComponent
map((policies) => policies.find((p) => p.type === PolicyType.AutoConfirm)?.enabled ?? false),
);
private submitPolicy: Signal<TemplateRef<unknown> | undefined> = viewChild("step0");
private openExtension: Signal<TemplateRef<unknown> | undefined> = viewChild("step1");
private readonly submitPolicy: Signal<TemplateRef<unknown> | undefined> = viewChild("step0");
private readonly openExtension: Signal<TemplateRef<unknown> | undefined> = viewChild("step1");
private submitPolicyTitle: Signal<TemplateRef<unknown> | undefined> = viewChild("step0Title");
private openExtensionTitle: Signal<TemplateRef<unknown> | undefined> = viewChild("step1Title");
private readonly submitPolicyTitle: Signal<TemplateRef<unknown> | undefined> =
viewChild("step0Title");
private readonly openExtensionTitle: Signal<TemplateRef<unknown> | undefined> =
viewChild("step1Title");
override policyComponent: AutoConfirmPolicyEditComponent | undefined;

6
apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/auto-confirm-policy.component.ts
View File

@@ -26,14 +26,16 @@ export class AutoConfirmPolicy extends BasePolicyEditDefinition {
}
}
// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
@Component({
templateUrl: "auto-confirm-policy.component.html",
imports: [SharedModule],
})
export class AutoConfirmPolicyEditComponent extends BasePolicyEditComponent implements OnInit {
protected readonly autoConfirmSvg = AutoConfirmSvg;
private policyForm: Signal<TemplateRef<any> | undefined> = viewChild("step0");
private extensionButton: Signal<TemplateRef<any> | undefined> = viewChild("step1");
private readonly policyForm: Signal<TemplateRef<any> | undefined> = viewChild("step0");
private readonly extensionButton: Signal<TemplateRef<any> | undefined> = viewChild("step1");
protected step: number = 0;
protected steps = [this.policyForm, this.extensionButton];

9
bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/all-activities.service.ts
View File

@@ -76,12 +76,9 @@ export class AllActivitiesService {
}
setAllAppsReportDetails(applications: ApplicationHealthReportDetailEnriched[]) {
// Only count at-risk passwords for CRITICAL applications
const criticalApps = applications.filter((app) => app.isMarkedAsCritical);
const totalAtRiskPasswords = criticalApps.reduce(
(sum, app) => sum + app.atRiskPasswordCount,
0,
);
const totalAtRiskPasswords = applications
.filter((app) => app.isMarkedAsCritical)
.reduce((sum, app) => sum + app.atRiskPasswordCount, 0);
this.atRiskPasswordsCountSubject$.next(totalAtRiskPasswords);
this.allApplicationsDetailsSubject$.next(applications);

2
bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/activity-cards/password-change-metric.component.ts
View File

@@ -191,7 +191,7 @@ export class PasswordChangeMetricComponent implements OnInit {
async assignTasks() {
await this.accessIntelligenceSecurityTasksService.assignTasks(
this.organizationId,
this.allApplicationsDetails,
this.allApplicationsDetails.filter((app) => app.isMarkedAsCritical),
);
}
}

8
package-lock.json generated
View File

@@ -112,7 +112,7 @@
"@types/koa-json": "2.0.23",
"@types/lowdb": "1.0.15",
"@types/lunr": "2.3.7",
"@types/node": "22.15.3",
"@types/node": "22.18.11",
"@types/node-fetch": "2.6.4",
"@types/node-forge": "1.3.11",
"@types/papaparse": "5.3.16",
@@ -14391,9 +14391,9 @@
"license": "MIT"
},
"node_modules/@types/node": {
"version": "22.15.3",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.3.tgz",
"integrity": "sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==",
"version": "22.18.11",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.11.tgz",
"integrity": "sha512-Gd33J2XIrXurb+eT2ktze3rJAfAp9ZNjlBdh4SVgyrKEOADwCbdUDaK7QgJno8Ue4kcajscsKqu6n8OBG3hhCQ==",
"license": "MIT",
"dependencies": {
"undici-types": "~6.21.0"

2
package.json
View File

@@ -75,7 +75,7 @@
"@types/koa-json": "2.0.23",
"@types/lowdb": "1.0.15",
"@types/lunr": "2.3.7",
"@types/node": "22.15.3",
"@types/node": "22.18.11",
"@types/node-fetch": "2.6.4",
"@types/node-forge": "1.3.11",
"@types/papaparse": "5.3.16",