diff options
| -rw-r--r-- | app/init.go | 3 | ||||
| -rw-r--r-- | pkg/oidc/test_server.go | 6 | ||||
| -rw-r--r-- | pkg/web/oidc.go (renamed from pkg/oidc/provider.go) | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/app/init.go b/app/init.go index 0d3fb42..cb9680d 100644 --- a/app/init.go +++ b/app/init.go @@ -15,7 +15,6 @@ import ( "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/controllers/sparkles" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/db" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/domain" - "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" ) @@ -51,7 +50,7 @@ func init() { }) ioc.Register[*xoidc.Provider](ioc.Default, func() *xoidc.Provider { ctx := context.WithValue(context.Background(), oauth2.HTTPClient, ioc.MustResolve[*http.Client](ioc.Default)) - return oidc.NewProvider(ctx, cfg.OIDCIssuer, func(err error) { + return web.NewOIDCProvider(ctx, cfg.OIDCIssuer, func(err error) { ioc.MustResolve[*zerolog.Logger](ioc.Default).Err(err).Send() }) }) diff --git a/pkg/oidc/test_server.go b/pkg/oidc/test_server.go index 81b37ca..80f2c9a 100644 --- a/pkg/oidc/test_server.go +++ b/pkg/oidc/test_server.go @@ -29,10 +29,8 @@ func NewTestServer(t *testing.T) *TestServer { next.ServeHTTP(w, r) }) }) - - provider := NewProvider(t.Context(), srv.Issuer(), func(err error) { - require.NoError(t, err) - }) + provider, err := oidc.NewProvider(t.Context(), srv.Issuer()) + require.NoError(t, err) return &TestServer{ srv, diff --git a/pkg/oidc/provider.go b/pkg/web/oidc.go index 31f7577..707a1b5 100644 --- a/pkg/oidc/provider.go +++ b/pkg/web/oidc.go @@ -1,4 +1,4 @@ -package oidc +package web import ( "context" @@ -6,7 +6,7 @@ import ( "github.com/coreos/go-oidc/v3/oidc" ) -func NewProvider(ctx context.Context, issuer string, report func(error)) *oidc.Provider { +func NewOIDCProvider(ctx context.Context, issuer string, report func(error)) *oidc.Provider { provider, err := oidc.NewProvider(ctx, issuer) if err == nil { return provider |