From 17d1555155e119a63ad9c7f4df0afd893400c918 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Thu, 6 Aug 2026 10:59:56 +0800 Subject: [PATCH] fix: refine macOS authentication app lifecycle --- apps/gpauth/Info.plist | 2 ++ apps/gpauth/src/callback_app.rs | 3 +++ apps/gpauth/src/webview_auth.rs | 3 +++ crates/auth/src/callback/macos.rs | 28 ++++++++++++++++++------- crates/auth/src/webview/webview_auth.rs | 10 +++++++++ 5 files changed, 38 insertions(+), 8 deletions(-) diff --git a/apps/gpauth/Info.plist b/apps/gpauth/Info.plist index e8b03b9..d8b32ff 100644 --- a/apps/gpauth/Info.plist +++ b/apps/gpauth/Info.plist @@ -2,6 +2,8 @@ + LSUIElement + CFBundleURLTypes diff --git a/apps/gpauth/src/callback_app.rs b/apps/gpauth/src/callback_app.rs index e08cf25..66eab62 100644 --- a/apps/gpauth/src/callback_app.rs +++ b/apps/gpauth/src/callback_app.rs @@ -13,6 +13,9 @@ pub fn run() -> anyhow::Result<()> { let timeout_handled = Arc::clone(&handled); let app = tauri::Builder::default() .setup(move |app| { + #[cfg(target_os = "macos")] + app.set_activation_policy(tauri::ActivationPolicy::Accessory); + let app_handle = app.handle().clone(); tauri::async_runtime::spawn(async move { tokio::time::sleep(Duration::from_secs(10)).await; diff --git a/apps/gpauth/src/webview_auth.rs b/apps/gpauth/src/webview_auth.rs index cbd154e..0b162ca 100644 --- a/apps/gpauth/src/webview_auth.rs +++ b/apps/gpauth/src/webview_auth.rs @@ -19,6 +19,9 @@ pub async fn authenticate( tauri::Builder::default() .setup(move |app| { + #[cfg(target_os = "macos")] + app.set_activation_policy(tauri::ActivationPolicy::Accessory); + apply_auth_theme(app.handle(), window_theme); let app_handle = app.handle().clone(); diff --git a/crates/auth/src/callback/macos.rs b/crates/auth/src/callback/macos.rs index c4a947c..4516a03 100644 --- a/crates/auth/src/callback/macos.rs +++ b/crates/auth/src/callback/macos.rs @@ -1,4 +1,4 @@ -use std::{ffi::OsStr, path::PathBuf, thread, time::Duration}; +use std::{ffi::OsStr, os::raw::c_void, path::PathBuf, thread, time::Duration}; use anyhow::{Context, bail}; use objc2_app_kit::NSWorkspace; @@ -9,6 +9,11 @@ const CALLBACK_URL: &str = "globalprotectcallback:"; const HANDLER_BUNDLE_ID: &str = "com.yuezk.gpauth"; const LOGIN_APP_NAME: &str = "GP Connect Login.app"; +#[link(name = "CoreServices", kind = "framework")] +unsafe extern "C" { + fn LSRegisterURL(url: *const c_void, update: u8) -> i32; +} + pub(super) fn ensure_auth_callback_handler() -> anyhow::Result<()> { let workspace = NSWorkspace::sharedWorkspace(); let app_paths = callback_app_paths(); @@ -28,6 +33,7 @@ pub(super) fn ensure_auth_callback_handler() -> anyhow::Result<()> { .first() .context("GP Connect Login.app is required for external-browser authentication; install GP Connect")?; let app_url = file_url(app_path); + register_app(&app_url)?; workspace.setDefaultApplicationAtURL_toOpenURLsWithScheme_completionHandler( &app_url, &NSString::from_str(CALLBACK_SCHEME), @@ -46,6 +52,16 @@ pub(super) fn ensure_auth_callback_handler() -> anyhow::Result<()> { bail!("The globalprotectcallback URL handler registration did not take effect") } +fn register_app(app_url: &NSURL) -> anyhow::Result<()> { + // A nested application is not necessarily known to LaunchServices until it + // has been launched. Register it explicitly before assigning its URL scheme. + let status = unsafe { LSRegisterURL(app_url as *const NSURL as *const c_void, 1) }; + if status != 0 { + bail!("Failed to register GP Connect Login.app with LaunchServices (OSStatus {status})"); + } + Ok(()) +} + fn current_handler(workspace: &NSWorkspace) -> Option<(String, PathBuf)> { let callback_url = NSURL::URLWithString(&NSString::from_str(CALLBACK_URL))?; let app_url = workspace.URLForApplicationToOpenURL(&callback_url)?; @@ -70,18 +86,14 @@ fn callback_app_paths() -> Vec { if let Some(user_dir) = std::env::var_os("HOME").filter(|path| !path.is_empty()) { let applications = PathBuf::from(user_dir).join("Applications"); - candidates.extend([ + candidates.push( applications .join("GP Connect.app/Contents/Helpers") .join(LOGIN_APP_NAME), - applications.join(LOGIN_APP_NAME), - ]); + ); } - candidates.extend([ - PathBuf::from("/Applications/GP Connect.app/Contents/Helpers").join(LOGIN_APP_NAME), - PathBuf::from("/Applications").join(LOGIN_APP_NAME), - ]); + candidates.push(PathBuf::from("/Applications/GP Connect.app/Contents/Helpers").join(LOGIN_APP_NAME)); candidates .into_iter() diff --git a/crates/auth/src/webview/webview_auth.rs b/crates/auth/src/webview/webview_auth.rs index beca65d..da71051 100644 --- a/crates/auth/src/webview/webview_auth.rs +++ b/crates/auth/src/webview/webview_auth.rs @@ -8,6 +8,8 @@ use gpapi::{ utils::{redact::redact_uri, window::get_title_bar_height}, }; use log::{info, warn}; +#[cfg(target_os = "macos")] +use tauri::Manager; use tauri::{ AppHandle, WebviewUrl, WebviewWindow, WindowEvent, webview::{PageLoadEvent, PageLoadPayload}, @@ -318,6 +320,14 @@ impl<'a> WebviewAuthenticator<'a> { info!("Raising auth window..."); + #[cfg(target_os = "macos")] + if let Err(err) = auth_window + .app_handle() + .set_activation_policy(tauri::ActivationPolicy::Regular) + { + warn!("Failed to show the application in the Dock: {}", err); + } + use gpapi::utils::window::WindowExt; let result = auth_window.raise();