refactor: http and route

auth/auth_test.go

@@ -1,7 +1,9 @@
 package auth
 
 import (
+	"context"
 	"errors"
+	"sync"
 	"testing"
 	"time"
 
@@ -14,8 +16,8 @@ import (
 	cachemock "github.com/goravel/framework/contracts/cache/mocks"
 	configmock "github.com/goravel/framework/contracts/config/mocks"
 	ormmock "github.com/goravel/framework/contracts/database/orm/mocks"
+	"github.com/goravel/framework/contracts/http"
 	"github.com/goravel/framework/database/orm"
-	"github.com/goravel/framework/http"
 	"github.com/goravel/framework/support/carbon"
 )
 
@@ -26,6 +28,67 @@ type User struct {
 	Name string
 }
 
+type Context struct {
+	ctx      context.Context
+	request  http.Request
+	response http.Response
+	values   map[string]any
+	mu       sync.RWMutex
+}
+
+func (mc *Context) Deadline() (deadline time.Time, ok bool) {
+	return mc.ctx.Deadline()
+}
+
+func (mc *Context) Done() <-chan struct{} {
+	return mc.ctx.Done()
+}
+
+func (mc *Context) Err() error {
+	return mc.ctx.Err()
+}
+
+func (mc *Context) Value(key interface{}) any {
+	if k, ok := key.(string); ok {
+		mc.mu.RLock()
+		v, ok := mc.values[k]
+		mc.mu.RUnlock()
+
+		if ok {
+			return v
+		}
+	}
+
+	return mc.ctx.Value(key)
+}
+
+func (mc *Context) Context() context.Context {
+	return mc.ctx
+}
+
+func (mc *Context) WithValue(key string, value any) {
+	mc.mu.Lock()
+	mc.values[key] = value
+	mc.mu.Unlock()
+}
+
+func (mc *Context) Request() http.Request {
+	return mc.request
+}
+
+func (mc *Context) Response() http.Response {
+	return mc.response
+}
+
+func Background() http.Context {
+	return &Context{
+		ctx:      context.Background(),
+		request:  nil,
+		response: nil,
+		values:   make(map[string]any),
+	}
+}
+
 type AuthTestSuite struct {
 	suite.Suite
 	auth       *Auth
@@ -50,7 +113,7 @@ func (s *AuthTestSuite) SetupTest() {
 func (s *AuthTestSuite) TestLoginUsingID_EmptySecret() {
 	s.mockConfig.On("GetString", "jwt.secret").Return("").Once()
 
-	token, err := s.auth.LoginUsingID(http.Background(), 1)
+	token, err := s.auth.LoginUsingID(Background(), 1)
 	s.Empty(token)
 	s.ErrorIs(err, ErrorEmptySecret)
 
@@ -61,7 +124,7 @@ func (s *AuthTestSuite) TestLoginUsingID_InvalidKey() {
 	s.mockConfig.On("GetString", "jwt.secret").Return("Goravel").Once()
 	s.mockConfig.On("GetInt", "jwt.ttl").Return(2).Once()
 
-	token, err := s.auth.LoginUsingID(http.Background(), "")
+	token, err := s.auth.LoginUsingID(Background(), "")
 	s.Empty(token)
 	s.ErrorIs(err, ErrorInvalidKey)
 
@@ -73,7 +136,7 @@ func (s *AuthTestSuite) TestLoginUsingID() {
 	s.mockConfig.On("GetString", "jwt.secret").Return("Goravel").Once()
 	s.mockConfig.On("GetInt", "jwt.ttl").Return(2).Once()
 
-	token, err := s.auth.LoginUsingID(http.Background(), 1)
+	token, err := s.auth.LoginUsingID(Background(), 1)
 	s.NotEmpty(token)
 	s.Nil(err)
 
@@ -88,7 +151,7 @@ func (s *AuthTestSuite) TestLogin_Model() {
 	var user User
 	user.ID = 1
 	user.Name = "Goravel"
-	token, err := s.auth.Login(http.Background(), &user)
+	token, err := s.auth.Login(Background(), &user)
 	s.NotEmpty(token)
 	s.Nil(err)
 
@@ -107,7 +170,7 @@ func (s *AuthTestSuite) TestLogin_CustomModel() {
 	var user CustomUser
 	user.ID = 1
 	user.Name = "Goravel"
-	token, err := s.auth.Login(http.Background(), &user)
+	token, err := s.auth.Login(Background(), &user)
 	s.NotEmpty(token)
 	s.Nil(err)
 
@@ -123,7 +186,7 @@ func (s *AuthTestSuite) TestLogin_ErrorModel() {
 	var errorUser ErrorUser
 	errorUser.ID = 1
 	errorUser.Name = "Goravel"
-	token, err := s.auth.Login(http.Background(), &errorUser)
+	token, err := s.auth.Login(Background(), &errorUser)
 	s.Empty(token)
 	s.EqualError(err, "the primaryKey field was not found in the model, set primaryKey like orm.Model")
 }
@@ -134,7 +197,7 @@ func (s *AuthTestSuite) TestLogin_NoPrimaryKey() {
 		Name string
 	}
 
-	ctx := http.Background()
+	ctx := Background()
 	var user User
 	user.ID = 1
 	user.Name = "Goravel"
@@ -147,7 +210,7 @@ func (s *AuthTestSuite) TestParse_TokenDisabled() {
 	token := "1"
 	s.mockCache.On("GetBool", "jwt:disabled:"+token, false).Return(true).Once()
 
-	payload, err := s.auth.Parse(http.Background(), token)
+	payload, err := s.auth.Parse(Background(), token)
 	s.Nil(payload)
 	s.EqualError(err, "token is disabled")
 }
@@ -159,7 +222,7 @@ func (s *AuthTestSuite) TestParse_TokenInvalid() {
 	token := "1"
 	s.mockCache.On("GetBool", "jwt:disabled:"+token, false).Return(false).Once()
 
-	payload, err := s.auth.Parse(http.Background(), token)
+	payload, err := s.auth.Parse(Background(), token)
 	s.Nil(payload)
 	s.NotNil(err)
 
@@ -171,7 +234,7 @@ func (s *AuthTestSuite) TestParse_TokenExpired() {
 	s.mockConfig.On("GetString", "jwt.secret").Return("Goravel").Twice()
 	s.mockConfig.On("GetInt", "jwt.ttl").Return(2).Once()
 
-	ctx := http.Background()
+	ctx := Background()
 
 	now := carbon.Now()
 	issuedAt := now.ToStdTime()
@@ -199,7 +262,7 @@ func (s *AuthTestSuite) TestParse_TokenExpired() {
 
 func (s *AuthTestSuite) TestParse_InvalidCache() {
 	auth := NewAuth(guard, nil, s.mockConfig, s.mockOrm)
-	ctx := http.Background()
+	ctx := Background()
 	payload, err := auth.Parse(ctx, "1")
 	s.Nil(payload)
 	s.EqualError(err, "cache support is required")
@@ -209,7 +272,7 @@ func (s *AuthTestSuite) TestParse_Success() {
 	s.mockConfig.On("GetString", "jwt.secret").Return("Goravel").Twice()
 	s.mockConfig.On("GetInt", "jwt.ttl").Return(2).Once()
 
-	ctx := http.Background()
+	ctx := Background()
 	token, err := s.auth.LoginUsingID(ctx, 1)
 	s.Nil(err)
 
@@ -231,7 +294,7 @@ func (s *AuthTestSuite) TestParse_SuccessWithPrefix() {
 	s.mockConfig.On("GetString", "jwt.secret").Return("Goravel").Twice()
 	s.mockConfig.On("GetInt", "jwt.ttl").Return(2).Once()
 
-	ctx := http.Background()
+	ctx := Background()
 	token, err := s.auth.LoginUsingID(ctx, 1)
 	s.Nil(err)
 
@@ -250,7 +313,7 @@ func (s *AuthTestSuite) TestParse_SuccessWithPrefix() {
 }
 
 func (s *AuthTestSuite) TestUser_NoParse() {
-	ctx := http.Background()
+	ctx := Background()
 	var user User
 	err := s.auth.User(ctx, user)
 	s.EqualError(err, "parse token first")
@@ -262,7 +325,7 @@ func (s *AuthTestSuite) TestUser_DBError() {
 	s.mockConfig.On("GetString", "jwt.secret").Return("Goravel").Twice()
 	s.mockConfig.On("GetInt", "jwt.ttl").Return(2).Once()
 
-	ctx := http.Background()
+	ctx := Background()
 	token, err := s.auth.LoginUsingID(ctx, 1)
 	s.Nil(err)
 
@@ -287,7 +350,7 @@ func (s *AuthTestSuite) TestUser_Expired() {
 	s.mockConfig.On("GetString", "jwt.secret").Return("Goravel").Times(3)
 	s.mockConfig.On("GetInt", "jwt.ttl").Return(2).Twice()
 
-	ctx := http.Background()
+	ctx := Background()
 	token, err := s.auth.LoginUsingID(ctx, 1)
 	s.NotEmpty(token)
 	s.Nil(err)
@@ -325,7 +388,7 @@ func (s *AuthTestSuite) TestUser_RefreshExpired() {
 	s.mockConfig.On("GetString", "jwt.secret").Return("Goravel").Twice()
 	s.mockConfig.On("GetInt", "jwt.ttl").Return(2).Once()
 
-	ctx := http.Background()
+	ctx := Background()
 	token, err := s.auth.LoginUsingID(ctx, 1)
 	s.NotEmpty(token)
 	s.Nil(err)
@@ -359,7 +422,7 @@ func (s *AuthTestSuite) TestUser_Success() {
 	s.mockConfig.On("GetString", "jwt.secret").Return("Goravel").Twice()
 	s.mockConfig.On("GetInt", "jwt.ttl").Return(2).Once()
 
-	ctx := http.Background()
+	ctx := Background()
 	token, err := s.auth.LoginUsingID(ctx, 1)
 	s.Nil(err)
 
@@ -380,7 +443,7 @@ func (s *AuthTestSuite) TestUser_Success() {
 }
 
 func (s *AuthTestSuite) TestRefresh_NotParse() {
-	ctx := http.Background()
+	ctx := Background()
 	token, err := s.auth.Refresh(ctx)
 	s.Empty(token)
 	s.EqualError(err, "parse token first")
@@ -392,7 +455,7 @@ func (s *AuthTestSuite) TestRefresh_RefreshTimeExceeded() {
 	s.mockConfig.On("GetString", "jwt.secret").Return("Goravel").Twice()
 	s.mockConfig.On("GetInt", "jwt.ttl").Return(2).Once()
 
-	ctx := http.Background()
+	ctx := Background()
 	token, err := s.auth.LoginUsingID(ctx, 2)
 
 	s.Nil(err)
@@ -420,7 +483,7 @@ func (s *AuthTestSuite) TestRefresh_Success() {
 	s.mockConfig.On("GetString", "jwt.secret").Return("Goravel").Times(3)
 	s.mockConfig.On("GetInt", "jwt.ttl").Return(2).Twice()
 
-	ctx := http.Background()
+	ctx := Background()
 	token, err := s.auth.LoginUsingID(ctx, 1)
 	s.Nil(err)
 
@@ -448,7 +511,7 @@ func (s *AuthTestSuite) TestLogout_CacheUnsupported() {
 	s.mockConfig.On("GetString", "jwt.secret").Return("Goravel").Once()
 	s.mockConfig.On("GetInt", "jwt.ttl").Return(2).Once()
 
-	ctx := http.Background()
+	ctx := Background()
 	token, err := s.auth.LoginUsingID(ctx, 1)
 	s.NotEmpty(token)
 	s.Nil(err)
@@ -458,14 +521,14 @@ func (s *AuthTestSuite) TestLogout_CacheUnsupported() {
 }
 
 func (s *AuthTestSuite) TestLogout_NotParse() {
-	s.Nil(s.auth.Logout(http.Background()))
+	s.Nil(s.auth.Logout(Background()))
 }
 
 func (s *AuthTestSuite) TestLogout_SetDisabledCacheError() {
 	s.mockConfig.On("GetString", "jwt.secret").Return("Goravel").Twice()
 	s.mockConfig.On("GetInt", "jwt.ttl").Return(2).Twice()
 
-	ctx := http.Background()
+	ctx := Background()
 	token, err := s.auth.LoginUsingID(ctx, 1)
 	s.Nil(err)
 
@@ -486,7 +549,7 @@ func (s *AuthTestSuite) TestLogout_Success() {
 	s.mockConfig.On("GetString", "jwt.secret").Return("Goravel").Twice()
 	s.mockConfig.On("GetInt", "jwt.ttl").Return(2).Twice()
 
-	ctx := http.Background()
+	ctx := Background()
 	token, err := s.auth.LoginUsingID(ctx, 1)
 	s.NotEmpty(token)
 	s.Nil(err)

filesystem/file_test.go

@@ -4,11 +4,9 @@ import (
 	"bytes"
 	"mime/multipart"
 	"net/http"
-	"net/http/httptest"
 	"path/filepath"
 	"testing"
 
-	"github.com/gin-gonic/gin"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
@@ -77,13 +75,15 @@ func TestNewFileFromRequest(t *testing.T) {
 		assert.NoError(t, err)
 	}
 	assert.Nil(t, mw.Close())
-	c, _ := gin.CreateTestContext(httptest.NewRecorder())
-	c.Request, _ = http.NewRequest("POST", "/", buf)
-	c.Request.Header.Set("Content-Type", mw.FormDataContentType())
-	f, err := c.FormFile("file")
-	assert.Nil(t, err)
-	requestFile, err := NewFileFromRequest(f)
-	assert.Nil(t, err)
+	req, err := http.NewRequest("POST", "/", buf)
+	assert.NoError(t, err)
+	req.Header.Set("Content-Type", mw.FormDataContentType())
+	err = req.ParseMultipartForm(10 << 20) // 10 MB
+	assert.NoError(t, err)
+	_, fileHeader, err := req.FormFile("file")
+	assert.NoError(t, err)
+	requestFile, err := NewFileFromRequest(fileHeader)
+	assert.NoError(t, err)
 	assert.Equal(t, ".txt", filepath.Ext(requestFile.path))
 
 	mockConfig.AssertExpectations(t)

foundation/application_test.go

@@ -19,6 +19,7 @@ import (
 	"github.com/goravel/framework/contracts/foundation"
 	logmocks "github.com/goravel/framework/contracts/log/mocks"
 	queuemocks "github.com/goravel/framework/contracts/queue/mocks"
+	contractsroute "github.com/goravel/framework/contracts/route"
 	"github.com/goravel/framework/crypt"
 	"github.com/goravel/framework/database"
 	"github.com/goravel/framework/database/gorm"
@@ -311,9 +312,14 @@ func (s *ApplicationTestSuite) TestMakeRateLimiter() {
 	s.NotNil(s.app.MakeRateLimiter())
 }
 
+type Engine struct {
+	contractsroute.Engine
+}
+
 func (s *ApplicationTestSuite) TestMakeRoute() {
 	mockConfig := &configmocks.Config{}
-	mockConfig.On("GetBool", "app.debug").Return(false).Once()
+	mockConfig.On("GetString", "http.driver").Return("gin").Once()
+	mockConfig.On("Get", "http.drivers.gin.route").Return(&Engine{}).Once()
 
 	s.app.Singleton(config.Binding, func(app foundation.Application) (any, error) {
 		return mockConfig, nil