bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-29 14:43:31 +00:00
Code Issues Releases Wiki Activity

remove sandbox feature flag and refactor to use bool

Browse Source
This commit is contained in:
John Harrington
2025-12-02 10:03:03 -07:00
parent 618d1dc1cb
commit b58207e409
11 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/desktop/desktop_native/napi/Cargo.toml
View File

@@ -12,7 +12,6 @@ crate-type = ["cdylib"]
[features]
default = []
manual_test = []
sandbox = ["chromium_importer/sandbox"]
[dependencies]
anyhow = { workspace = true }

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

@@ -255,8 +255,8 @@ export declare namespace chromium_importer {
/** Returns OS aware metadata describing supported Chromium based importers as a JSON string. */
export function getMetadata(masBuild: boolean): Record<string, NativeImporterMetadata>
export function getAvailableProfiles(browser: string): Array<ProfileInfo>
export function importLogins(browser: string, profileId: string): Promise<Array<LoginImportResult>>
export function requestBrowserAccess(browser: string): void
export function importLogins(browser: string, profileId: string, masBuild: boolean): Promise<Array<LoginImportResult>>
export function requestBrowserAccess(browser: string, masBuild: boolean): void
}
export declare namespace autotype {
export function getForegroundWindowTitle(): string

7
apps/desktop/desktop_native/napi/scripts/build.js
View File

@@ -11,9 +11,4 @@ if (isRelease) {
process.env.RUST_LOG = 'debug';
}
const featuresArg = process.env.SANDBOX_BUILD === '1' ? '--features sandbox' : '';
if (featuresArg) {
console.log('Building with sandbox feature enabled.');
}
execSync(`napi build --platform --js false ${featuresArg}`, { stdio: 'inherit', env: process.env });
execSync(`napi build --platform --js false`, { stdio: 'inherit', env: process.env });

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

@@ -1186,24 +1186,24 @@ pub mod chromium_importer {
pub async fn import_logins(
browser: String,
profile_id: String,
mas_build: bool,
) -> napi::Result<Vec<LoginImportResult>> {
chromium_importer::chromium::import_logins(&browser, &profile_id)
chromium_importer::chromium::import_logins(&browser, &profile_id, mas_build)
.await
.map(|logins| logins.into_iter().map(LoginImportResult::from).collect())
.map_err(|e| napi::Error::from_reason(e.to_string()))
}
#[napi]
#[allow(unused_variables)]
pub fn request_browser_access(browser: String) -> napi::Result<()> {
#[cfg(all(target_os = "macos", feature = "sandbox"))]
pub fn request_browser_access(browser: String, mas_build: bool) -> napi::Result<()> {
#[cfg(target_os = "macos")]
{
chromium_importer::chromium::request_browser_access(&browser)
chromium_importer::chromium::request_browser_access(&browser, mas_build)
.map_err(|e| napi::Error::from_reason(e.to_string()))
}
#[cfg(not(all(target_os = "macos", feature = "sandbox")))]
#[cfg(not(target_os = "macos"))]
{
// No-op when built without sandbox feature
// No-op outside of Mac OS
Ok(())
}
}