From 405ff48e0e93a6998a8cee2560649bb834fe0389 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 15 May 2025 09:52:49 -0600 Subject: refactor: remove oidc.OpenID struct --- app/middleware/id_token.go | 8 ++++---- app/middleware/id_token_test.go | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'app/middleware') diff --git a/app/middleware/id_token.go b/app/middleware/id_token.go index cc5e79b..bfc6289 100644 --- a/app/middleware/id_token.go +++ b/app/middleware/id_token.go @@ -3,22 +3,22 @@ package middleware import ( "net/http" - xoidc "github.com/coreos/go-oidc/v3/oidc" + "github.com/coreos/go-oidc/v3/oidc" "github.com/xlgmokha/x/pkg/log" "github.com/xlgmokha/x/pkg/x" xcfg "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/cfg" - "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/oidc" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/pls" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/web" + "golang.org/x/oauth2" ) -func IDToken(cfg *oidc.OpenID, parsers ...TokenParser) func(http.Handler) http.Handler { +func IDToken(provider *oidc.Provider, config *oauth2.Config, parsers ...TokenParser) func(http.Handler) http.Handler { return func(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { for _, parser := range parsers { rawIDToken := parser(r) if x.IsPresent(rawIDToken) { - verifier := cfg.Provider.VerifierContext(r.Context(), &xoidc.Config{ClientID: cfg.Config.ClientID}) + verifier := provider.VerifierContext(r.Context(), &oidc.Config{ClientID: config.ClientID}) idToken, err := verifier.Verify(r.Context(), rawIDToken.String()) if err != nil { diff --git a/app/middleware/id_token_test.go b/app/middleware/id_token_test.go index bdeaa49..6ee9ce1 100644 --- a/app/middleware/id_token_test.go +++ b/app/middleware/id_token_test.go @@ -26,8 +26,7 @@ func TestIDToken(t *testing.T) { Endpoint: srv.Provider.Endpoint(), Scopes: []string{xoidc.ScopeOpenID, "profile", "email"}, } - openID := oidc.New(srv.Provider, config) - middleware := IDToken(openID, IDTokenFromSessionCookie) + middleware := IDToken(srv.Provider, config, IDTokenFromSessionCookie) 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) { -- cgit v1.2.3