Request: add ability to change request context

request.go

@@ -1,6 +1,7 @@
 package goyave
 
 import (
+	"context"
 	"io"
 	"net/http"
 	"net/url"
@@ -157,3 +158,22 @@ func (r *Request) BearerToken() (string, bool) {
 func (r *Request) Body() io.ReadCloser {
 	return r.httpRequest.Body
 }
+
+// Context returns the request's context. To change the context, use `WithContext`.
+//
+// The returned context is always non-nil; it defaults to the
+// background context.
+//
+// The context is canceled when the client's connection closes, the request is canceled (with HTTP/2),
+// or when the `ServeHTTP` method returns (after the finalization step of the request lifecycle).
+func (r *Request) Context() context.Context {
+	return r.httpRequest.Context()
+}
+
+// WithContext creates a shallow copy of the underlying `*http.Request` with
+// its context changed to `ctx` then returns itself.
+// The provided ctx must be non-nil.
+func (r *Request) WithContext(ctx context.Context) *Request {
+	r.httpRequest = r.httpRequest.WithContext(ctx)
+	return r
+}

request_test.go

@@ -2,6 +2,7 @@ package goyave
 
 import (
 	"bytes"
+	"context"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -72,4 +73,22 @@ func TestRequest(t *testing.T) {
 		assert.Empty(t, token)
 		assert.False(t, ok)
 	})
+
+	t.Run("Context", func(t *testing.T) {
+		httpReq := httptest.NewRequest(http.MethodGet, "/test", nil)
+		r := NewRequest(httpReq)
+
+		ctx := r.Context()
+		if !assert.NotNil(t, ctx) {
+			return
+		}
+		assert.Equal(t, httpReq.Context(), ctx)
+
+		key := struct{}{}
+		r2 := r.WithContext(context.WithValue(ctx, key, "value"))
+		assert.Equal(t, r, r2)
+
+		ctx2 := r.Context()
+		assert.Equal(t, "value", ctx2.Value(key))
+	})
 }