api: (auth) Include Account UUID with ContextValues

effectindex · Mar 20, 2023 · c9573e5 · c9573e5
1 parent 6555c27
commit c9573e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/api/auth.go b/api/auth.go
@@ -65,8 +65,7 @@ func AuthMiddleware() func(next http.Handler) http.Handler {
 
 			// Set SessionClaims as the context value
 			rCtx := r.Context()
-			values := &models.ContextValues{SessionClaims: sessionClaims}
-			rCtx = context.WithValue(rCtx, models.ContextValuesKey, values)
+			rCtx = context.WithValue(rCtx, models.ContextValuesKey, &models.ContextValues{Account: sessionClaims.Account.UUID, SessionClaims: sessionClaims})
 			r = r.WithContext(rCtx)
 
 			ctx.Logger.Debugw("Successfully authenticated user", "account", sessionClaims.Account.UUID, "path", r.URL.Path)

diff --git a/models/auth.go b/models/auth.go
@@ -1,6 +1,11 @@
 package models
 
+import (
+	"github.com/google/uuid"
+)
+
 type ContextValues struct {
+	Account       uuid.UUID
 	SessionClaims *SessionClaims
 }