From 6659671132196edc6b491500545de9eb9ec35275 Mon Sep 17 00:00:00 2001
From: ivamp <im@ivampiresp.com>
Date: Tue, 10 Dec 2024 18:45:46 +0800
Subject: [PATCH] update

---
 internal/api/http/middleware/auth.go |  6 ++++--
 internal/pkg/response/response.go    | 10 +++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/internal/api/http/middleware/auth.go b/internal/api/http/middleware/auth.go
index 48ffe3f..8dff662 100644
--- a/internal/api/http/middleware/auth.go
+++ b/internal/api/http/middleware/auth.go
@@ -50,6 +50,8 @@ func (a *Auth) Handler() fiber.Handler {
 
 		authorization := c.Get(constants.AuthHeader)
 
+		r.Status(http.StatusUnauthorized)
+
 		if authorization == "" {
 			return r.Error(errs.JWTFormatError).Send()
 		}
@@ -66,11 +68,11 @@ func (a *Auth) Handler() fiber.Handler {
 		token, err = a.authService.AuthFromToken(constants.JwtTokenTypeIDToken, authSplit[1])
 
 		if err != nil {
-			return r.Error(err).Status(http.StatusUnauthorized).Send()
+			return r.Error(err).Send()
 		}
 
 		if token == nil {
-			return r.Error(err).Status(http.StatusUnauthorized).Send()
+			return r.Error(err).Send()
 		}
 
 		if audienceLength > 0 {
diff --git a/internal/pkg/response/response.go b/internal/pkg/response/response.go
index bd43802..104af31 100644
--- a/internal/pkg/response/response.go
+++ b/internal/pkg/response/response.go
@@ -111,16 +111,12 @@ func (r *Response) Send() error {
 	var rspCtx = r.ctx.Status(r.httpStatus)
 	var rspErr error
 
-	if r.body.Data == nil {
-		return rspCtx.Send([]byte{})
-	}
-
-	if r.body.Wrap {
+	if r.body.Data == nil || r.body.Wrap {
 		rspErr = rspCtx.JSON(r.body)
+	} else {
+		rspErr = rspCtx.JSON(r.body.Data)
 	}
 
-	rspErr = rspCtx.JSON(r.body.Data)
-
 	return rspErr
 }