refactor: pass actual context to GetUserIdByContext

Author: LuccaBitfly

backend/pkg/api/handlers/auth.go

@@ -197,8 +197,8 @@ func (h *HandlerService) GetUserIdByApiKey(r *http.Request) (uint64, error) {
 }
 
 // if this is used, user ID should've been stored in context (by GetUserIdStoreMiddleware)
-func GetUserIdByContext(r *http.Request) (uint64, error) {
-	userId, ok := r.Context().Value(types.CtxUserIdKey).(uint64)
+func GetUserIdByContext(ctx context.Context) (uint64, error) {
+	userId, ok := ctx.Value(types.CtxUserIdKey).(uint64)
 	if !ok {
 		return 0, newUnauthorizedErr("user not authenticated")
 	}

backend/pkg/api/handlers/handler_service.go

@@ -338,7 +338,7 @@ func logApiError(r *http.Request, err error, callerSkip int, additionalInfos ...
 	if body, _ := io.ReadAll(io.LimitReader(r.Body, maxBodySize)); len(body) > 0 {
 		requestFields["request_body"] = string(body)
 	}
-	if userId, _ := GetUserIdByContext(r); userId != 0 {
+	if userId, _ := GetUserIdByContext(r.Context()); userId != 0 {
 		requestFields["request_user_id"] = userId
 	}
 	log.Error(err, "error handling request", callerSkip+1, append(additionalInfos, requestFields)...)

backend/pkg/api/handlers/internal.go

@@ -511,12 +511,13 @@ func (h *HandlerService) InternalGetValidatorDashboardRocketPoolMinipools(w http
 // even though this endpoint is internal only, it should still not be broken since it is used by the mobile app
 func (h *HandlerService) InternalGetValidatorDashboardMobileWidget(w http.ResponseWriter, r *http.Request) {
 	var v validationError
+	ctx := r.Context()
 	dashboardId := v.checkPrimaryDashboardId(mux.Vars(r)["dashboard_id"])
 	if v.hasErrors() {
 		handleErr(w, r, v)
 		return
 	}
-	userId, err := GetUserIdByContext(r)
+	userId, err := GetUserIdByContext(ctx)
 	if err != nil {
 		handleErr(w, r, err)
 		return
@@ -530,7 +531,7 @@ func (h *HandlerService) InternalGetValidatorDashboardMobileWidget(w http.Respon
 		returnForbidden(w, r, errors.New("user does not have access to mobile app widget"))
 		return
 	}
-	data, err := h.daService.GetValidatorDashboardMobileWidget(r.Context(), dashboardId)
+	data, err := h.daService.GetValidatorDashboardMobileWidget(ctx, dashboardId)
 	if err != nil {
 		handleErr(w, r, err)
 		return

backend/pkg/api/handlers/machine_metrics.go

@@ -23,8 +23,9 @@ func (h *HandlerService) InternalGetUserMachineMetrics(w http.ResponseWriter, r
 }
 
 func (h *HandlerService) PublicGetUserMachineMetrics(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 	var v validationError
-	userId, err := GetUserIdByContext(r)
+	userId, err := GetUserIdByContext(ctx)
 	if err != nil {
 		handleErr(w, r, err)
 		return
@@ -51,7 +52,7 @@ func (h *HandlerService) PublicGetUserMachineMetrics(w http.ResponseWriter, r *h
 		offset = 0
 	}
 
-	data, err := h.daService.GetUserMachineMetrics(r.Context(), userId, int(limit), int(offset))
+	data, err := h.daService.GetUserMachineMetrics(ctx, userId, int(limit), int(offset))
 	if err != nil {
 		handleErr(w, r, err)
 		return

backend/pkg/api/handlers/middlewares.go

@@ -65,13 +65,13 @@ func (h *HandlerService) VDBAuthMiddleware(next http.Handler) http.Handler {
 			return
 		}
 		// primary id is used -> user needs to have access to dashboard
-
-		userId, err := GetUserIdByContext(r)
+		ctx := r.Context()
+		userId, err := GetUserIdByContext(ctx)
 		if err != nil {
 			handleErr(w, r, err)
 			return
 		}
-		dashboardUser, err := h.daService.GetValidatorDashboardUser(r.Context(), types.VDBIdPrimary(dashboardId))
+		dashboardUser, err := h.daService.GetValidatorDashboardUser(ctx, types.VDBIdPrimary(dashboardId))
 		if err != nil {
 			handleErr(w, r, err)
 			return
@@ -92,14 +92,15 @@ func (h *HandlerService) VDBAuthMiddleware(next http.Handler) http.Handler {
 func (h *HandlerService) PremiumPerkCheckMiddleware(next http.Handler, hasRequiredPerk func(premiumPerks types.PremiumPerks) bool) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// get user id from context
-		userId, err := GetUserIdByContext(r)
+		ctx := r.Context()
+		userId, err := GetUserIdByContext(ctx)
 		if err != nil {
 			handleErr(w, r, err)
 			return
 		}
 
 		// get user info
-		userInfo, err := h.daService.GetUserInfo(r.Context(), userId)
+		userInfo, err := h.daService.GetUserInfo(ctx, userId)
 		if err != nil {
 			handleErr(w, r, err)
 			return