From 46ad450327111b9d28b592658d75ef57da498298 Mon Sep 17 00:00:00 2001 From: tjpcc Date: Wed, 15 Feb 2023 16:44:29 -0700 Subject: Switch Handler to an interface. HandlerFunc is much better as a function returning a Handler, rather than a newtype for the function type itself. This way there is no confusion creating a type-inferenced variable with HandlerFunc(func(... and then using a HandlerFunc where a Handler is expected. Much better to only have one public type. --- contrib/tlsauth/gemini_test.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'contrib/tlsauth/gemini_test.go') diff --git a/contrib/tlsauth/gemini_test.go b/contrib/tlsauth/gemini_test.go index 8f1efda..7823de6 100644 --- a/contrib/tlsauth/gemini_test.go +++ b/contrib/tlsauth/gemini_test.go @@ -14,30 +14,30 @@ import ( ) func TestGeminiAuth(t *testing.T) { - handler1 := func(_ context.Context, request *gus.Request) *gus.Response { + handler1 := gus.HandlerFunc(func(_ context.Context, request *gus.Request) *gus.Response { if !strings.HasPrefix(request.Path, "/one") { return nil } return gemini.Success("", &bytes.Buffer{}) - } - handler2 := func(_ context.Context, request *gus.Request) *gus.Response { + }) + handler2 := gus.HandlerFunc(func(_ context.Context, request *gus.Request) *gus.Response { if !strings.HasPrefix(request.Path, "/two") { return nil } return gemini.Success("", &bytes.Buffer{}) - } - handler3 := func(_ context.Context, request *gus.Request) *gus.Response { + }) + handler3 := gus.HandlerFunc(func(_ context.Context, request *gus.Request) *gus.Response { if !strings.HasPrefix(request.Path, "/three") { return nil } return gemini.Success("", &bytes.Buffer{}) - } - handler4 := func(_ context.Context, request *gus.Request) *gus.Response { + }) + handler4 := gus.HandlerFunc(func(_ context.Context, request *gus.Request) *gus.Response { return gemini.Success("", &bytes.Buffer{}) - } + }) handler := gus.FallthroughHandler( tlsauth.GeminiAuth(tlsauth.Allow)(handler1), @@ -74,12 +74,12 @@ func TestGeminiAuth(t *testing.T) { func TestGeminiOptionalAuth(t *testing.T) { pathHandler := func(path string) gus.Handler { - return func(_ context.Context, request *gus.Request) *gus.Response { + return gus.HandlerFunc(func(_ context.Context, request *gus.Request) *gus.Response { if !strings.HasPrefix(request.Path, path) { return nil } return gemini.Success("", &bytes.Buffer{}) - } + }) } handler := gus.FallthroughHandler( -- cgit v1.2.3