test: extract oidc server test helper

2 files changed, 73 insertions, 25 deletions

diff --git a/pkg/test/oidc_server.go b/pkg/test/oidc_server.go
index 142d143..a3ae9e3 100644
--- a/pkg/test/oidc_server.go
+++ b/pkg/test/oidc_server.go
@@ -3,9 +3,15 @@ package test
 import (
 	"net/http"
 	"net/http/httptest"
+	"strconv"
+	"testing"
 	"time"
 
+	"github.com/coreos/go-oidc/v3/oidc"
+	"github.com/oauth2-proxy/mockoidc"
+	"github.com/stretchr/testify/require"
 	"github.com/xlgmokha/x/pkg/serde"
+	"golang.org/x/oauth2"
 )
 
 func OIDCServer() *httptest.Server {
@@ -59,3 +65,66 @@ func OIDCServer() *httptest.Server {
 	}
 	return srv
 }
+
+type TestServer struct {
+	*mockoidc.MockOIDC
+	*oauth2.Config
+	*oidc.Provider
+	*testing.T
+}
+
+func NewOIDCServer(t *testing.T) *TestServer {
+	srv, err := mockoidc.Run()
+	require.NoError(t, err)
+
+	srv.AddMiddleware(func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			t.Logf("%v %v %v\n", r.Method, r.URL.Path, r.URL.Query())
+			next.ServeHTTP(w, r)
+		})
+	})
+
+	provider, err := oidc.NewProvider(t.Context(), srv.Issuer())
+	require.NoError(t, err)
+
+	config := &oauth2.Config{
+		ClientID:     srv.Config().ClientID,
+		ClientSecret: srv.Config().ClientSecret,
+		RedirectURL:  "https://example.com/oauth/callback",
+		Endpoint:     provider.Endpoint(),
+		Scopes:       []string{oidc.ScopeOpenID, "profile", "email"},
+	}
+
+	return &TestServer{
+		srv,
+		config,
+		provider,
+		t,
+	}
+}
+
+func (srv *TestServer) CreateTokenFor(user mockoidc.User) *oauth2.Token {
+	code := strconv.FormatInt(time.Now().Unix(), 10)
+	srv.QueueUser(user)
+	srv.QueueCode(code)
+
+	url := srv.AuthCodeURL("state")
+	response, err := http.Get(url)
+	require.NoError(srv, err)
+	srv.Logf("%v\n", response)
+
+	token, err := srv.Exchange(srv.Context(), code)
+	require.NoError(srv, err)
+	return token
+}
+
+func (srv *TestServer) CreateTokensFor(user mockoidc.User) (*oauth2.Token, string) {
+	token := srv.CreateTokenFor(user)
+	rawIDToken, ok := token.Extra("id_token").(string)
+	require.True(srv, ok)
+	return token, rawIDToken
+}
+
+func (s *TestServer) Close() {
+	s.Shutdown()
+}
diff --git a/pkg/web/middleware/unpack_token_test.go b/pkg/web/middleware/unpack_token_test.go
index 9a34a35..814aa79 100644
--- a/pkg/web/middleware/unpack_token_test.go
+++ b/pkg/web/middleware/unpack_token_test.go
@@ -20,20 +20,11 @@ import (
 )
 
 func TestUnpackToken(t *testing.T) {
-	srv, err := mockoidc.Run()
-	require.NoError(t, err)
-
-	srv.AddMiddleware(func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			t.Logf("%v %v %v\n", r.Method, r.URL.Path, r.URL.Query())
-			next.ServeHTTP(w, r)
-		})
-	})
-
-	defer srv.Shutdown()
+	srv := test.NewOIDCServer(t)
+	defer srv.Close()
 
 	client := &http.Client{Transport: &web.Transport{Logger: log.New(os.Stdout, log.Fields{})}}
-	cfg := srv.Config()
+	cfg := srv.MockOIDC.Config()
 	ctx := context.WithValue(t.Context(), oauth2.HTTPClient, client)
 	openID, err := oidc.New(
 		ctx,
@@ -49,20 +40,8 @@ func TestUnpackToken(t *testing.T) {
 	t.Run("when an active session cookie is provided", func(t *testing.T) {
 		t.Run("attaches the token to the request context", func(t *testing.T) {
 			user := mockoidc.DefaultUser()
-			code := "12345"
-			srv.QueueUser(user)
-			srv.QueueCode(code)
-
-			url := openID.Config.AuthCodeURL("state")
-			response, err := client.Get(url)
-			require.NoError(t, err)
-			t.Logf("%v\n", response)
-
-			token, err := openID.Config.Exchange(ctx, code)
-			require.NoError(t, err)
-			rawIDToken, ok := token.Extra("id_token").(string)
-			require.True(t, ok)
 
+			token, rawIDToken := srv.CreateTokensFor(user)
 			tokens := &oidc.Tokens{Token: token, IDToken: rawIDToken}
 			encoded := x.Must(tokens.ToBase64String())