feat: added HandleRequest to Handler and renamed package as 'handler'

Author: ralvarezdev

http/errors.go

@@ -6,6 +6,7 @@ import (
 )
 
 var (
+	BadRequest                    = http.StatusText(http.StatusBadRequest)
 	InternalServerError           = http.StatusText(http.StatusInternalServerError)
 	ServiceUnavailable            = http.StatusText(http.StatusServiceUnavailable)
 	Unauthorized                  = http.StatusText(http.StatusUnauthorized)

http/response/common.go renamed to http/handler/common.go

@@ -1,4 +1,4 @@
-package response
+package handler
 
 import (
 	gonethttp "github.com/ralvarezdev/go-net/http"

http/response/errors.go renamed to http/handler/errors.go

@@ -1,4 +1,4 @@
-package response
+package handler
 
 import (
 	"errors"

http/response/handler.go renamed to http/handler/handler.go

@@ -1,4 +1,4 @@
-package response
+package handler
 
 import (
 	goflagsmode "github.com/ralvarezdev/go-flags/mode"
@@ -9,39 +9,63 @@ import (
 type (
 	// Handler interface for handling the responses
 	Handler interface {
-		HandleSuccess(w http.ResponseWriter, response *Response)
-		HandleErrorProne(
+		HandleRequest(
+			w http.ResponseWriter,
+			r *http.Request,
+			data interface{},
+		) (err error)
+		HandleSuccessResponse(w http.ResponseWriter, response *Response)
+		HandleErrorProneResponse(
 			w http.ResponseWriter,
 			successResponse *Response,
 			errorResponse *Response,
 		)
-		HandleError(w http.ResponseWriter, response *Response)
+		HandleErrorResponse(w http.ResponseWriter, response *Response)
 	}
 
 	// DefaultHandler struct
 	DefaultHandler struct {
 		mode        *goflagsmode.Flag
 		jsonEncoder gonethttpjson.Encoder
+		jsonDecoder gonethttpjson.Decoder
 	}
 )
 
 // NewDefaultHandler creates a new default request handler
 func NewDefaultHandler(
 	mode *goflagsmode.Flag,
 	jsonEncoder gonethttpjson.Encoder,
+	jsonDecoder gonethttpjson.Decoder,
 ) (*DefaultHandler, error) {
-	// Check if the flag mode or the JSON encoder is nil
+	// Check if the flag mode, the JSON encoder or the JSON decoder is nil
 	if mode == nil {
 		return nil, goflagsmode.ErrNilModeFlag
 	}
 	if jsonEncoder == nil {
 		return nil, gonethttpjson.ErrNilJSONEncoder
 	}
-	return &DefaultHandler{mode: mode, jsonEncoder: jsonEncoder}, nil
+	if jsonDecoder == nil {
+		return nil, gonethttpjson.ErrNilJSONDecoder
+	}
+
+	return &DefaultHandler{
+		mode:        mode,
+		jsonEncoder: jsonEncoder,
+		jsonDecoder: jsonDecoder,
+	}, nil
+}
+
+// HandleRequest handles the request
+func (d *DefaultHandler) HandleRequest(
+	w http.ResponseWriter,
+	r *http.Request,
+	data interface{},
+) (err error) {
+	return d.jsonDecoder.Decode(w, r, data)
 }
 
-// HandleSuccess handles the response
-func (d *DefaultHandler) HandleSuccess(
+// HandleSuccessResponse handles the response
+func (d *DefaultHandler) HandleSuccessResponse(
 	w http.ResponseWriter,
 	response *Response,
 ) {
@@ -52,24 +76,24 @@ func (d *DefaultHandler) HandleSuccess(
 	}
 }
 
-// HandleErrorProne handles the response that may contain an error
-func (d *DefaultHandler) HandleErrorProne(
+// HandleErrorProneResponse handles the response that may contain an error
+func (d *DefaultHandler) HandleErrorProneResponse(
 	w http.ResponseWriter,
 	successResponse *Response,
 	errorResponse *Response,
 ) {
 	// Check if the error response is nil
 	if errorResponse != nil {
-		d.HandleError(w, errorResponse)
+		d.HandleErrorResponse(w, errorResponse)
 		return
 	}
 
 	// Handle the success response
-	d.HandleSuccess(w, successResponse)
+	d.HandleSuccessResponse(w, successResponse)
 }
 
-// HandleError handles the error response
-func (d *DefaultHandler) HandleError(
+// HandleErrorResponse handles the error response
+func (d *DefaultHandler) HandleErrorResponse(
 	w http.ResponseWriter,
 	response *Response,
 ) {

http/response/types.go renamed to http/handler/types.go

@@ -1,4 +1,4 @@
-package response
+package handler
 
 type (
 	// Response struct

http/jwt/validator/handler.go

@@ -1,8 +1,8 @@
 package validator
 
 import (
+	gonethttpresponse "github.com/ralvarezdev/go-net/http/handler"
 	gonethttpjson "github.com/ralvarezdev/go-net/http/json"
-	gonethttpresponse "github.com/ralvarezdev/go-net/http/response"
 	"net/http"
 )
 

http/middleware/auth/middleware.go

@@ -7,30 +7,30 @@ import (
 	gojwtinterception "github.com/ralvarezdev/go-jwt/token/interception"
 	gojwtvalidator "github.com/ralvarezdev/go-jwt/token/validator"
 	gonethttp "github.com/ralvarezdev/go-net/http"
+	gonethttpresponse "github.com/ralvarezdev/go-net/http/handler"
 	gonethttpjwtvalidator "github.com/ralvarezdev/go-net/http/jwt/validator"
-	gonethttpresponse "github.com/ralvarezdev/go-net/http/response"
 	"net/http"
 	"strings"
 )
 
 // Middleware struct
 type Middleware struct {
 	validator                gojwtvalidator.Validator
-	responseHandler          gonethttpresponse.Handler
+	handler                  gonethttpresponse.Handler
 	jwtValidatorErrorHandler gonethttpjwtvalidator.ErrorHandler
 }
 
 // NewMiddleware creates a new authentication middleware
 func NewMiddleware(
 	validator gojwtvalidator.Validator,
-	responseHandler gonethttpresponse.Handler,
+	handler gonethttpresponse.Handler,
 	jwtValidatorErrorHandler gonethttpjwtvalidator.ErrorHandler,
 ) (*Middleware, error) {
 	// Check if either the validator, response handler or validator handler is nil
 	if validator == nil {
 		return nil, gojwtvalidator.ErrNilValidator
 	}
-	if responseHandler == nil {
+	if handler == nil {
 		return nil, gonethttpresponse.ErrNilHandler
 	}
 	if jwtValidatorErrorHandler == nil {
@@ -39,7 +39,7 @@ func NewMiddleware(
 
 	return &Middleware{
 		validator:                validator,
-		responseHandler:          responseHandler,
+		handler:                  handler,
 		jwtValidatorErrorHandler: jwtValidatorErrorHandler,
 	}, nil
 }
@@ -60,7 +60,7 @@ func (m *Middleware) Authenticate(
 			// Parse the authorization to a string
 			authorizationStr, ok := authorization.(string)
 			if !ok {
-				m.responseHandler.HandleError(
+				m.handler.HandleErrorResponse(
 					w,
 					gonethttpresponse.NewErrorResponseWithCode(
 						gonethttp.ErrInvalidAuthorizationHeader,
@@ -75,7 +75,7 @@ func (m *Middleware) Authenticate(
 
 			// Return an error if the authorization is missing or invalid
 			if len(parts) < 2 || parts[0] != gojwt.BearerPrefix {
-				m.responseHandler.HandleError(
+				m.handler.HandleErrorResponse(
 					w,
 					gonethttpresponse.NewErrorResponseWithCode(
 						gonethttp.ErrInvalidAuthorizationHeader,