From 780ae43f8f8f0416663265ba394345c070056240 Mon Sep 17 00:00:00 2001 From: Colton Hurst Date: Mon, 19 May 2025 13:33:07 -0400 Subject: [PATCH] PM-19255: small stuff --- .../desktop_native/windows_plugin_authenticator/src/lib.rs | 7 +++++-- .../src/pluginauthenticator.rs | 5 +++++ apps/desktop/package.json | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/desktop/desktop_native/windows_plugin_authenticator/src/lib.rs b/apps/desktop/desktop_native/windows_plugin_authenticator/src/lib.rs index c4c0a05ee3f..5981ed9860d 100644 --- a/apps/desktop/desktop_native/windows_plugin_authenticator/src/lib.rs +++ b/apps/desktop/desktop_native/windows_plugin_authenticator/src/lib.rs @@ -28,17 +28,20 @@ const RPID: &str = "bitwarden.com"; pub fn register() -> std::result::Result<(), String> { util::message(String::from("register() called")); + util::message(String::from("About to call initialize_com_library()")); let r = initialize_com_library(); util::message(format!("initialized the com library: {:?}", r)); + util::message(String::from("About to call register_com_library()")); let r = register_com_library(); util::message(format!("registered the com library: {:?}", r)); + util::message(String::from("About to call add_authenticator()")); let r = add_authenticator(); util::message(format!("added the authenticator: {:?}", r)); - util::message(String::from("sleeping for 15 seconds...")); - thread::sleep(Duration::from_millis(15000)); + util::message(String::from("sleeping for 20 seconds...")); + thread::sleep(Duration::from_millis(20000)); util::message(String::from("sleeping done")); // --------------------------------------- diff --git a/apps/desktop/desktop_native/windows_plugin_authenticator/src/pluginauthenticator.rs b/apps/desktop/desktop_native/windows_plugin_authenticator/src/pluginauthenticator.rs index 410226ead41..1579b873c05 100644 --- a/apps/desktop/desktop_native/windows_plugin_authenticator/src/pluginauthenticator.rs +++ b/apps/desktop/desktop_native/windows_plugin_authenticator/src/pluginauthenticator.rs @@ -8,6 +8,8 @@ use windows::Win32::System::Com::*; use windows_core::*; +use crate::util; + /// Used when creating and asserting credentials. /// Header File Name: _EXPERIMENTAL_WEBAUTHN_PLUGIN_OPERATION_REQUEST /// Header File Usage: EXPERIMENTAL_PluginMakeCredential() @@ -75,6 +77,7 @@ impl EXPERIMENTAL_IPluginAuthenticator_Impl for PluginAuthenticatorComObject_Imp _request: *const ExperimentalWebAuthnPluginOperationRequest, _response: *mut ExperimentalWebAuthnPluginOperationResponse, ) -> HRESULT { + util::message(String::from("EXPERIMENTAL_PluginMakeCredential() called")); HRESULT(0) } @@ -83,6 +86,7 @@ impl EXPERIMENTAL_IPluginAuthenticator_Impl for PluginAuthenticatorComObject_Imp _request: *const ExperimentalWebAuthnPluginOperationRequest, _response: *mut ExperimentalWebAuthnPluginOperationResponse, ) -> HRESULT { + util::message(String::from("EXPERIMENTAL_PluginGetAssertion() called")); HRESULT(0) } @@ -90,6 +94,7 @@ impl EXPERIMENTAL_IPluginAuthenticator_Impl for PluginAuthenticatorComObject_Imp &self, _request: *const ExperimentalWebAuthnPluginCancelOperationRequest, ) -> HRESULT { + util::message(String::from("EXPERIMENTAL_PluginCancelOperation() called")); HRESULT(0) } } diff --git a/apps/desktop/package.json b/apps/desktop/package.json index f392e42ab56..b69f6dd0099 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -19,7 +19,7 @@ "postinstall": "electron-rebuild", "start": "cross-env ELECTRON_IS_DEV=0 ELECTRON_NO_UPDATER=1 electron ./build", "build-native": "cd desktop_native && node build.js", - "build": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" concurrently -n Main,Rend,Prel -c yellow,cyan \"npm run build:main\" \"npm run build:renderer\" \"npm run build:preload\"", + "build": "cross-env NODE_OPTIONS=\"--max-old-space-size=16384\" 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 -c yellow,cyan \"npm run build:main:dev\" \"npm run build:renderer:dev\"", "build:preload": "cross-env NODE_ENV=production webpack --config webpack.preload.js", "build:preload:watch": "cross-env NODE_ENV=production webpack --config webpack.preload.js --watch", @@ -46,7 +46,7 @@ "pack:mac:mas:with-extension": "npm run clean:dist && npm run build:macos-extension:mas && electron-builder --mac mas --universal -p never", "pack:mac:masdev": "npm run clean:dist && electron-builder --mac mas-dev --universal -p never", "pack:mac:masdev:with-extension": "npm run clean:dist && npm run build:macos-extension:masdev && electron-builder --mac mas-dev --universal -p never", - "pack:win": "npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p never", + "pack:win": "npm run clean:dist && electron-builder --win --x64 -p never", "pack:win:ci": "npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p never", "dist:dir": "npm run build && npm run pack:dir", "dist:lin": "npm run build && npm run pack:lin",