fix: complete 2.6.1 release updates

This commit is contained in:
Kevin Yue committed 2026-06-22 11:46:26 +08:00
1 parent 40739739b5
commit 6746cf64c3
8 files changed
+171 -54

No files matched your search

+4
View File
@@ -74,12 +74,16 @@ impl ConnectHandler<'_> {
};
let verbose = self.shared_args.verbose.to_verbose_arg();
let os_profile = self.os_profile.borrow().clone();
let key_password = self.latest_key_password.borrow().clone();
let auth_launcher = SamlAuthLauncher::new(server)
.gateway(is_gateway)
.saml_request(prelogin.saml_request())
.os_profile(&os_profile)
.fix_openssl(self.shared_args.fix_openssl)
.ignore_tls_errors(self.shared_args.ignore_tls_errors)
.certificate(self.args.certificate.as_deref())
.sslkey(self.args.sslkey.as_deref())
.key_password(key_password.as_deref())
.browser(browser)
.verbose(verbose);
+5 -2
View File
@@ -139,8 +139,11 @@ impl ConnectHandler<'_> {
let mut gp_params = self.build_gp_params();
gp_params.set_is_gateway(true);
let prelogin = prelogin(gateway, &gp_params, self.prelogin_options(true)).await?;
let cred = self.obtain_credential(&prelogin, gateway, true).await?;
let gateway_external_browser_allowed = true;
let prelogin = prelogin(gateway, &gp_params, self.direct_gateway_prelogin_options()).await?;
let cred = self
.obtain_credential(&prelogin, gateway, gateway_external_browser_allowed)
.await?;
let login_session = self
.login_gateway(gateway, &cred, &gp_params, gateway_context.as_ref())
+4
View File
@@ -71,6 +71,10 @@ impl<'a> ConnectHandler<'a> {
.gateway_external_browser_allowed(gateway_external_browser_allowed)
}
pub(super) fn direct_gateway_prelogin_options(&self) -> PreloginOptions {
self.prelogin_options(true)
}
fn external_browser_requested(&self) -> bool {
#[cfg(feature = "webview-auth")]
{