refactor(http): replace di context with http context in tests and middleware

- Updated tests and middleware to utilize the new `forge_http.NewContext` instead of the deprecated `di.NewContext`, ensuring consistency across the codebase.
- Removed the `di` package references in favor of the new `http` package for context management, enhancing clarity and maintainability.
- Adjusted related test cases to reflect the changes in context creation, improving overall test coverage and reliability.

Author: juicycleff

extensions/auth/providers/ldap_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/xraph/forge"
 	"github.com/xraph/forge/extensions/auth"
-	"github.com/xraph/forge/internal/di"
+	forge_http "github.com/xraph/forge/internal/http"
 	"github.com/xraph/forge/internal/logger"
 )
 
@@ -222,7 +222,7 @@ func TestLDAPProvider_Middleware(t *testing.T) {
 
 	req := httptest.NewRequest(http.MethodGet, "/", nil)
 	rec := httptest.NewRecorder()
-	ctx := di.NewContext(rec, req, nil)
+	ctx := forge_http.NewContext(rec, req, nil)
 
 	_ = middleware(handler)(ctx)
 

extensions/security/csrf_test.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/xraph/forge"
-	"github.com/xraph/forge/internal/di"
+	forge_http "github.com/xraph/forge/internal/http"
 	"github.com/xraph/forge/internal/logger"
 )
 
@@ -30,7 +30,7 @@ func TestCSRFMiddleware_SafeMethods(t *testing.T) {
 		t.Run(method, func(t *testing.T) {
 			req := httptest.NewRequest(method, "/api/test", nil)
 			w := httptest.NewRecorder()
-			ctx := di.NewContext(w, req, nil)
+			ctx := forge_http.NewContext(w, req, nil)
 
 			called := false
 			next := func(ctx forge.Context) error {
@@ -76,7 +76,7 @@ func TestCSRFMiddleware_UnsafeMethods_NoToken(t *testing.T) {
 		t.Run(method+"_NoToken", func(t *testing.T) {
 			req := httptest.NewRequest(method, "/api/test", nil)
 			w := httptest.NewRecorder()
-			ctx := di.NewContext(w, req, nil)
+			ctx := forge_http.NewContext(w, req, nil)
 
 			called := false
 			next := func(ctx forge.Context) error {
@@ -120,7 +120,7 @@ func TestCSRFMiddleware_SkipPaths(t *testing.T) {
 		t.Run(path, func(t *testing.T) {
 			req := httptest.NewRequest(http.MethodPost, path, nil)
 			w := httptest.NewRecorder()
-			ctx := di.NewContext(w, req, nil)
+			ctx := forge_http.NewContext(w, req, nil)
 
 			called := false
 			next := func(ctx forge.Context) error {
@@ -164,7 +164,7 @@ func TestCSRFMiddleware_DisabledConfig(t *testing.T) {
 	// Test POST without token when CSRF is disabled - should pass
 	req := httptest.NewRequest(http.MethodPost, "/api/test", nil)
 	w := httptest.NewRecorder()
-	ctx := di.NewContext(w, req, nil)
+	ctx := forge_http.NewContext(w, req, nil)
 
 	called := false
 	next := func(ctx forge.Context) error {

internal/di/context.go

@@ -1,4 +1,4 @@
-package di
+package http
 
 import (
 	"encoding"

internal/di/context_binder.go internal/http/binder.gointernal/di/context_binder.go renamed to internal/http/binder.go

@@ -1,4 +1,4 @@
-package di
+package http
 
 import (
 	"bytes"

internal/di/context_binder_test.go internal/http/binder_test.gointernal/di/context_binder_test.go renamed to internal/http/binder_test.go

@@ -1,4 +1,4 @@
-package di
+package http
 
 import (
 	"context"
@@ -12,6 +12,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/xraph/forge/internal/di"
 	"github.com/xraph/forge/internal/shared"
 )
 
@@ -28,8 +29,8 @@ type Ctx struct {
 	response      http.ResponseWriter
 	params        map[string]string
 	values        map[string]any
-	scope         Scope
-	container     Container
+	scope         di.Scope
+	container     di.Container
 	metrics       Metrics
 	healthManager HealthManager
 	session       shared.Session
@@ -43,8 +44,8 @@ type ResponseBuilder struct {
 }
 
 // NewContext creates a new context.
-func NewContext(w http.ResponseWriter, r *http.Request, container Container) Context {
-	var scope Scope
+func NewContext(w http.ResponseWriter, r *http.Request, container di.Container) shared.Context {
+	var scope di.Scope
 	if container != nil {
 		scope = container.BeginScope()
 	}
@@ -498,7 +499,7 @@ func (c *Ctx) WithContext(ctx context.Context) {
 }
 
 // Container returns the DI container.
-func (c *Ctx) Container() Container {
+func (c *Ctx) Container() di.Container {
 	return c.container
 }
 
@@ -513,7 +514,7 @@ func (c *Ctx) HealthManager() HealthManager {
 }
 
 // Scope returns the request scope.
-func (c *Ctx) Scope() Scope {
+func (c *Ctx) Scope() di.Scope {
 	return c.scope
 }
 

internal/di/context_impl.go internal/http/context.gointernal/di/context_impl.go renamed to internal/http/context.go

@@ -1,4 +1,4 @@
-package di
+package http
 
 import (
 	"bytes"
@@ -12,6 +12,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/xraph/forge/internal/di"
 )
 
 // Test service for DI injection.
@@ -398,7 +399,7 @@ func TestContext_WithContext(t *testing.T) {
 }
 
 func TestContext_Container(t *testing.T) {
-	container := NewContainer()
+	container := di.NewContainer()
 	req := httptest.NewRequest(http.MethodGet, "/test", nil)
 	rec := httptest.NewRecorder()
 
@@ -408,7 +409,7 @@ func TestContext_Container(t *testing.T) {
 }
 
 func TestContext_Scope(t *testing.T) {
-	container := NewContainer()
+	container := di.NewContainer()
 	req := httptest.NewRequest(http.MethodGet, "/test", nil)
 	rec := httptest.NewRecorder()
 
@@ -419,9 +420,9 @@ func TestContext_Scope(t *testing.T) {
 }
 
 func TestContext_Resolve(t *testing.T) {
-	container := NewContainer()
+	container := di.NewContainer()
 
-	err := RegisterSingleton(container, "service", func(c Container) (*TestUserService, error) {
+	err := di.RegisterSingleton(container, "service", func(c di.Container) (*TestUserService, error) {
 		return &TestUserService{users: []string{"user1"}}, nil
 	})
 	require.NoError(t, err)
@@ -447,9 +448,9 @@ func TestContext_Resolve_NoContainer(t *testing.T) {
 }
 
 func TestContext_Must(t *testing.T) {
-	container := NewContainer()
+	container := di.NewContainer()
 
-	err := RegisterSingleton(container, "service", func(c Container) (*TestUserService, error) {
+	err := di.RegisterSingleton(container, "service", func(c di.Container) (*TestUserService, error) {
 		return &TestUserService{}, nil
 	})
 	require.NoError(t, err)
@@ -464,7 +465,7 @@ func TestContext_Must(t *testing.T) {
 }
 
 func TestContext_Must_Panic(t *testing.T) {
-	container := NewContainer()
+	container := di.NewContainer()
 	req := httptest.NewRequest(http.MethodGet, "/test", nil)
 	rec := httptest.NewRecorder()
 
@@ -476,7 +477,7 @@ func TestContext_Must_Panic(t *testing.T) {
 }
 
 func TestContext_Cleanup(t *testing.T) {
-	container := NewContainer()
+	container := di.NewContainer()
 	req := httptest.NewRequest(http.MethodGet, "/test", nil)
 	rec := httptest.NewRecorder()
 

internal/di/context_test.go internal/http/context_test.gointernal/di/context_test.go renamed to internal/http/context_test.go

@@ -1,4 +1,4 @@
-package di
+package http
 
 import (
 	"net/http"

internal/di/context_cookies_test.go internal/http/cookies_test.gointernal/di/context_cookies_test.go renamed to internal/http/cookies_test.go

@@ -1,4 +1,4 @@
-package di
+package http
 
 import (
 	"net/http"

internal/di/context_params_test.go internal/http/params_test.gointernal/di/context_params_test.go renamed to internal/http/params_test.go

@@ -1,4 +1,4 @@
-package di
+package http
 
 import (
 	"fmt"