cassidy/GlobalProtect-openconnect
1
0
Fork 0
mirror of https://github.com/yuezk/GlobalProtect-openconnect.git synced 2025-04-02 18:31:50 -04:00
Code Issues Projects Releases Wiki Activity

refactor: upgrade tauri 2.0

Browse Source
This commit is contained in:
Kevin Yue 2024-11-30 21:29:42 +08:00
parent 3316fdf722
commit bf0ed4c478
No known key found for this signature in database
GPG Key ID: 4D3A6EE977B15AC4
10 changed files with 884 additions and 678 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1536
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
crates/gpapi/Cargo.toml
View File

@ -14,8 +14,8 @@ openssl.workspace = true
pem.workspace = true pem.workspace = true
roxmltree.workspace = true roxmltree.workspace = true
serde.workspace = true serde.workspace = true
specta.workspace = true specta = { workspace = true, features = ["derive"] }
specta-macros.workspace = true # specta-util = {version = "0.0.7"}
urlencoding.workspace = true urlencoding.workspace = true
tokio.workspace = true tokio.workspace = true
serde_json.workspace = true serde_json.workspace = true

2
crates/gpapi/src/credential.rs
View File

@ -2,7 +2,7 @@ use std::collections::HashMap;
use anyhow::bail; use anyhow::bail;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use specta_macros::Type; use specta::Type;
use crate::auth::{SamlAuthData, SamlAuthResult}; use crate::auth::{SamlAuthData, SamlAuthResult};

2
crates/gpapi/src/gateway/mod.rs
View File

@ -6,7 +6,7 @@ pub use login::*;
pub(crate) use parse_gateways::*; pub(crate) use parse_gateways::*;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use specta_macros::Type; use specta::Type;
use std::fmt::Display; use std::fmt::Display;

2
crates/gpapi/src/gp_params.rs
View File

@ -3,7 +3,7 @@ use std::collections::HashMap;
use log::info; use log::info;
use reqwest::Client; use reqwest::Client;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use specta_macros::Type; use specta::Type;
use crate::{utils::request::create_identity, GP_USER_AGENT}; use crate::{utils::request::create_identity, GP_USER_AGENT};

2
crates/gpapi/src/portal/config.rs
View File

@ -4,7 +4,7 @@ use log::{debug, info, warn};
use reqwest::{Client, StatusCode}; use reqwest::{Client, StatusCode};
use roxmltree::{Document, Node}; use roxmltree::{Document, Node};
use serde::Serialize; use serde::Serialize;
use specta_macros::Type; use specta::Type;
use crate::{ use crate::{
credential::{AuthCookieCredential, Credential}, credential::{AuthCookieCredential, Credential},

2
crates/gpapi/src/portal/prelogin.rs
View File

@ -3,7 +3,7 @@ use log::{info, warn};
use reqwest::{Client, StatusCode}; use reqwest::{Client, StatusCode};
use roxmltree::Document; use roxmltree::Document;
use serde::Serialize; use serde::Serialize;
use specta_macros::Type; use specta::Type;
use crate::{ use crate::{
error::PortalError, error::PortalError,

2
crates/gpapi/src/service/request.rs
View File

@ -1,7 +1,7 @@
use std::collections::HashMap; use std::collections::HashMap;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use specta_macros::Type; use specta::Type;
use crate::{gateway::Gateway, gp_params::ClientOs}; use crate::{gateway::Gateway, gp_params::ClientOs};

2
crates/gpapi/src/service/vpn_state.rs
View File

@ -1,5 +1,5 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use specta_macros::Type; use specta::Type;
use crate::gateway::Gateway; use crate::gateway::Gateway;

8
crates/gpapi/src/utils/window.rs
View File

@ -2,7 +2,7 @@ use std::{process::ExitStatus, time::Duration};
use anyhow::bail; use anyhow::bail;
use log::info; use log::info;
use tauri::Window; use tauri::WebviewWindow;
use tokio::process::Command; use tokio::process::Command;
pub trait WindowExt { pub trait WindowExt {
@ -10,7 +10,7 @@ pub trait WindowExt {
fn hide_menu(&self); fn hide_menu(&self);
} }
impl WindowExt for Window { impl WindowExt for WebviewWindow {
fn raise(&self) -> anyhow::Result<()> { fn raise(&self) -> anyhow::Result<()> {
raise_window(self) raise_window(self)
} }
@ -20,7 +20,7 @@ impl WindowExt for Window {
} }
} }
pub fn raise_window(win: &Window) -> anyhow::Result<()> { pub fn raise_window(win: &WebviewWindow) -> anyhow::Result<()> {
let is_wayland = std::env::var("XDG_SESSION_TYPE").unwrap_or_default() == "wayland"; let is_wayland = std::env::var("XDG_SESSION_TYPE").unwrap_or_default() == "wayland";
if is_wayland { if is_wayland {
@ -77,7 +77,7 @@ async fn wmctrl_try_raise_window(title: &str) -> anyhow::Result<ExitStatus> {
Ok(exit_status) Ok(exit_status)
} }
fn hide_menu(win: &Window) { fn hide_menu(win: &WebviewWindow) {
// let menu_handle = win.menu_handle(); // let menu_handle = win.menu_handle();
// tokio::spawn(async move { // tokio::spawn(async move {