diff options
| -rw-r--r-- | app/middleware/id_token.go | 4 | ||||
| -rw-r--r-- | pkg/oidc/oidc.go | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/app/middleware/id_token.go b/app/middleware/id_token.go index dbaf691..cc5e79b 100644 --- a/app/middleware/id_token.go +++ b/app/middleware/id_token.go @@ -3,6 +3,7 @@ package middleware import ( "net/http" + xoidc "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" @@ -17,7 +18,8 @@ func IDToken(cfg *oidc.OpenID, parsers ...TokenParser) func(http.Handler) http.H for _, parser := range parsers { rawIDToken := parser(r) if x.IsPresent(rawIDToken) { - idToken, err := cfg.ValidateIDToken(r.Context(), rawIDToken) + verifier := cfg.Provider.VerifierContext(r.Context(), &xoidc.Config{ClientID: cfg.Config.ClientID}) + idToken, err := verifier.Verify(r.Context(), rawIDToken.String()) if err != nil { pls.LogError(r.Context(), err) diff --git a/pkg/oidc/oidc.go b/pkg/oidc/oidc.go index 6a67d19..fc0eaee 100644 --- a/pkg/oidc/oidc.go +++ b/pkg/oidc/oidc.go @@ -1,8 +1,6 @@ package oidc import ( - "context" - "github.com/coreos/go-oidc/v3/oidc" "golang.org/x/oauth2" ) @@ -24,9 +22,3 @@ func New(provider *oidc.Provider, clientID, clientSecret, callbackURL string) *O }, } } - -func (o *OpenID) ValidateIDToken(ctx context.Context, rawIDToken RawToken) (*IDToken, error) { - verifier := o.Provider.VerifierContext(ctx, &oidc.Config{ClientID: o.Config.ClientID}) - idToken, err := verifier.Verify(ctx, rawIDToken.String()) - return idToken, err -} |