Merge branch '11/x-jwt-payload' into 'main'

Read trusted identity information from envoy headers

See merge request gitlab-org/software-supply-chain-security/authorization/sparkled!14

2 files changed, 4 insertions, 5 deletions

diff --git a/app/controllers/dashboard/controller.go b/app/controllers/dashboard/controller.go
index 04a7ed1..d279930 100644
--- a/app/controllers/dashboard/controller.go
+++ b/app/controllers/dashboard/controller.go
@@ -41,14 +41,12 @@ func (c *Controller) Show(w http.ResponseWriter, r *http.Request) {
 }
 
 func (c *Controller) Navigation(w http.ResponseWriter, r *http.Request) {
-	currentUser := cfg.CurrentUser.From(r.Context())
-
 	w.WriteHeader(http.StatusOK)
 	w.Header().Add("Content-Type", "text/html")
 
 	dto := &NavigationDTO{
-		CurrentUser: currentUser,
-		IsLoggedIn:  currentUser != nil,
+		CurrentUser: cfg.CurrentUser.From(r.Context()),
+		IsLoggedIn:  middleware.IsLoggedIn(r),
 	}
 	if err := views.Render(w, "dashboard/nav", dto); err != nil {
 		pls.LogError(r.Context(), err)
diff --git a/app/controllers/dashboard/controller_test.go b/app/controllers/dashboard/controller_test.go
index c717a74..ddbfd34 100644
--- a/app/controllers/dashboard/controller_test.go
+++ b/app/controllers/dashboard/controller_test.go
@@ -28,7 +28,7 @@ func TestController(t *testing.T) {
 		})
 
 		t.Run("when authenticated", func(t *testing.T) {
-			ctx := cfg.CurrentUser.With(t.Context(), &domain.User{})
+			ctx := cfg.CurrentUser.With(t.Context(), &domain.User{ID: domain.ID("1")})
 			r, w := test.RequestResponse("GET", "/dashboard", test.WithContext(ctx))
 			mux.ServeHTTP(w, r)
 
@@ -55,6 +55,7 @@ func TestController(t *testing.T) {
 
 		t.Run("when authenticated", func(t *testing.T) {
 			ctx := cfg.CurrentUser.With(t.Context(), &domain.User{
+				ID:       domain.ID("1"),
 				Username: "root",
 			})
 			r, w := test.RequestResponse("GET", "/dashboard/nav", test.WithContext(ctx))