From 0e74ff69c3cf838446d44c8fee81b13458ae82a6 Mon Sep 17 00:00:00 2001 From: Toby Chui Date: Sat, 7 Jun 2025 12:20:09 +0800 Subject: [PATCH] Fixed build error after merge - Fixed buid error in new merge for Oauth2 - Updated version no. - Optimized css in sso page --- src/def.go | 2 +- src/mod/dynamicproxy/authProviders.go | 2 +- src/reverseproxy.go | 2 +- src/web/components/sso.html | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/def.go b/src/def.go index 7d1f616..45a008b 100644 --- a/src/def.go +++ b/src/def.go @@ -44,7 +44,7 @@ import ( const ( /* Build Constants */ SYSTEM_NAME = "Zoraxy" - SYSTEM_VERSION = "3.2.2" + SYSTEM_VERSION = "3.2.3" DEVELOPMENT_BUILD = false /* System Constants */ diff --git a/src/mod/dynamicproxy/authProviders.go b/src/mod/dynamicproxy/authProviders.go index 295add6..cfaafa2 100644 --- a/src/mod/dynamicproxy/authProviders.go +++ b/src/mod/dynamicproxy/authProviders.go @@ -46,7 +46,7 @@ func handleAuthProviderRouting(sep *ProxyEndpoint, w http.ResponseWriter, r *htt h.Parent.Option.Logger.LogHTTPRequest(r, "host-http", 401, requestHostname, "") return true } - } else if sep.AuthenticationProvider.AuthMethod == AuthMethodOAuth2 { + case AuthMethodOauth2: err := h.handleOAuth2Auth(w, r) if err != nil { h.Parent.Option.Logger.LogHTTPRequest(r, "host-http", 401, requestHostname, "") diff --git a/src/reverseproxy.go b/src/reverseproxy.go index 9585de8..abb4e79 100644 --- a/src/reverseproxy.go +++ b/src/reverseproxy.go @@ -587,7 +587,7 @@ func ReverseProxyHandleEditEndpoint(w http.ResponseWriter, r *http.Request) { } else if authProviderType == 2 { newProxyEndpoint.AuthenticationProvider.AuthMethod = dynamicproxy.AuthMethodForward } else if authProviderType == 3 { - newProxyEndpoint.AuthenticationProvider.AuthMethod = dynamicproxy.AuthMethodOAuth2 + newProxyEndpoint.AuthenticationProvider.AuthMethod = dynamicproxy.AuthMethodOauth2 } else { newProxyEndpoint.AuthenticationProvider.AuthMethod = dynamicproxy.AuthMethodNone } diff --git a/src/web/components/sso.html b/src/web/components/sso.html index 9327649..605ccdd 100644 --- a/src/web/components/sso.html +++ b/src/web/components/sso.html @@ -1,4 +1,4 @@ -
+

SSO

Single Sign-On (SSO) and authentication providers settings

@@ -253,4 +253,6 @@ }); }); + /* Bind UI events */ + $(".sso .advanceSettings").accordion(); \ No newline at end of file