fix(server): change redirection to avoid status override error

internal/app/server/middleware/authentication.go

@@ -30,10 +30,14 @@ func Authentication(c *gin.Context) {
 		return
 	}
 
-	if value, exists := claims[key.UserId]; exists {
-		c.Set(key.UserId, value)
-		c.Next()
-	} else {
+	value, exists := claims[key.UserId]
+
+	if !exists {
 		errs.AbortErrWithRedirect(c, errs.MissingKey(key.UserId, "Authentication"), "/")
+		return
 	}
+
+	c.Set(key.UserId, value)
+
+	c.Next()
 }

internal/app/server/middleware/error.go

@@ -3,12 +3,18 @@ package middleware
 import (
 	"net/http"
 
+	"github.com/bastean/codexgo/v4/internal/app/server/util/key"
 	"github.com/bastean/codexgo/v4/internal/app/server/util/reply"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/errors"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/logger/log"
 	"github.com/gin-gonic/gin"
 )
 
+type ErrorResponse struct {
+	Status int
+	*reply.JSON
+}
+
 func ErrorHandler(c *gin.Context) {
 	c.Next()
 
@@ -20,21 +26,47 @@ func ErrorHandler(c *gin.Context) {
 		errInternal     *errors.ErrInternal
 	)
 
-	for _, err := range c.Errors {
-		switch {
-		case errors.As(err, &errInvalidValue):
-			c.JSON(http.StatusUnprocessableEntity, &reply.JSON{Message: errInvalidValue.What, Data: errInvalidValue.Why})
-		case errors.As(err, &errAlreadyExist):
-			c.JSON(http.StatusConflict, &reply.JSON{Message: errAlreadyExist.What, Data: errAlreadyExist.Why})
-		case errors.As(err, &errNotExist):
-			c.JSON(http.StatusNotFound, &reply.JSON{Message: errNotExist.What, Data: errNotExist.Why})
-		case errors.As(err, &errFailure):
-			c.JSON(http.StatusBadRequest, &reply.JSON{Message: errFailure.What, Data: errFailure.Why})
-		case errors.As(err, &errInternal):
-			c.JSON(http.StatusInternalServerError, &reply.JSON{Message: "Server error. Try again later."})
-			fallthrough
-		case err != nil:
+	if len(c.Errors) == 0 {
+		return
+	}
+
+	var response *ErrorResponse
+
+	err := c.Errors[len(c.Errors)-1]
+
+	switch {
+	case errors.As(err, &errInvalidValue):
+		response = &ErrorResponse{http.StatusUnprocessableEntity, &reply.JSON{Message: errInvalidValue.What, Data: errInvalidValue.Why}}
+	case errors.As(err, &errAlreadyExist):
+		response = &ErrorResponse{http.StatusConflict, &reply.JSON{Message: errAlreadyExist.What, Data: errAlreadyExist.Why}}
+	case errors.As(err, &errNotExist):
+		response = &ErrorResponse{http.StatusNotFound, &reply.JSON{Message: errNotExist.What, Data: errNotExist.Why}}
+	case errors.As(err, &errFailure):
+		response = &ErrorResponse{http.StatusBadRequest, &reply.JSON{Message: errFailure.What, Data: errFailure.Why}}
+	case errors.As(err, &errInternal):
+		response = &ErrorResponse{http.StatusInternalServerError, &reply.JSON{Message: "Server error. Try again later."}}
+		fallthrough
+	case err != nil:
+		log.Error(err.Error())
+	}
+
+	if route, shouldRedirect := c.Get(key.Redirect); shouldRedirect {
+		if response != nil {
 			log.Error(err.Error())
 		}
+
+		route, ok := route.(string)
+
+		if !ok {
+			route = "/"
+		}
+
+		c.Redirect(http.StatusFound, route)
+
+		return
+	}
+
+	if response != nil {
+		c.JSON(response.Status, response.JSON)
 	}
 }

internal/app/server/util/errs/abort.go

@@ -3,6 +3,7 @@ package errs
 import (
 	"net/http"
 
+	"github.com/bastean/codexgo/v4/internal/app/server/util/key"
 	"github.com/gin-gonic/gin"
 )
 
@@ -13,7 +14,7 @@ func AbortErr(c *gin.Context, err error) {
 
 func AbortErrWithRedirect(c *gin.Context, err error, route string) {
 	AbortErr(c, err)
-	c.Redirect(http.StatusFound, route)
+	c.Set(key.Redirect, route)
 }
 
 func AbortWithRedirect(c *gin.Context, route string) {

internal/app/server/util/key/key.go

@@ -1,8 +1,9 @@
 package key
 
-var (
+const (
 	Authorization = "Authorization"
 	Exp           = "exp"
 	Id            = "id"
+	Redirect      = "Redirect"
 	UserId        = "userId"
 )