From ca3fb0f032ab338a10379807d97e0d31c3afca35 Mon Sep 17 00:00:00 2001
From: mo khan <mo@mokhan.ca>
Date: Thu, 15 May 2025 11:41:16 -0600
Subject: refactor: move NewOIDCProvider to web package

---
 pkg/oidc/provider.go    | 27 ---------------------------
 pkg/oidc/test_server.go |  6 ++----
 pkg/web/oidc.go         | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 31 deletions(-)
 delete mode 100644 pkg/oidc/provider.go
 create mode 100644 pkg/web/oidc.go

(limited to 'pkg')

diff --git a/pkg/oidc/provider.go b/pkg/oidc/provider.go
deleted file mode 100644
index 31f7577..0000000
--- a/pkg/oidc/provider.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package oidc
-
-import (
-	"context"
-
-	"github.com/coreos/go-oidc/v3/oidc"
-)
-
-func NewProvider(ctx context.Context, issuer string, report func(error)) *oidc.Provider {
-	provider, err := oidc.NewProvider(ctx, issuer)
-	if err == nil {
-		return provider
-	}
-
-	report(err)
-
-	config := &oidc.ProviderConfig{
-		IssuerURL:     issuer,
-		AuthURL:       issuer + "/oauth/authorize",
-		TokenURL:      issuer + "/oauth/token",
-		DeviceAuthURL: "",
-		UserInfoURL:   issuer + "/oauth/userinfo",
-		JWKSURL:       issuer + "/oauth/disovery/keys",
-		Algorithms:    []string{"RS256"},
-	}
-	return config.NewProvider(ctx)
-}
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/web/oidc.go b/pkg/web/oidc.go
new file mode 100644
index 0000000..707a1b5
--- /dev/null
+++ b/pkg/web/oidc.go
@@ -0,0 +1,27 @@
+package web
+
+import (
+	"context"
+
+	"github.com/coreos/go-oidc/v3/oidc"
+)
+
+func NewOIDCProvider(ctx context.Context, issuer string, report func(error)) *oidc.Provider {
+	provider, err := oidc.NewProvider(ctx, issuer)
+	if err == nil {
+		return provider
+	}
+
+	report(err)
+
+	config := &oidc.ProviderConfig{
+		IssuerURL:     issuer,
+		AuthURL:       issuer + "/oauth/authorize",
+		TokenURL:      issuer + "/oauth/token",
+		DeviceAuthURL: "",
+		UserInfoURL:   issuer + "/oauth/userinfo",
+		JWKSURL:       issuer + "/oauth/disovery/keys",
+		Algorithms:    []string{"RS256"},
+	}
+	return config.NewProvider(ctx)
+}
-- 
cgit v1.2.3