refactor: always provide a user in the request context

1 files changed, 5 insertions, 10 deletions

diff --git a/app/middleware/init.go b/app/middleware/init.go
index 23c524d..4ff10c4 100644
--- a/app/middleware/init.go
+++ b/app/middleware/init.go
@@ -4,21 +4,16 @@ import (
 	"net/http"
 
 	"github.com/xlgmokha/x/pkg/mapper"
-	"github.com/xlgmokha/x/pkg/x"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/domain"
 )
 
 func init() {
 	mapper.Register(func(h http.Header) *domain.User {
-		subject := h.Get("x-jwt-claim-sub")
-		if x.IsPresent(subject) {
-			return &domain.User{
-				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"),
-			}
+		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"),
 		}
-		return nil
 	})
 }