Merge branch 'dev' into main

yuezk · Oct 31, 2024 · 2dc7f97 · 2dc7f97
2 parents 516d685 + 6542d67
commit 2dc7f97
Show file tree

Hide file tree

Showing 4 changed files with 181 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/gpapi/Cargo.toml b/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"]
diff --git a/crates/gpapi/src/portal/config.rs b/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() {