Modify auth middleware

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

middleware/jwt.go

@@ -6,7 +6,7 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func JWTAuth() gin.HandlerFunc {
+func JWTAuth(required bool) gin.HandlerFunc {
 
 	return func(c *gin.Context) {
 		auth := c.GetHeader("Authorization")
@@ -18,6 +18,12 @@ func JWTAuth() gin.HandlerFunc {
 			return
 		}
 
+		if required == true {
+			c.JSON(401, gin.H{"status": "unauthorized"})
+			c.Next()
+			return
+		}
+
 		if uid == "" {
 			c.Set("user_id", "")
 			c.Next()

service/auth/magic.go

@@ -112,9 +112,7 @@ func VerifyMagicLink(c *gin.Context) {
 	}
 	accessToken, refreshToken, err := JwtTool.IssueTokens(user.UserId)
 	if err != nil {
-		c.JSON(500, gin.H{
+		c.JSON(500, gin.H{"status": "error generating tokens"})
-			"status": "error generating tokens",
-		})
 		return
 	}
 

service/event/handler.go

@@ -7,6 +7,6 @@ import (
 )
 
 func Handler(r *gin.RouterGroup) {
-	r.Use(middleware.JWTAuth())
+	r.Use(middleware.JWTAuth(true))
 	r.GET("/info", Info)
 }

service/event/info.go

@@ -11,26 +11,20 @@ func Info(c *gin.Context) {
 	eventData := new(data.Event)
 	eventIdOrig, ok := c.GetQuery("event_id")
 	if !ok {
-		c.JSON(400, gin.H{
+		c.JSON(400, gin.H{"status": "undefinded event id"})
-			"status": "undefinded event id",
-		})
 		return
 	}
 
 	// Parse event id
 	eventId, err := uuid.Parse(eventIdOrig)
 	if err != nil {
-		c.JSON(500, gin.H{
+		c.JSON(500, gin.H{"status": "error parsing string to uuid"})
-			"status": "error parsing string to uuid",
-		})
 		return
 	}
 
 	event, err := eventData.GetEventById(eventId)
 	if err != nil {
-		c.JSON(404, gin.H{
+		c.JSON(404, gin.H{"status": "event id not found"})
-			"status": "event id not found",
-		})
 		return
 	}
 

service/user/checkin.go

@@ -11,69 +11,51 @@ func Checkin(c *gin.Context) {
 	data := new(data.Attendance)
 	userIdOrig, ok := c.Get("user_id")
 	if !ok {
-		c.JSON(401, gin.H{
+		c.JSON(403, gin.H{"status": "userid error"})
-			"status": "unauthorized",
-		})
 		return
 	}
 	userId, err := uuid.Parse(userIdOrig.(string))
 	if err != nil {
-		c.JSON(500, gin.H{
+		c.JSON(500, gin.H{"status": "failed to parse uuid"})
-			"status": "failed to parse uuid",
-		})
 	}
 
 	// Get event id from query
 	eventIdOrig, ok := c.GetQuery("event_id")
 	if !ok {
-		c.JSON(400, gin.H{
+		c.JSON(400, gin.H{"status": "undefinded event id"})
-			"status": "undefinded event id",
-		})
 		return
 	}
 
 	// Parse event id to uuid
 	eventId, err := uuid.Parse(eventIdOrig)
 	if err != nil {
-		c.JSON(500, gin.H{
+		c.JSON(500, gin.H{"status": "error parsing string to uuid"})
-			"status": "error parsing string to uuid",
-		})
 		return
 	}
 	data.UserId = userId
 	code, err := data.GenCheckinCode(eventId)
 	if err != nil {
-		c.JSON(500, gin.H{
+		c.JSON(500, gin.H{"status": "error generating code"})
-			"status": "error generating code",
-		})
 		return
 	}
 
-	c.JSON(200, gin.H{
+	c.JSON(200, gin.H{"checkin_code": code})
-		"checkin_code": code,
-	})
 }
 
 func CheckinSubmit(c *gin.Context) {
 	userIdOrig, ok := c.Get("user_id")
-	if !ok {
+	if userIdOrig.(string) == "" || !ok {
-		c.JSON(403, gin.H{
+		c.JSON(401, gin.H{"status": "unauthorized"})
-			"status": "unauthorized",
-		})
 	}
 	userId, err := uuid.Parse(userIdOrig.(string))
 	if err != nil {
-		c.JSON(500, gin.H{
+		c.JSON(500, gin.H{"status": "failed to parse uuid"})
-			"status": "failed to parse uuid",
-		})
 	}
 
 	userData := new(data.User)
 	userData.GetByUserId(userId)
 	if userData.PermissionLevel <= 20 {
-		c.JSON(403, gin.H{
+		c.JSON(403, gin.H{"status": "access denied"})
-			"status": "access denied",
-		})
 		return
 	}
 
@@ -85,13 +67,9 @@ func CheckinSubmit(c *gin.Context) {
 	attendanceData := new(data.Attendance)
 	err = attendanceData.VerifyCheckinCode(req.ChekinCode)
 	if err != nil {
-		c.JSON(400, gin.H{
+		c.JSON(400, gin.H{"status": "error verify checkin code"})
-			"status": "error verify checkin code",
-		})
 		return
 	}
 
-	c.JSON(200, gin.H{
+	c.JSON(200, gin.H{"status": "success"})
-		"status": "success",
-	})
 }

service/user/handler.go

@@ -7,7 +7,7 @@ import (
 )
 
 func Handler(r *gin.RouterGroup) {
-	r.Use(middleware.JWTAuth())
+	r.Use(middleware.JWTAuth(true))
 	r.GET("/info", Info)
 	r.GET("/checkin", Checkin)
 	r.POST("/checkin/submit", CheckinSubmit)

service/user/info.go

@@ -11,24 +11,18 @@ func Info(c *gin.Context) {
 	userData := new(data.User)
 	userIdOrig, ok := c.Get("user_id")
 	if !ok {
-		c.JSON(404, gin.H{
+		c.JSON(403, gin.H{"status": "userid error"})
-			"status": "user not found",
-		})
 		return
 	}
 	userId, err := uuid.Parse(userIdOrig.(string))
 	if err != nil {
-		c.JSON(500, gin.H{
+		c.JSON(500, gin.H{"status": "failed to parse uuid"})
-			"status": "failed to parse uuid",
-		})
 	}
 
 	// Get user from database
 	user, err := userData.GetByUserId(userId)
 	if err != nil {
-		c.JSON(404, gin.H{
+		c.JSON(404, gin.H{"status": "user not found"})
-			"status": "user not found",
-		})
 		return
 	}
 

service/user/list.go

@@ -17,34 +17,26 @@ func List(c *gin.Context) {
 	}
 	offset, ok := c.GetQuery("offset")
 	if !ok {
-		c.JSON(400, gin.H{
+		c.JSON(400, gin.H{"status": "offset not found"})
-			"status": "offset not found",
-		})
 		return
 	}
 
 	// Parse string to int64
 	limitNum, err := strconv.ParseInt(limit, 10, 64)
 	if err != nil {
-		c.JSON(400, gin.H{
+		c.JSON(400, gin.H{"status": "parse string to int error"})
-			"status": "parse string to int error",
-		})
 		return
 	}
 	offsetNum, err := strconv.ParseInt(offset, 10, 64)
 	if err != nil {
-		c.JSON(400, gin.H{
+		c.JSON(400, gin.H{"status": "parse string to int error"})
-			"status": "parse string to int error",
-		})
 		return
 	}
 
 	// Get user list from search engine
 	list, err := data.FastListUsers(limitNum, offsetNum)
 	if err != nil {
-		c.JSON(500, gin.H{
+		c.JSON(500, gin.H{"status": "failed list users from meilisearch"})
-			"status": "failed list users from meilisearch",
-		})
 	}
 	c.JSON(200, list)
 }

service/user/query.go

@@ -10,7 +10,7 @@ import (
 func Query(c *gin.Context) {
 	userIdOrig, ok := c.Get("user_id")
 	if !ok {
-		c.JSON(400, gin.H{"status": "could not found user_id"})
+		c.JSON(403, gin.H{"status": "userid error"})
 		return
 	}
 	userId, err := uuid.Parse(userIdOrig.(string))
@@ -44,7 +44,5 @@ func Query(c *gin.Context) {
 		return
 	}
 
-	c.JSON(200, gin.H{
+	c.JSON(200, gin.H{"checkin_at": attendance.CheckinAt})
-		"checkin_at": attendance.CheckinAt,
-	})
 }

service/user/update.go

@@ -8,33 +8,27 @@ import (
 )
 
 func Update(c *gin.Context) {
-	var ReqInfo data.User
-	c.BindJSON(&ReqInfo)
-
 	// New user model
 	user := new(data.User)
 	userIdOrig, ok := c.Get("user_id")
 	if !ok {
-		c.JSON(403, gin.H{
+		c.JSON(403, gin.H{"status": "userid error"})
-			"status": "can not found user id",
-		})
 		return
 	}
 	userId, err := uuid.Parse(userIdOrig.(string))
 	if err != nil {
-		c.JSON(500, gin.H{
+		c.JSON(500, gin.H{"status": "failed to parse uuid"})
-			"status": "failed to parse uuid",
-		})
 	}
 
+	var ReqInfo data.User
+	c.BindJSON(&ReqInfo)
+
 	// Get user info
 	user.GetByUserId(userId)
 
 	// Reject permission 0 user
 	if user.PermissionLevel == 0 {
-		c.JSON(403, gin.H{
+		c.JSON(403, gin.H{"status": "premission denied"})
-			"status": "premission denied",
-		})
 		return
 	}
 
@@ -46,7 +40,5 @@ func Update(c *gin.Context) {
 	// Update user info
 	user.UpdateByUserID(userId)
 
-	c.JSON(200, gin.H{
+	c.JSON(200, gin.H{"status": "success"})
-		"status": "success",
-	})
 }