3 files changed, 11 insertions, 17 deletions
diff --git a/app/middleware/init.go b/app/middleware/init.go
index 4ff10c4..770bd19 100644
--- a/app/middleware/init.go
+++ b/app/middleware/init.go
@@ -10,10 +10,10 @@ import (
 func init() {
 	mapper.Register(func(h http.Header) *domain.User {
 		return &domain.User{
-			ID:         domain.ID(h.Get("x-id-jwt-claim-sub")),
-			Username:   h.Get("x-id-jwt-claim-username"),
-			ProfileURL: h.Get("x-id-jwt-claim-profile-url"),
-			Picture:    h.Get("x-id-jwt-claim-picture-url"),
+			ID:         domain.ID(h.Get("x-jwt-claim-sub")),
+			Username:   h.Get("x-jwt-claim-username"),
+			ProfileURL: h.Get("x-jwt-claim-profile-url"),
+			Picture:    h.Get("x-jwt-claim-picture-url"),
 		}
 	})
 }
diff --git a/app/middleware/user.go b/app/middleware/user.go
index 0ffc8cf..184bf1a 100644
--- a/app/middleware/user.go
+++ b/app/middleware/user.go
@@ -12,13 +12,7 @@ import (
 func User() func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			log.WithFields(r.Context(), log.Fields{
-				"payload":  r.Header.Get("x-id-jwt-payload"),
-				"photo":    r.Header.Get("x-id-jwt-claim-picture-url"),
-				"profile":  r.Header.Get("x-id-jwt-claim-profile-url"),
-				"sub":      r.Header.Get("x-id-jwt-claim-sub"),
-				"username": r.Header.Get("x-id-jwt-claim-username"),
-			})
+			log.WithFields(r.Context(), log.Fields{"sub": r.Header.Get("x-jwt-claim-sub")})
 
 			next.ServeHTTP(w, r.WithContext(cfg.CurrentUser.With(
 				r.Context(),
diff --git a/app/middleware/user_test.go b/app/middleware/user_test.go
index c778c98..371605c 100644
--- a/app/middleware/user_test.go
+++ b/app/middleware/user_test.go
@@ -14,7 +14,7 @@ import (
 func TestUser(t *testing.T) {
 	middleware := User()
 
-	t.Run("when x-id-jwt-claim-* headers are not provided", func(t *testing.T) {
+	t.Run("when x-jwt-claim-* headers are not provided", func(t *testing.T) {
 		server := middleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			require.False(t, IsLoggedIn(r))
 
@@ -27,7 +27,7 @@ func TestUser(t *testing.T) {
 		assert.Equal(t, http.StatusTeapot, w.Code)
 	})
 
-	t.Run("when x-id-jwt-claim-* headers are provided", func(t *testing.T) {
+	t.Run("when x-jwt-claim-* headers are provided", func(t *testing.T) {
 		server := middleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			require.True(t, IsLoggedIn(r))
 
@@ -43,10 +43,10 @@ func TestUser(t *testing.T) {
 		}))
 
 		r, w := test.RequestResponse("GET", "/",
-			test.WithRequestHeader("x-id-jwt-claim-sub", "1"),
-			test.WithRequestHeader("x-id-jwt-claim-username", "root"),
-			test.WithRequestHeader("x-id-jwt-claim-profile-url", "https://gitlab.com/tanuki"),
-			test.WithRequestHeader("x-id-jwt-claim-picture-url", "https://example.com/profile.png"),
+			test.WithRequestHeader("x-jwt-claim-sub", "1"),
+			test.WithRequestHeader("x-jwt-claim-username", "root"),
+			test.WithRequestHeader("x-jwt-claim-profile-url", "https://gitlab.com/tanuki"),
+			test.WithRequestHeader("x-jwt-claim-picture-url", "https://example.com/profile.png"),
 		)
 		server.ServeHTTP(w, r)