diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/sessions/controller_test.go | 2 | ||||
| -rw-r--r-- | app/controllers/sessions/service_test.go | 2 | ||||
| -rw-r--r-- | app/init.go | 9 | ||||
| -rw-r--r-- | app/middleware/id_token_test.go | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/app/controllers/sessions/controller_test.go b/app/controllers/sessions/controller_test.go index b3e1d56..73a373f 100644 --- a/app/controllers/sessions/controller_test.go +++ b/app/controllers/sessions/controller_test.go @@ -26,7 +26,7 @@ func TestSessions(t *testing.T) { clientSecret := srv.MockOIDC.Config().ClientSecret cfg, err := oidc.New( t.Context(), - srv.Issuer(), + srv.Provider, clientID, clientSecret, "callback_url", diff --git a/app/controllers/sessions/service_test.go b/app/controllers/sessions/service_test.go index 4bea1dd..c98488a 100644 --- a/app/controllers/sessions/service_test.go +++ b/app/controllers/sessions/service_test.go @@ -22,7 +22,7 @@ func TestService(t *testing.T) { clientSecret := srv.MockOIDC.Config().ClientSecret cfg, err := oidc.New( t.Context(), - srv.Issuer(), + srv.Provider, clientID, clientSecret, "/session/callback", diff --git a/app/init.go b/app/init.go index c1e999c..959048b 100644 --- a/app/init.go +++ b/app/init.go @@ -5,6 +5,7 @@ import ( "net/http" "os" + xoidc "github.com/coreos/go-oidc/v3/oidc" "github.com/rs/zerolog" "github.com/xlgmokha/x/pkg/env" "github.com/xlgmokha/x/pkg/ioc" @@ -50,11 +51,17 @@ 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) { + ioc.MustResolve[*zerolog.Logger](ioc.Default).Err(err).Send() + }) + }) ioc.RegisterSingleton[*oidc.OpenID](ioc.Default, func() *oidc.OpenID { ctx := context.WithValue(context.Background(), oauth2.HTTPClient, ioc.MustResolve[*http.Client](ioc.Default)) item, err := oidc.New( ctx, - cfg.OIDCIssuer, + ioc.MustResolve[*xoidc.Provider](ioc.Default), cfg.OAuthClientID, cfg.OAuthClientSecret, cfg.OAuthRedirectURL, diff --git a/app/middleware/id_token_test.go b/app/middleware/id_token_test.go index 45221ff..3df9a7d 100644 --- a/app/middleware/id_token_test.go +++ b/app/middleware/id_token_test.go @@ -26,7 +26,7 @@ func TestIDToken(t *testing.T) { ctx := context.WithValue(t.Context(), oauth2.HTTPClient, client) openID, err := oidc.New( ctx, - srv.Issuer(), + srv.Provider, cfg.ClientID, cfg.ClientSecret, "https://example.com/oauth/callback", |
