diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/init.go | 4 | ||||
| -rw-r--r-- | app/middleware/id_token_test.go | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/app/init.go b/app/init.go index 809bfd4..ad87424 100644 --- a/app/init.go +++ b/app/init.go @@ -67,9 +67,7 @@ func init() { ioc.RegisterSingleton[*oidc.OpenID](ioc.Default, func() *oidc.OpenID { return oidc.New( ioc.MustResolve[*xoidc.Provider](ioc.Default), - cfg.OAuthClientID, - cfg.OAuthClientSecret, - cfg.OAuthRedirectURL, + ioc.MustResolve[*oauth2.Config](ioc.Default), ) }) diff --git a/app/middleware/id_token_test.go b/app/middleware/id_token_test.go index b363d2c..bdeaa49 100644 --- a/app/middleware/id_token_test.go +++ b/app/middleware/id_token_test.go @@ -4,6 +4,7 @@ import ( "net/http" "testing" + xoidc "github.com/coreos/go-oidc/v3/oidc" "github.com/oauth2-proxy/mockoidc" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -11,13 +12,21 @@ import ( 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/web" + "golang.org/x/oauth2" ) func TestIDToken(t *testing.T) { srv := oidc.NewTestServer(t) defer srv.Close() - openID := oidc.New(srv.Provider, srv.MockOIDC.ClientID, srv.MockOIDC.ClientSecret, "https://example.com/oauth/callback") + config := &oauth2.Config{ + ClientID: srv.MockOIDC.ClientID, + ClientSecret: srv.MockOIDC.ClientSecret, + RedirectURL: "https://example.com/oauth/callback", + Endpoint: srv.Provider.Endpoint(), + Scopes: []string{xoidc.ScopeOpenID, "profile", "email"}, + } + openID := oidc.New(srv.Provider, config) middleware := IDToken(openID, IDTokenFromSessionCookie) t.Run("when an active session cookie is provided", func(t *testing.T) { |