Merge branch 'dev' into main

crates/gpapi/Cargo.toml

@@ -35,8 +35,9 @@ which.workspace = true
 tauri = { workspace = true, optional = true }
 clap = { workspace = true, optional = true }
 open = { version = "5", optional = true }
+webbrowser = { version = "1", optional = true }
 
 [features]
 tauri = ["dep:tauri"]
 clap = ["dep:clap"]
-browser-auth = ["dep:open"]
+browser-auth = ["dep:open", "dep:webbrowser"]

crates/gpapi/src/portal/config.rs

@@ -167,7 +167,9 @@ pub async fn retrieve_config(portal: &str, cred: &Credential, gp_params: &GpPara
   });
 
   let user_auth_cookie = root.descendant_text("portal-userauthcookie").unwrap_or_default();
-  let prelogon_user_auth_cookie = root.descendant_text("portal-prelogonuserauthcookie").unwrap_or_default();
+  let prelogon_user_auth_cookie = root
+    .descendant_text("portal-prelogonuserauthcookie")
+    .unwrap_or_default();
   let config_digest = root.descendant_text("config-digest");
 
   if gateways.is_empty() {

crates/gpapi/src/process/browser_authenticator.rs

@@ -17,9 +17,14 @@ impl BrowserAuthenticator<'_> {
   }
 
   pub fn new_with_browser<'a>(auth_request: &'a str, browser: &'a str) -> BrowserAuthenticator<'a> {
+    let browser = browser.trim();
     BrowserAuthenticator {
       auth_request,
-      browser: if browser == "default" { None } else { Some(browser) },
+      browser: if browser.is_empty() || browser == "default" {
+        None
+      } else {
+        Some(browser)
+      },
     }
   }
 
@@ -52,7 +57,7 @@ impl BrowserAuthenticator<'_> {
       open::with_detached(path.as_ref(), app)?;
     } else {
       info!("Launching the default browser...");
-      open::that_detached(path.as_ref())?;
+      webbrowser::open(path.as_ref())?;
     }
 
     Ok(())