summaryrefslogtreecommitdiff
path: root/app/middleware/user.go
diff options
context:
space:
mode:
Diffstat (limited to 'app/middleware/user.go')
-rw-r--r--app/middleware/user.go24
1 files changed, 15 insertions, 9 deletions
diff --git a/app/middleware/user.go b/app/middleware/user.go
index 9a88f8e..6c018f4 100644
--- a/app/middleware/user.go
+++ b/app/middleware/user.go
@@ -14,20 +14,26 @@ import (
func User(db domain.Repository[*domain.User]) func(http.Handler) http.Handler {
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- idToken := cfg.IDToken.From(r.Context())
- if x.IsZero(idToken) {
- next.ServeHTTP(w, r)
- return
- }
+ subject := r.Header.Get("x-jwt-claim-sub")
+ user := db.Find(r.Context(), domain.ID(subject))
- user := db.Find(r.Context(), domain.ID(idToken.Subject))
if !x.IsPresent(user) {
- user = mapper.MapFrom[*oidc.IDToken, *domain.User](idToken)
- if err := db.Save(r.Context(), user); err != nil {
- pls.LogError(r.Context(), err)
+ idToken := cfg.IDToken.From(r.Context())
+
+ if x.IsZero(idToken) {
next.ServeHTTP(w, r)
return
}
+
+ user = db.Find(r.Context(), domain.ID(idToken.Subject))
+ if !x.IsPresent(user) {
+ user = mapper.MapFrom[*oidc.IDToken, *domain.User](idToken)
+ if err := db.Save(r.Context(), user); err != nil {
+ pls.LogError(r.Context(), err)
+ next.ServeHTTP(w, r)
+ return
+ }
+ }
}
next.ServeHTTP(w, r.WithContext(cfg.CurrentUser.With(r.Context(), user)))