From e960f66491e170f29dcb99cd28fd0fd0b0e00943 Mon Sep 17 00:00:00 2001
From: brookjeynes <me@brookjeynes.dev>
Date: Wed, 15 Oct 2025 07:00:44 +1000
Subject: [PATCH] feat(oauth): use slogger
Change-Id: luvytrrxvlwmppxwkxksssuppwnmrnsk

Signed-off-by: brookjeynes <me@brookjeynes.dev>
---
 internal/server/app.go           | 2 +-
 internal/server/oauth/handler.go | 7 ++++---
 internal/server/oauth/oauth.go   | 5 ++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/internal/server/app.go b/internal/server/app.go
index b2d4907..8eeb61b 100644
--- a/internal/server/app.go
+++ b/internal/server/app.go
@@ -63,7 +63,7 @@ func Make(ctx context.Context, config *config.Config) (*Server, error) {
 
 	idResolver := atproto.DefaultResolver()
 
-	oauth, err := oauth.New(config, posthog)
+	oauth, err := oauth.New(config, posthog, log.SubLogger(logger, "oauth"))
 	if err != nil {
 		return nil, fmt.Errorf("failed to start oauth handler: %w", err)
 	}
diff --git a/internal/server/oauth/handler.go b/internal/server/oauth/handler.go
index e041bbb..f0243e5 100644
--- a/internal/server/oauth/handler.go
+++ b/internal/server/oauth/handler.go
@@ -2,7 +2,6 @@ package oauth
 
 import (
 	"encoding/json"
-	"log"
 	"net/http"
 
 	"github.com/go-chi/chi/v5"
@@ -49,7 +48,7 @@ func (o *OAuth) jwks(w http.ResponseWriter, r *http.Request) {
 	jwks := o.Config.OAuth.Jwks
 	pubKey, err := pubKeyFromJwk(jwks)
 	if err != nil {
-		log.Printf("failed to parse public key: %v", err)
+		o.Logger.Error("failed to parse public key", "err", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
@@ -68,11 +67,13 @@ func (o *OAuth) callback(w http.ResponseWriter, r *http.Request) {
 
 	sessData, err := o.ClientApp.ProcessCallback(ctx, r.URL.Query())
 	if err != nil {
+		o.Logger.Error("failed to process callback", "err", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
 
 	if err := o.SaveSession(w, r, sessData); err != nil {
+		o.Logger.Error("failed to save session", "err", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
@@ -83,7 +84,7 @@ func (o *OAuth) callback(w http.ResponseWriter, r *http.Request) {
 			Event:      ph.UserSignInSuccessEvent,
 		})
 		if err != nil {
-			log.Println("failed to enqueue posthog event:", err)
+			o.Logger.Error("failed to enqueue posthog event", "err", err)
 		}
 	}
 
diff --git a/internal/server/oauth/oauth.go b/internal/server/oauth/oauth.go
index cfb61ba..1e5a41a 100644
--- a/internal/server/oauth/oauth.go
+++ b/internal/server/oauth/oauth.go
@@ -3,6 +3,7 @@ package oauth
 import (
 	"errors"
 	"fmt"
+	"log/slog"
 	"net/http"
 	"time"
 
@@ -24,9 +25,10 @@ type OAuth struct {
 	Config       *config.Config
 	JwksUri      string
 	Posthog      posthog.Client
+	Logger       *slog.Logger
 }
 
-func New(config *config.Config, ph posthog.Client) (*OAuth, error) {
+func New(config *config.Config, ph posthog.Client, logger *slog.Logger) (*OAuth, error) {
 	var oauthConfig oauth.ClientConfig
 	var clientUri string
 
@@ -56,6 +58,7 @@ func New(config *config.Config, ph posthog.Client) (*OAuth, error) {
 		SessionStore: sessStore,
 		JwksUri:      jwksUri,
 		Posthog:      ph,
+		Logger:       logger,
 	}, nil
 
 }
-- 
2.43.0