Modify auth middleware

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

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{
-			"status": "unauthorized",
-		})
+		c.JSON(403, gin.H{"status": "userid error"})
 		return
 	}
 	userId, err := uuid.Parse(userIdOrig.(string))
 	if err != nil {
-		c.JSON(500, gin.H{
-			"status": "failed to parse uuid",
-		})
+		c.JSON(500, gin.H{"status": "failed to parse uuid"})
 	}
 
 	// Get event id from query
 	eventIdOrig, ok := c.GetQuery("event_id")
 	if !ok {
-		c.JSON(400, gin.H{
-			"status": "undefinded event id",
-		})
+		c.JSON(400, gin.H{"status": "undefinded event id"})
 		return
 	}
 
 	// Parse event id to uuid
 	eventId, err := uuid.Parse(eventIdOrig)
 	if err != nil {
-		c.JSON(500, gin.H{
-			"status": "error parsing string to uuid",
-		})
+		c.JSON(500, gin.H{"status": "error parsing string to uuid"})
 		return
 	}
 	data.UserId = userId
 	code, err := data.GenCheckinCode(eventId)
 	if err != nil {
-		c.JSON(500, gin.H{
-			"status": "error generating code",
-		})
+		c.JSON(500, gin.H{"status": "error generating code"})
 		return
 	}
 
-	c.JSON(200, gin.H{
-		"checkin_code": code,
-	})
+	c.JSON(200, gin.H{"checkin_code": code})
 }
 
 func CheckinSubmit(c *gin.Context) {
 	userIdOrig, ok := c.Get("user_id")
-	if !ok {
-		c.JSON(403, gin.H{
-			"status": "unauthorized",
-		})
+	if userIdOrig.(string) == "" || !ok {
+		c.JSON(401, gin.H{"status": "unauthorized"})
 	}
 	userId, err := uuid.Parse(userIdOrig.(string))
 	if err != nil {
-		c.JSON(500, gin.H{
-			"status": "failed to parse uuid",
-		})
+		c.JSON(500, gin.H{"status": "failed to parse uuid"})
 	}
 
 	userData := new(data.User)
 	userData.GetByUserId(userId)
 	if userData.PermissionLevel <= 20 {
-		c.JSON(403, gin.H{
-			"status": "access denied",
-		})
+		c.JSON(403, gin.H{"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{
-			"status": "error verify checkin code",
-		})
+		c.JSON(400, gin.H{"status": "error verify checkin code"})
 		return
 	}
 
-	c.JSON(200, gin.H{
-		"status": "success",
-	})
+	c.JSON(200, gin.H{"status": "success"})
 }