Merge branch 'envoy-cleanup' into 'main'

Delete code that is now handled by envoy

See merge request gitlab-org/software-supply-chain-security/authorization/sparkled!7

1 files changed, 7 insertions, 18 deletions

diff --git a/app/init.go b/app/init.go
index 8de5461..7ea0dd2 100644
--- a/app/init.go
+++ b/app/init.go
@@ -5,18 +5,16 @@ import (
 	"net/http"
 	"os"
 
-	xoidc "github.com/coreos/go-oidc/v3/oidc"
+	"github.com/coreos/go-oidc/v3/oidc"
 	"github.com/rs/zerolog"
 	"github.com/xlgmokha/x/pkg/ioc"
 	"github.com/xlgmokha/x/pkg/log"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/cfg"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/controllers/dashboard"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/controllers/health"
-	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/controllers/sessions"
 	"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"
 )
@@ -50,25 +48,16 @@ func init() {
 			},
 		}
 	})
-	ioc.Register[*xoidc.Provider](ioc.Default, func() *xoidc.Provider {
+	ioc.Register[*oidc.Provider](ioc.Default, func() *oidc.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()
 		})
 	})
-	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.Register[*sessions.Controller](ioc.Default, func() *sessions.Controller {
-		return sessions.New(
-			ioc.MustResolve[*oidc.OpenID](ioc.Default),
-			ioc.MustResolve[*http.Client](ioc.Default),
-		)
+	ioc.Register[*oidc.Config](ioc.Default, func() *oidc.Config {
+		return &oidc.Config{
+			ClientID: cfg.OAuthClientID,
+		}
 	})
 
 	http.DefaultClient = ioc.MustResolve[*http.Client](ioc.Default)