Cargo.lock

@@ -1439,7 +1439,6 @@ dependencies = [
  "dotenvy_macro",
  "log",
  "md5",
- "open",
  "redact-engine",
  "regex",
  "reqwest",
@@ -1471,6 +1470,7 @@ dependencies = [
  "gpapi",
  "html-escape",
  "log",
+ "open",
  "regex",
  "serde_json",
  "tauri",

Cargo.toml

@@ -44,6 +44,7 @@ compile-time = "0.2"
 serde_urlencoded = "0.7"
 md5="0.7"
 sha256="1"
+open = "5"
 
 # Tauri dependencies
 tauri = { version = "1.5" }

README.md

@@ -43,12 +43,6 @@ Options:
 See 'gpclient help <command>' for more information on a specific command.
 ```
 
-To use the default browser for authentication with the CLI version, you need to use the following command:
-
-```bash
-sudo -E gpclient connect --default-browser <portal>
-```
-
 ### GUI
 
 The GUI version is also available after you installed it. You can launch it from the application menu or run `gpclient launch-gui` in the terminal.
@@ -143,30 +137,6 @@ Download the latest RPM package from [releases](https://github.com/yuezk/GlobalP
 ```bash
 sudo rpm -i globalprotect-openconnect-*.rpm
 ```
-### Gentoo
-
-Install from the ```rios``` or ```slonko``` overlays.  Example using rios:
-
-#### 1. Enable the overlay
-```
-sudo eselect repository enable rios
-```
-
-#### 2. Sync with the repository
-
-  - If you have eix installed, use it:
-```
-sudo eix-sync
-```
-  - Otherwise, use:
-```
-sudo emerge --sync
-```
-
-#### 3. Install
-
-```sudo emerge globalprotect-openconnect```
-
 
 ### Other distributions
 

apps/gpauth/Cargo.toml

@@ -8,11 +8,7 @@ license.workspace = true
 tauri-build = { version = "1.5", features = [] }
 
 [dependencies]
-gpapi = { path = "../../crates/gpapi", features = [
+gpapi = { path = "../../crates/gpapi", features = ["tauri", "clap"] }
-  "tauri",
-  "clap",
-  "browser-auth",
-] }
 anyhow.workspace = true
 clap.workspace = true
 env_logger.workspace = true
@@ -26,3 +22,4 @@ html-escape = "0.2.13"
 webkit2gtk = "0.18.2"
 tauri = { workspace = true, features = ["http-all"] }
 compile-time.workspace = true
+open.workspace = true

apps/gpauth/src/cli.rs

@@ -3,7 +3,6 @@ use gpapi::{
   auth::{SamlAuthData, SamlAuthResult},
   clap::args::Os,
   gp_params::{ClientOs, GpParams},
-  process::browser_authenticator::BrowserAuthenticator,
   utils::{normalize_server, openssl},
   GP_USER_AGENT,
 };
@@ -12,7 +11,10 @@ use serde_json::json;
 use tauri::{App, AppHandle, RunEvent};
 use tempfile::NamedTempFile;
 
-use crate::auth_window::{portal_prelogin, AuthWindow};
+use crate::{
+  auth_window::{portal_prelogin, AuthWindow},
+  browser_authenticator::BrowserAuthenticator,
+};
 
 const VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), " (", compile_time::date_str!(), ")");
 

apps/gpauth/src/main.rs

@@ -1,6 +1,7 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 mod auth_window;
+mod browser_authenticator;
 mod cli;
 
 #[tokio::main]

crates/gpapi/Cargo.toml

@@ -31,9 +31,7 @@ sha256.workspace = true
 
 tauri = { workspace = true, optional = true }
 clap = { workspace = true, optional = true }
-open = { version = "5", optional = true }
 
 [features]
 tauri = ["dep:tauri"]
 clap = ["dep:clap"]
-browser-auth = ["dep:open"]

crates/gpapi/src/process/mod.rs

@@ -2,8 +2,6 @@ pub(crate) mod command_traits;
 pub(crate) mod gui_helper_launcher;
 
 pub mod auth_launcher;
-#[cfg(feature = "browser-auth")]
-pub mod browser_authenticator;
 pub mod gui_launcher;
 pub mod hip_launcher;
 pub mod service_launcher;