Merge branch 'release/v0.1.2'

Author: slaveofcode

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+### v0.1.2
+
+> 23 October 2022
+
+- Fixed error UserId parsing when upload files
+
 ### v0.1.1
 
 > 23 October 2022

routes/files/bundle_filegroup.go

@@ -13,7 +13,6 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
 	"github.com/slaveofcode/hansip/age_encryption"
 	"github.com/slaveofcode/hansip/repository"
 	"github.com/slaveofcode/hansip/repository/models"
@@ -26,11 +25,11 @@ import (
 )
 
 type BundleFileGroupParam struct {
-	FileGroupId      uuid.UUID `json:"fileGroupId" binding:"required"`
-	ExpiredAt        string    `json:"expiredAt" binding:"required,datetime=2006-01-02T15:04:05Z07:00"` // format UTC: 2021-07-18T10:00:00.000Z
-	Passcode         string    `json:"passcode" binding:"required,gte=6,lte=100"`
-	DownloadPassword string    `json:"downloadPassword" binding:"omitempty,gte=6,lte=100"`
-	UserIds          []uint64  `json:"userIds" binding:"omitempty"`
+	FileGroupId      uint64   `json:"fileGroupId" binding:"required"`
+	ExpiredAt        string   `json:"expiredAt" binding:"required,datetime=2006-01-02T15:04:05Z07:00"` // format UTC: 2021-07-18T10:00:00.000Z
+	Passcode         string   `json:"passcode" binding:"required,gte=6,lte=100"`
+	DownloadPassword string   `json:"downloadPassword" binding:"omitempty,gte=6,lte=100"`
+	UserIds          []uint64 `json:"userIds" binding:"omitempty"`
 }
 
 func BundleFileGroup(repo repository.Repository, s3Client *s3.Client) func(c *gin.Context) {
@@ -46,6 +45,7 @@ func BundleFileGroup(repo repository.Repository, s3Client *s3.Client) func(c *gi
 
 		var bodyParams BundleFileGroupParam
 		if err := c.ShouldBindJSON(&bodyParams); err != nil {
+			log.Println(err)
 			c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{
 				"success": false,
 				"message": "Invalid body request",
@@ -67,7 +67,7 @@ func BundleFileGroup(repo repository.Repository, s3Client *s3.Client) func(c *gi
 		var fileGroup models.FileGroup
 		res := db.Where(
 			`id = ? AND "userId" = ? AND "bundledAt" IS NULL`,
-			bodyParams.FileGroupId.String(),
+			bodyParams.FileGroupId,
 			userId,
 		).First(&fileGroup)
 

routes/files/create_filegroup.go

@@ -1,6 +1,7 @@
 package files
 
 import (
+	"log"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -17,6 +18,7 @@ func CreateFileGroup(repo repository.Repository) func(c *gin.Context) {
 	return func(c *gin.Context) {
 		userId, err := middleware.GetUserId(c)
 		if err != nil {
+			log.Println("error:", err.Error())
 			c.AbortWithStatusJSON(http.StatusForbidden, gin.H{
 				"success": false,
 				"message": "Unauthorized request",

routes/middleware/auth.go

@@ -63,7 +63,7 @@ func UserData(repo repository.Repository) func(ctx *gin.Context) {
 			return
 		}
 
-		ctx.Set(CTX_USER_ID, acct.UserId)
+		ctx.Set(CTX_USER_ID, strconv.FormatUint(acct.UserId, 10))
 	}
 }