Signed-off-by: brookjeynes me@brookjeynes.dev
+1
-1
internal/server/app.go
+1
-1
internal/server/app.go
+4
-3
internal/server/oauth/handler.go
+4
-3
internal/server/oauth/handler.go
···
2
3
import (
4
"encoding/json"
5
-
"log"
6
"net/http"
7
8
"github.com/go-chi/chi/v5"
···
49
jwks := o.Config.OAuth.Jwks
50
pubKey, err := pubKeyFromJwk(jwks)
51
if err != nil {
52
-
log.Printf("failed to parse public key: %v", err)
53
http.Error(w, err.Error(), http.StatusInternalServerError)
54
return
55
}
···
68
69
sessData, err := o.ClientApp.ProcessCallback(ctx, r.URL.Query())
70
if err != nil {
71
http.Error(w, err.Error(), http.StatusInternalServerError)
72
return
73
}
74
75
if err := o.SaveSession(w, r, sessData); err != nil {
76
http.Error(w, err.Error(), http.StatusInternalServerError)
77
return
78
}
···
83
Event: ph.UserSignInSuccessEvent,
84
})
85
if err != nil {
86
-
log.Println("failed to enqueue posthog event:", err)
87
}
88
}
89
···
2
3
import (
4
"encoding/json"
5
"net/http"
6
7
"github.com/go-chi/chi/v5"
···
48
jwks := o.Config.OAuth.Jwks
49
pubKey, err := pubKeyFromJwk(jwks)
50
if err != nil {
51
+
o.Logger.Error("failed to parse public key", "err", err)
52
http.Error(w, err.Error(), http.StatusInternalServerError)
53
return
54
}
···
67
68
sessData, err := o.ClientApp.ProcessCallback(ctx, r.URL.Query())
69
if err != nil {
70
+
o.Logger.Error("failed to process callback", "err", err)
71
http.Error(w, err.Error(), http.StatusInternalServerError)
72
return
73
}
74
75
if err := o.SaveSession(w, r, sessData); err != nil {
76
+
o.Logger.Error("failed to save session", "err", err)
77
http.Error(w, err.Error(), http.StatusInternalServerError)
78
return
79
}
···
84
Event: ph.UserSignInSuccessEvent,
85
})
86
if err != nil {
87
+
o.Logger.Error("failed to enqueue posthog event", "err", err)
88
}
89
}
90
+4
-1
internal/server/oauth/oauth.go
+4
-1
internal/server/oauth/oauth.go
···
3
import (
4
"errors"
5
"fmt"
6
"net/http"
7
"time"
8
···
24
Config *config.Config
25
JwksUri string
26
Posthog posthog.Client
27
}
28
29
-
func New(config *config.Config, ph posthog.Client) (*OAuth, error) {
30
var oauthConfig oauth.ClientConfig
31
var clientUri string
32
···
56
SessionStore: sessStore,
57
JwksUri: jwksUri,
58
Posthog: ph,
59
}, nil
60
61
}
···
3
import (
4
"errors"
5
"fmt"
6
+
"log/slog"
7
"net/http"
8
"time"
9
···
25
Config *config.Config
26
JwksUri string
27
Posthog posthog.Client
28
+
Logger *slog.Logger
29
}
30
31
+
func New(config *config.Config, ph posthog.Client, logger *slog.Logger) (*OAuth, error) {
32
var oauthConfig oauth.ClientConfig
33
var clientUri string
34
···
58
SessionStore: sessStore,
59
JwksUri: jwksUri,
60
Posthog: ph,
61
+
Logger: logger,
62
}, nil
63
64
}
History
1 round
0 comments
brookjeynes.dev
submitted
#0
1 commit
expand
collapse
feat(oauth): use slogger
Signed-off-by: brookjeynes <me@brookjeynes.dev>
expand 0 comments
pull request successfully merged