Y艒ten: A social tracker for your language learning journey built on the atproto.

feat(oauth): use slogger #6

merged opened by brookjeynes.dev targeting master from push-trrpxxyxxmot
Labels

None yet.

Participants 1
AT URI
at://did:plc:4mj54vc4ha3lh32ksxwunnbh/sh.tangled.repo.pull/3m3bmdlgblc22
+9 -5
Diff #0
+1 -1
internal/server/app.go
··· 63 63 64 64 idResolver := atproto.DefaultResolver() 65 65 66 - oauth, err := oauth.New(config, posthog) 66 + oauth, err := oauth.New(config, posthog, log.SubLogger(logger, "oauth")) 67 67 if err != nil { 68 68 return nil, fmt.Errorf("failed to start oauth handler: %w", err) 69 69 }
+4 -3
internal/server/oauth/handler.go
··· 2 2 3 3 import ( 4 4 "encoding/json" 5 - "log" 6 5 "net/http" 7 6 8 7 "github.com/go-chi/chi/v5" ··· 49 48 jwks := o.Config.OAuth.Jwks 50 49 pubKey, err := pubKeyFromJwk(jwks) 51 50 if err != nil { 52 - log.Printf("failed to parse public key: %v", err) 51 + o.Logger.Error("failed to parse public key", "err", err) 53 52 http.Error(w, err.Error(), http.StatusInternalServerError) 54 53 return 55 54 } ··· 68 67 69 68 sessData, err := o.ClientApp.ProcessCallback(ctx, r.URL.Query()) 70 69 if err != nil { 70 + o.Logger.Error("failed to process callback", "err", err) 71 71 http.Error(w, err.Error(), http.StatusInternalServerError) 72 72 return 73 73 } 74 74 75 75 if err := o.SaveSession(w, r, sessData); err != nil { 76 + o.Logger.Error("failed to save session", "err", err) 76 77 http.Error(w, err.Error(), http.StatusInternalServerError) 77 78 return 78 79 } ··· 83 84 Event: ph.UserSignInSuccessEvent, 84 85 }) 85 86 if err != nil { 86 - log.Println("failed to enqueue posthog event:", err) 87 + o.Logger.Error("failed to enqueue posthog event", "err", err) 87 88 } 88 89 } 89 90
+4 -1
internal/server/oauth/oauth.go
··· 3 3 import ( 4 4 "errors" 5 5 "fmt" 6 + "log/slog" 6 7 "net/http" 7 8 "time" 8 9 ··· 24 25 Config *config.Config 25 26 JwksUri string 26 27 Posthog posthog.Client 28 + Logger *slog.Logger 27 29 } 28 30 29 - func New(config *config.Config, ph posthog.Client) (*OAuth, error) { 31 + func New(config *config.Config, ph posthog.Client, logger *slog.Logger) (*OAuth, error) { 30 32 var oauthConfig oauth.ClientConfig 31 33 var clientUri string 32 34 ··· 56 58 SessionStore: sessStore, 57 59 JwksUri: jwksUri, 58 60 Posthog: ph, 61 + Logger: logger, 59 62 }, nil 60 63 61 64 }

History

1 round 0 comments
sign up or login to add to the discussion
brookjeynes.dev submitted #0
1 commit
expand
feat(oauth): use slogger
expand 0 comments
pull request successfully merged