From ea2b3f72f42654e1fcc36bc967b6d24ebaa4e22f Mon Sep 17 00:00:00 2001 From: Isaiah Inuwa Date: Sat, 20 Dec 2025 00:13:33 -0600 Subject: [PATCH] Rename macos_provider to autofill_provider --- .github/CODEOWNERS | 2 +- apps/desktop/desktop_native/Cargo.lock | 30 +++++++++---------- apps/desktop/desktop_native/Cargo.toml | 2 +- .../.gitignore | 0 .../Cargo.toml | 4 +-- .../README.md | 0 .../build.sh | 14 ++++----- .../src/assertion.rs | 0 .../src/lib.rs | 0 .../src/registration.rs | 0 .../uniffi-bindgen.rs | 0 .../uniffi.toml | 0 .../macos/desktop.xcodeproj/project.pbxproj | 2 +- apps/desktop/package.json | 8 ++--- 14 files changed, 31 insertions(+), 31 deletions(-) rename apps/desktop/desktop_native/{macos_provider => autofill_provider}/.gitignore (100%) rename apps/desktop/desktop_native/{macos_provider => autofill_provider}/Cargo.toml (96%) rename apps/desktop/desktop_native/{macos_provider => autofill_provider}/README.md (100%) rename apps/desktop/desktop_native/{macos_provider => autofill_provider}/build.sh (64%) rename apps/desktop/desktop_native/{macos_provider => autofill_provider}/src/assertion.rs (100%) rename apps/desktop/desktop_native/{macos_provider => autofill_provider}/src/lib.rs (100%) rename apps/desktop/desktop_native/{macos_provider => autofill_provider}/src/registration.rs (100%) rename apps/desktop/desktop_native/{macos_provider => autofill_provider}/uniffi-bindgen.rs (100%) rename apps/desktop/desktop_native/{macos_provider => autofill_provider}/uniffi.toml (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d1266a174e4..f0aab2353eb 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -8,7 +8,7 @@ apps/desktop/desktop_native @bitwarden/team-platform-dev apps/desktop/desktop_native/objc/src/native/autofill @bitwarden/team-autofill-desktop-dev apps/desktop/desktop_native/core/src/autofill @bitwarden/team-autofill-desktop-dev -apps/desktop/desktop_native/macos_provider @bitwarden/team-autofill-desktop-dev +apps/desktop/desktop_native/autofill_provider @bitwarden/team-autofill-desktop-dev apps/desktop/desktop_native/core/src/secure_memory @bitwarden/team-key-management-dev ## No ownership for Cargo.lock and Cargo.toml to allow dependency updates diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock index 879c5621105..36a5df20f5e 100644 --- a/apps/desktop/desktop_native/Cargo.lock +++ b/apps/desktop/desktop_native/Cargo.lock @@ -324,6 +324,21 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +[[package]] +name = "autofill_provider" +version = "0.0.0" +dependencies = [ + "desktop_core", + "futures", + "serde", + "serde_json", + "tokio", + "tracing", + "tracing-oslog", + "tracing-subscriber", + "uniffi", +] + [[package]] name = "autotype" version = "0.0.0" @@ -1744,21 +1759,6 @@ version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" -[[package]] -name = "macos_provider" -version = "0.0.0" -dependencies = [ - "desktop_core", - "futures", - "serde", - "serde_json", - "tokio", - "tracing", - "tracing-oslog", - "tracing-subscriber", - "uniffi", -] - [[package]] name = "matchers" version = "0.2.0" diff --git a/apps/desktop/desktop_native/Cargo.toml b/apps/desktop/desktop_native/Cargo.toml index fec4dc41982..8ff904bb288 100644 --- a/apps/desktop/desktop_native/Cargo.toml +++ b/apps/desktop/desktop_native/Cargo.toml @@ -5,7 +5,7 @@ members = [ "bitwarden_chromium_import_helper", "chromium_importer", "core", - "macos_provider", + "autofill_provider", "napi", "process_isolation", "proxy", diff --git a/apps/desktop/desktop_native/macos_provider/.gitignore b/apps/desktop/desktop_native/autofill_provider/.gitignore similarity index 100% rename from apps/desktop/desktop_native/macos_provider/.gitignore rename to apps/desktop/desktop_native/autofill_provider/.gitignore diff --git a/apps/desktop/desktop_native/macos_provider/Cargo.toml b/apps/desktop/desktop_native/autofill_provider/Cargo.toml similarity index 96% rename from apps/desktop/desktop_native/macos_provider/Cargo.toml rename to apps/desktop/desktop_native/autofill_provider/Cargo.toml index d73bd2fa049..8ce23b412c4 100644 --- a/apps/desktop/desktop_native/macos_provider/Cargo.toml +++ b/apps/desktop/desktop_native/autofill_provider/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "macos_provider" +name = "autofill_provider" edition = { workspace = true } license = { workspace = true } version = { workspace = true } @@ -23,8 +23,8 @@ serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } tokio = { workspace = true, features = ["sync"] } tracing = { workspace = true } -tracing-oslog = "=0.3.0" tracing-subscriber = { workspace = true } +tracing-oslog = "=0.3.0" [build-dependencies] uniffi = { workspace = true, features = ["build"] } diff --git a/apps/desktop/desktop_native/macos_provider/README.md b/apps/desktop/desktop_native/autofill_provider/README.md similarity index 100% rename from apps/desktop/desktop_native/macos_provider/README.md rename to apps/desktop/desktop_native/autofill_provider/README.md diff --git a/apps/desktop/desktop_native/macos_provider/build.sh b/apps/desktop/desktop_native/autofill_provider/build.sh similarity index 64% rename from apps/desktop/desktop_native/macos_provider/build.sh rename to apps/desktop/desktop_native/autofill_provider/build.sh index 2f7a2d03541..ee9d9f9a11d 100755 --- a/apps/desktop/desktop_native/macos_provider/build.sh +++ b/apps/desktop/desktop_native/autofill_provider/build.sh @@ -11,17 +11,17 @@ mkdir -p ./tmp/target/universal-darwin/release/ rustup target add aarch64-apple-darwin rustup target add x86_64-apple-darwin -cargo build --package macos_provider --target aarch64-apple-darwin --release -cargo build --package macos_provider --target x86_64-apple-darwin --release +cargo build --package autofill_provider --target aarch64-apple-darwin --release +cargo build --package autofill_provider --target x86_64-apple-darwin --release # Create universal libraries -lipo -create ../target/aarch64-apple-darwin/release/libmacos_provider.a \ - ../target/x86_64-apple-darwin/release/libmacos_provider.a \ - -output ./tmp/target/universal-darwin/release/libmacos_provider.a +lipo -create ../target/aarch64-apple-darwin/release/libautofill_provider.a \ + ../target/x86_64-apple-darwin/release/libautofill_provider.a \ + -output ./tmp/target/universal-darwin/release/libautofill_provider.a # Generate swift bindings cargo run --bin uniffi-bindgen --features uniffi/cli generate \ - ../target/aarch64-apple-darwin/release/libmacos_provider.dylib \ + ../target/aarch64-apple-darwin/release/libautofill_provider.dylib \ --library \ --language swift \ --no-format \ @@ -38,7 +38,7 @@ cat ./tmp/bindings/*.modulemap > ./tmp/Headers/module.modulemap # Build xcframework xcodebuild -create-xcframework \ - -library ./tmp/target/universal-darwin/release/libmacos_provider.a \ + -library ./tmp/target/universal-darwin/release/libautofill_provider.a \ -headers ./tmp/Headers \ -output ./BitwardenMacosProviderFFI.xcframework diff --git a/apps/desktop/desktop_native/macos_provider/src/assertion.rs b/apps/desktop/desktop_native/autofill_provider/src/assertion.rs similarity index 100% rename from apps/desktop/desktop_native/macos_provider/src/assertion.rs rename to apps/desktop/desktop_native/autofill_provider/src/assertion.rs diff --git a/apps/desktop/desktop_native/macos_provider/src/lib.rs b/apps/desktop/desktop_native/autofill_provider/src/lib.rs similarity index 100% rename from apps/desktop/desktop_native/macos_provider/src/lib.rs rename to apps/desktop/desktop_native/autofill_provider/src/lib.rs diff --git a/apps/desktop/desktop_native/macos_provider/src/registration.rs b/apps/desktop/desktop_native/autofill_provider/src/registration.rs similarity index 100% rename from apps/desktop/desktop_native/macos_provider/src/registration.rs rename to apps/desktop/desktop_native/autofill_provider/src/registration.rs diff --git a/apps/desktop/desktop_native/macos_provider/uniffi-bindgen.rs b/apps/desktop/desktop_native/autofill_provider/uniffi-bindgen.rs similarity index 100% rename from apps/desktop/desktop_native/macos_provider/uniffi-bindgen.rs rename to apps/desktop/desktop_native/autofill_provider/uniffi-bindgen.rs diff --git a/apps/desktop/desktop_native/macos_provider/uniffi.toml b/apps/desktop/desktop_native/autofill_provider/uniffi.toml similarity index 100% rename from apps/desktop/desktop_native/macos_provider/uniffi.toml rename to apps/desktop/desktop_native/autofill_provider/uniffi.toml diff --git a/apps/desktop/macos/desktop.xcodeproj/project.pbxproj b/apps/desktop/macos/desktop.xcodeproj/project.pbxproj index ed19fc9ef5d..523c96bf97f 100644 --- a/apps/desktop/macos/desktop.xcodeproj/project.pbxproj +++ b/apps/desktop/macos/desktop.xcodeproj/project.pbxproj @@ -17,7 +17,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 3368DB382C654B8100896B75 /* BitwardenMacosProviderFFI.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BitwardenMacosProviderFFI.xcframework; path = ../desktop_native/macos_provider/BitwardenMacosProviderFFI.xcframework; sourceTree = ""; }; + 3368DB382C654B8100896B75 /* BitwardenMacosProviderFFI.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BitwardenMacosProviderFFI.xcframework; path = ../desktop_native/autofill_provider/BitwardenMacosProviderFFI.xcframework; sourceTree = ""; }; 3368DB3A2C654F3800896B75 /* BitwardenMacosProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BitwardenMacosProvider.swift; sourceTree = ""; }; 968ED08A2C52A47200FFFEE6 /* ReleaseAppStore.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ReleaseAppStore.xcconfig; sourceTree = ""; }; 9AE299082DF9D82E00AAE454 /* bitwarden-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bitwarden-icon.png"; sourceTree = ""; }; diff --git a/apps/desktop/package.json b/apps/desktop/package.json index ad20e7c0e69..dcbb0a0b40e 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -18,16 +18,16 @@ "scripts": { "postinstall": "electron-rebuild", "start": "cross-env ELECTRON_IS_DEV=0 ELECTRON_NO_UPDATER=1 electron ./build", - "build-native-macos": "cd desktop_native && ./macos_provider/build.sh && node build.js cross-platform", + "build-native-macos": "cd desktop_native && ./autofill_provider/build.sh && node build.js cross-platform", "build-native": "cd desktop_native && node build.js", "build": "concurrently -n Main,Rend,Prel -c yellow,cyan \"npm run build:main\" \"npm run build:renderer\" \"npm run build:preload\"", "build:dev": "concurrently -n Main,Rend,Prel -c yellow,cyan \"npm run build:main:dev\" \"npm run build:renderer:dev\" \"npm run build:preload:dev\"", "build:preload": "cross-env NODE_ENV=production webpack --config webpack.config.js --config-name preload", "build:preload:dev": "cross-env NODE_ENV=development webpack --config webpack.config.js --config-name preload", "build:preload:watch": "cross-env NODE_ENV=development webpack --config webpack.config.js --config-name preload --watch", - "build:macos-extension:mac": "./desktop_native/macos_provider/build.sh && node scripts/build-macos-extension.js mac", - "build:macos-extension:mas": "./desktop_native/macos_provider/build.sh && node scripts/build-macos-extension.js mas", - "build:macos-extension:masdev": "./desktop_native/macos_provider/build.sh && node scripts/build-macos-extension.js mas-dev", + "build:macos-extension:mac": "./desktop_native/autofill_provider/build.sh && node scripts/build-macos-extension.js mac", + "build:macos-extension:mas": "./desktop_native/autofill_provider/build.sh && node scripts/build-macos-extension.js mas", + "build:macos-extension:masdev": "./desktop_native/autofill_provider/build.sh && node scripts/build-macos-extension.js mas-dev", "build:main": "cross-env NODE_ENV=production webpack --config webpack.config.js --config-name main", "build:main:dev": "cross-env NODE_ENV=development webpack --config webpack.config.js --config-name main", "build:main:watch": "npm run build-native && cross-env NODE_ENV=development webpack --config webpack.config.js --config-name main --watch",