From 152ca573505fd89151d3cdf117c3f1bb3b05b9d9 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 15 May 2025 12:37:37 -0600 Subject: refactor: remove unused environment variables --- app/app.go | 4 ++-- app/init.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'app') diff --git a/app/app.go b/app/app.go index 724ad16..93b0461 100644 --- a/app/app.go +++ b/app/app.go @@ -4,7 +4,7 @@ import ( "net/http" "path/filepath" - 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" @@ -38,7 +38,7 @@ func New(rootDir string) http.Handler { logger := ioc.MustResolve[*zerolog.Logger](ioc.Default) users := ioc.MustResolve[domain.Repository[*domain.User]](ioc.Default) chain := middleware.IDToken( - ioc.MustResolve[*xoidc.Provider](ioc.Default), + ioc.MustResolve[*oidc.Provider](ioc.Default), ioc.MustResolve[*oauth2.Config](ioc.Default), middleware.IDTokenFromSessionCookie, )(middleware.User(users)(mux)) diff --git a/app/init.go b/app/init.go index cb9680d..a087103 100644 --- a/app/init.go +++ b/app/init.go @@ -5,7 +5,7 @@ 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" @@ -48,7 +48,7 @@ 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 web.NewOIDCProvider(ctx, cfg.OIDCIssuer, func(err error) { ioc.MustResolve[*zerolog.Logger](ioc.Default).Err(err).Send() @@ -59,8 +59,8 @@ func init() { ClientID: cfg.OAuthClientID, ClientSecret: cfg.OAuthClientSecret, RedirectURL: cfg.OAuthRedirectURL, - Endpoint: ioc.MustResolve[*xoidc.Provider](ioc.Default).Endpoint(), - Scopes: []string{xoidc.ScopeOpenID, "profile", "email"}, + Endpoint: ioc.MustResolve[*oidc.Provider](ioc.Default).Endpoint(), + Scopes: []string{oidc.ScopeOpenID, "profile", "email"}, } }) -- cgit v1.2.3