Use utils.HttpResponse/Abort to replace c.JSON/Abort

Signed-off-by: Asai Neko <sugar@sne.moe>

service/auth/redirect.go

@@ -4,6 +4,7 @@ import (
 	"net/url"
 	"nixcn-cms/data"
 	"nixcn-cms/pkgs/authcode"
+	"nixcn-cms/utils"
 
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
@@ -13,19 +14,19 @@ import (
 func Redirect(c *gin.Context) {
 	clientId := c.Query("client_id")
 	if clientId == "" {
-		c.JSON(400, gin.H{"status": "invalid request"})
+		utils.HttpResponse(c, 400, "", "invalid request")
 		return
 	}
 
 	redirectUri := c.Query("redirect_uri")
 	if redirectUri == "" {
-		c.JSON(400, gin.H{"status": "invalid request"})
+		utils.HttpResponse(c, 400, "", "invalid request")
 		return
 	}
 
 	state := c.Query("state")
 	if state == "" {
-		c.JSON(400, gin.H{"status": "invalid request"})
+		utils.HttpResponse(c, 400, "", "invalid request")
 		return
 	}
 
@@ -33,32 +34,32 @@ func Redirect(c *gin.Context) {
 	if code == "" {
 		userIdOrig, ok := c.Get("user_id")
 		if !ok || userIdOrig == "" {
-			c.JSON(401, gin.H{"status": "unauthorized"})
+			utils.HttpResponse(c, 401, "", "unauthorized")
 			return
 		}
 
 		userId, err := uuid.Parse(userIdOrig.(string))
 		if err != nil {
-			c.JSON(500, gin.H{"status": "failed to parse uuid"})
+			utils.HttpResponse(c, 500, "", "failed to parse uuid")
 			return
 		}
 
 		userData := new(data.User)
 		user, err := userData.GetByUserId(userId)
 		if err != nil {
-			c.JSON(500, gin.H{"status": "failed to get user id"})
+			utils.HttpResponse(c, 500, "", "failed to get user id")
 			return
 		}
 
 		code, err := authcode.NewAuthCode(clientId, user.Email)
 		if err != nil {
-			c.JSON(500, gin.H{"status": "code gen failed"})
+			utils.HttpResponse(c, 500, "", "code gen failed")
 			return
 		}
 
 		url, err := url.Parse(redirectUri)
 		if err != nil {
-			c.JSON(400, gin.H{"status": "invalid redirect uri"})
+			utils.HttpResponse(c, 400, "", "invalid redirect uri")
 			return
 		}
 		query := url.Query()
@@ -71,7 +72,7 @@ func Redirect(c *gin.Context) {
 	// Verify email token
 	authCode, ok := authcode.VerifyAuthCode(code)
 	if !ok {
-		c.JSON(403, gin.H{"status": "invalid or expired token"})
+		utils.HttpResponse(c, 403, "", "invalid or expired token")
 		return
 	}
 
@@ -85,13 +86,14 @@ func Redirect(c *gin.Context) {
 			user.UUID = uuid.New()
 			user.UserId = uuid.New()
 			user.Email = authCode.Email
+			user.Username = user.UserId.String()
 			user.PermissionLevel = 10
 			if err := user.Create(); err != nil {
-				c.JSON(500, gin.H{"status": "internal server error"})
+				utils.HttpResponse(c, 500, "", "internal server error")
 				return
 			}
 		} else {
-			c.JSON(500, gin.H{"status": "internal server error"})
+			utils.HttpResponse(c, 500, "", "internal server error")
 			return
 		}
 	}
@@ -99,25 +101,25 @@ func Redirect(c *gin.Context) {
 	clientData := new(data.Client)
 	client, err := clientData.GetClientByClientId(clientId)
 	if err != nil {
-		c.JSON(400, gin.H{"status": "client not found"})
+		utils.HttpResponse(c, 400, "", "client not found")
 		return
 	}
 
 	err = client.ValidateRedirectURI(redirectUri)
 	if err != nil {
-		c.JSON(400, gin.H{"status": "redirect uri not match"})
+		utils.HttpResponse(c, 400, "", "redirect uri not match")
 		return
 	}
 
 	newCode, err := authcode.NewAuthCode(clientId, authCode.Email)
 	if err != nil {
-		c.JSON(500, gin.H{"status": "internal server error"})
+		utils.HttpResponse(c, 500, "", "internal server error")
 		return
 	}
 
 	url, err := url.Parse(redirectUri)
 	if err != nil {
-		c.JSON(400, gin.H{"status": "invalid redirect uri"})
+		utils.HttpResponse(c, 400, "", "invalid redirect uri")
 		return
 	}
 	query := url.Query()