fix: docker test and golangci-lint

yusing · Jan 12, 2025 · ef277ef · ef277ef
1 parent 9a12dab
commit ef277ef
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/internal/api/v1/auth/auth.go b/internal/api/v1/auth/auth.go
@@ -51,7 +51,7 @@ func LoginHandler(w http.ResponseWriter, r *http.Request) {
 		U.HandleErr(w, r, err, http.StatusUnauthorized)
 		return
 	}
-	if err := setAuthenticatedCookie(w, r, creds.Username); err != nil {
+	if err := setAuthenticatedCookie(w, creds.Username); err != nil {
 		U.HandleErr(w, r, err, http.StatusInternalServerError)
 		return
 	}
@@ -72,7 +72,7 @@ func AuthMethodHandler(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusOK)
 }
 
-func setAuthenticatedCookie(w http.ResponseWriter, r *http.Request, username string) error {
+func setAuthenticatedCookie(w http.ResponseWriter, username string) error {
 	expiresAt := time.Now().Add(common.APIJWTTokenTTL)
 	claim := &Claims{
 		Username: username,

diff --git a/internal/api/v1/auth/oidc.go b/internal/api/v1/auth/oidc.go
@@ -20,7 +20,7 @@ var (
 	oidcVerifier *oidc.IDTokenVerifier
 )
 
-// InitOIDC initializes the OIDC provider
+// InitOIDC initializes the OIDC provider.
 func InitOIDC(issuerURL, clientID, clientSecret, redirectURL string) error {
 	if issuerURL == "" {
 		return nil // OIDC not configured
@@ -47,7 +47,7 @@ func InitOIDC(issuerURL, clientID, clientSecret, redirectURL string) error {
 	return nil
 }
 
-// OIDCLoginHandler initiates the OIDC login flow
+// OIDCLoginHandler initiates the OIDC login flow.
 func OIDCLoginHandler(w http.ResponseWriter, r *http.Request) {
 	if oauthConfig == nil {
 		U.HandleErr(w, r, E.New("OIDC not configured"), http.StatusNotImplemented)
@@ -69,7 +69,7 @@ func OIDCLoginHandler(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, url, http.StatusTemporaryRedirect)
 }
 
-// OIDCCallbackHandler handles the OIDC callback
+// OIDCCallbackHandler handles the OIDC callback.
 func OIDCCallbackHandler(w http.ResponseWriter, r *http.Request) {
 	if oauthConfig == nil {
 		U.HandleErr(w, r, E.New("OIDC not configured"), http.StatusNotImplemented)
@@ -126,7 +126,7 @@ func OIDCCallbackHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if err := setAuthenticatedCookie(w, r, claims.Username); err != nil {
+	if err := setAuthenticatedCookie(w, claims.Username); err != nil {
 		U.HandleErr(w, r, err, http.StatusInternalServerError)
 		return
 	}
@@ -135,7 +135,7 @@ func OIDCCallbackHandler(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, "/", http.StatusTemporaryRedirect)
 }
 
-// handleTestCallback handles OIDC callback in test environment
+// handleTestCallback handles OIDC callback in test environment.
 func handleTestCallback(w http.ResponseWriter, r *http.Request) {
 	state, err := r.Cookie("oauth_state")
 	if err != nil {

diff --git a/internal/api/v1/auth/oidc_test.go b/internal/api/v1/auth/oidc_test.go
@@ -10,7 +10,7 @@ import (
 	"golang.org/x/oauth2"
 )
 
-// setupMockOIDC configures mock OIDC provider for testing
+// setupMockOIDC configures mock OIDC provider for testing.
 func setupMockOIDC(t *testing.T) {
 	t.Helper()
 
@@ -68,7 +68,7 @@ func TestOIDCLoginHandler(t *testing.T) {
 				oauthConfig = nil
 			}
 
-			req := httptest.NewRequest("GET", "/login/oidc", nil)
+			req := httptest.NewRequest(http.MethodGet, "/login/oidc", nil)
 			w := httptest.NewRecorder()
 
 			OIDCLoginHandler(w, req)
@@ -143,7 +143,7 @@ func TestOIDCCallbackHandler(t *testing.T) {
 				oauthConfig = nil
 			}
 
-			req := httptest.NewRequest("GET", "/auth/callback?code="+tt.code+"&state="+tt.state, nil)
+			req := httptest.NewRequest(http.MethodGet, "/auth/callback?code="+tt.code+"&state="+tt.state, nil)
 			if tt.state != "" {
 				req.AddCookie(&http.Cookie{
 					Name:  "oauth_state",

diff --git a/internal/route/provider/docker_test.go b/internal/route/provider/docker_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/yusing/go-proxy/internal/common"
 	D "github.com/yusing/go-proxy/internal/docker"
 	E "github.com/yusing/go-proxy/internal/error"
-	"github.com/yusing/go-proxy/internal/homepage"
 	"github.com/yusing/go-proxy/internal/route"
 	"github.com/yusing/go-proxy/internal/route/entry"
 	T "github.com/yusing/go-proxy/internal/route/types"
@@ -130,8 +129,9 @@ func TestApplyLabel(t *testing.T) {
 	ExpectEqual(t, b.Container.StopSignal, "SIGTERM")
 
 	ExpectEqual(t, a.Homepage.Show, true)
-	ExpectEqual(t, a.Homepage.Icon.Value, homepage.DashboardIconBaseURL+"png/example.png")
-	ExpectEqual(t, a.Homepage.Icon.IsRelative, false)
+	ExpectEqual(t, a.Homepage.Icon.Value, "png/example.png")
+	ExpectEqual(t, a.Homepage.Icon.Extra.FileType, "png")
+	ExpectEqual(t, a.Homepage.Icon.Extra.Name, "example")
 
 	ExpectEqual(t, a.HealthCheck.Path, "/ping")
 	ExpectEqual(t, a.HealthCheck.Interval, 10*time.Second)