mirror of
https://github.com/bitwarden/browser
synced 2026-01-06 10:33:57 +00:00
respond to review comments:
• replace usage of compile time flag with boolean for conditinal logic • moved sandbox specific logic to contained module inside macos.rs • remove redundant browser array from objc code and pass the target browser path as arg
This commit is contained in:
@@ -4,8 +4,8 @@ import { chromium_importer } from "@bitwarden/desktop-napi";
|
||||
|
||||
export class ChromiumImporterService {
|
||||
constructor() {
|
||||
ipcMain.handle("chromium_importer.getMetadata", async (event) => {
|
||||
return await chromium_importer.getMetadata();
|
||||
ipcMain.handle("chromium_importer.getMetadata", async (event, isMas: boolean) => {
|
||||
return await chromium_importer.getMetadata(isMas);
|
||||
});
|
||||
|
||||
// Used on Mac OS App Store builds to request permissions to browser entries outside the sandbox
|
||||
|
||||
@@ -20,7 +20,8 @@ export class DesktopImportMetadataService
|
||||
}
|
||||
|
||||
async init(): Promise<void> {
|
||||
const metadata = await ipc.tools.chromiumImporter.getMetadata();
|
||||
const isMas = ipc.platform.isMacAppStore;
|
||||
const metadata = await ipc.tools.chromiumImporter.getMetadata(isMas);
|
||||
await this.parseNativeMetaData(metadata);
|
||||
await super.init();
|
||||
}
|
||||
|
||||
@@ -3,8 +3,10 @@ import { ipcRenderer } from "electron";
|
||||
import type { chromium_importer } from "@bitwarden/desktop-napi";
|
||||
|
||||
const chromiumImporter = {
|
||||
getMetadata: (): Promise<Record<string, chromium_importer.NativeImporterMetadata>> =>
|
||||
ipcRenderer.invoke("chromium_importer.getMetadata"),
|
||||
getMetadata: (
|
||||
isMas: boolean,
|
||||
): Promise<Record<string, chromium_importer.NativeImporterMetadata>> =>
|
||||
ipcRenderer.invoke("chromium_importer.getMetadata", isMas),
|
||||
// Request browser access for Mac OS App Store (sandboxed) builds (no-op in non-sandboxed builds)
|
||||
requestBrowserAccess: (browser: string): Promise<void> =>
|
||||
ipcRenderer.invoke("chromium_importer.requestBrowserAccess", browser),
|
||||
|
||||
Reference in New Issue
Block a user