From 199dd8c4307ee59ade08945ed2f8aaeec57b2368 Mon Sep 17 00:00:00 2001 From: afifurrohman-id Date: Tue, 5 Dec 2023 09:24:02 +0700 Subject: [PATCH] feat: Update git modules and add more logs --- cmd/files/delete.go | 1 + cmd/files/get.go | 2 +- cmd/files/middleware/auth.go | 6 +++--- cmd/files/middleware/storage.go | 4 ++-- cmd/files/update.go | 2 +- cmd/files/user.go | 3 +++ 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/cmd/files/delete.go b/cmd/files/delete.go index 661d907..7bb8885 100644 --- a/cmd/files/delete.go +++ b/cmd/files/delete.go @@ -57,6 +57,7 @@ func HandleDeleteAllFile(ctx *fiber.Ctx) error { }) } + //TODO: More efficient way to delete all files for _, fileData := range filesData { internal.Check(store.DeleteObject(storeCtx, fileData.Name)) } diff --git a/cmd/files/get.go b/cmd/files/get.go index a57d5d0..4a90583 100644 --- a/cmd/files/get.go +++ b/cmd/files/get.go @@ -77,7 +77,7 @@ func HandleGetFileData(ctx *fiber.Ctx) error { Description: fmt.Sprintf("File: %s, Is Not Found", fileName), }) } - internal.Check(err) + log.Panic(err) } store.Format(fileData) diff --git a/cmd/files/middleware/auth.go b/cmd/files/middleware/auth.go index 577ce27..284b9e8 100644 --- a/cmd/files/middleware/auth.go +++ b/cmd/files/middleware/auth.go @@ -2,12 +2,12 @@ package middleware import ( "fmt" + "github.com/afifurrohman-id/tempsy/internal" "github.com/afifurrohman-id/tempsy/internal/auth" "github.com/afifurrohman-id/tempsy/internal/auth/guest" "github.com/afifurrohman-id/tempsy/internal/auth/oauth2" "github.com/afifurrohman-id/tempsy/internal/models" "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/log" "github.com/gofiber/fiber/v2/middleware/cors" "golang.org/x/exp/slices" "strings" @@ -38,14 +38,14 @@ func CheckAuth(ctx *fiber.Ctx) error { if err == nil && tokenMap["jti"] == username { return ctx.Next() } - log.Error(err) + internal.LogErr(err) } else { accountInfo, err := oauth2.GetGoogleAccountInfo(strings.TrimPrefix(authToken, auth.BearerPrefix)) if err == nil && username == accountInfo.UserName && accountInfo.VerifiedEmail { return ctx.Next() } - log.Error(err) + internal.LogErr(err) } } diff --git a/cmd/files/middleware/storage.go b/cmd/files/middleware/storage.go index 7f27336..9817029 100644 --- a/cmd/files/middleware/storage.go +++ b/cmd/files/middleware/storage.go @@ -22,8 +22,8 @@ func PurgeAnonymousAccount(ctx *fiber.Ctx) error { ) if strings.HasPrefix(username, guest.UsernamePrefix) { - if lU := strings.SplitN(username, "-", 3); len(lU) > 2 { - autoDeletedAccount, err := strconv.ParseInt(lU[1], 10, 64) + if nameSplit := strings.SplitN(username, "-", 3); len(nameSplit) > 2 { + autoDeletedAccount, err := strconv.ParseInt(nameSplit[1], 10, 64) if err == nil { if autoDeletedAccount < time.Now().UnixMilli() { timeout := 15 * time.Second diff --git a/cmd/files/update.go b/cmd/files/update.go index 19b0d2e..64b4fdd 100644 --- a/cmd/files/update.go +++ b/cmd/files/update.go @@ -41,7 +41,7 @@ func HandleUpdateFile(ctx *fiber.Ctx) error { Description: fmt.Sprintf("File %s Is Not Found", fileName), }) } - internal.Check(err) + log.Panic(err) } if !strings.Contains(file.ContentType, ctx.Get(fiber.HeaderContentType)) { diff --git a/cmd/files/user.go b/cmd/files/user.go index 3ff5b73..2db85e1 100644 --- a/cmd/files/user.go +++ b/cmd/files/user.go @@ -9,6 +9,7 @@ import ( "github.com/afifurrohman-id/tempsy/internal/models" store "github.com/afifurrohman-id/tempsy/internal/storage" "github.com/gofiber/fiber/v2" + "github.com/gofiber/fiber/v2/log" "strings" ) @@ -47,6 +48,8 @@ func HandleGetUserInfo(ctx *fiber.Ctx) error { if claims, err := guest.ParseToken(token); err == nil { userinfo.UserName = claims["jti"].(string) } else { + log.Error(err) + goUser, err := oauth2.GetGoogleAccountInfo(token) if err != nil { return ctx.Status(fiber.StatusBadRequest).JSON(&models.ApiError{