From 405ff48e0e93a6998a8cee2560649bb834fe0389 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 15 May 2025 09:52:49 -0600 Subject: refactor: remove oidc.OpenID struct --- app/app.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'app/app.go') diff --git a/app/app.go b/app/app.go index 701a7f7..724ad16 100644 --- a/app/app.go +++ b/app/app.go @@ -4,6 +4,7 @@ import ( "net/http" "path/filepath" + xoidc "github.com/coreos/go-oidc/v3/oidc" "github.com/rs/zerolog" "github.com/xlgmokha/x/pkg/ioc" "github.com/xlgmokha/x/pkg/log" @@ -12,7 +13,7 @@ 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/domain" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/middleware" - "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/oidc" + "golang.org/x/oauth2" ) type Mountable interface { @@ -35,9 +36,11 @@ func New(rootDir string) http.Handler { mux.Handle("GET /", http.FileServer(dir)) logger := ioc.MustResolve[*zerolog.Logger](ioc.Default) - oidc := ioc.MustResolve[*oidc.OpenID](ioc.Default) users := ioc.MustResolve[domain.Repository[*domain.User]](ioc.Default) - - chain := middleware.IDToken(oidc, middleware.IDTokenFromSessionCookie)(middleware.User(users)(mux)) + chain := middleware.IDToken( + ioc.MustResolve[*xoidc.Provider](ioc.Default), + ioc.MustResolve[*oauth2.Config](ioc.Default), + middleware.IDTokenFromSessionCookie, + )(middleware.User(users)(mux)) return log.HTTP(logger)(chain) } -- cgit v1.2.3