From 73d1749579b1cb708d32bdfa5ad6833c81935a33 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 25 May 2023 14:36:57 +0200 Subject: [PATCH] use scanner --- modules/utils/globals.go | 1 + routers/router/api/v1/jxscanner/scanner.go | 26 ++++++++++++++++++++++ routers/router/api/v1/user/auth.go | 2 -- routers/router/api/v1/user/avatar.go | 6 ----- routers/router/router.go | 1 + 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/modules/utils/globals.go b/modules/utils/globals.go index 9be07e4..6893166 100644 --- a/modules/utils/globals.go +++ b/modules/utils/globals.go @@ -33,6 +33,7 @@ const ( SentCmdUpdateAllUsersUserAvatar = 10 SentCmdNewScanner = 11 SentCmdDeleteScanner = 12 + SentCmdUpdateScannerUsedBy = 13 ) // commands received from web clients diff --git a/routers/router/api/v1/jxscanner/scanner.go b/routers/router/api/v1/jxscanner/scanner.go index e44e6c9..7c647d5 100644 --- a/routers/router/api/v1/jxscanner/scanner.go +++ b/routers/router/api/v1/jxscanner/scanner.go @@ -102,3 +102,29 @@ func DeleteScanner(c *fiber.Ctx) error { return c.SendStatus(fiber.StatusOK) } + +func UpdateScannerUsedByUserId(c *fiber.Ctx) error { + scannerId := c.Params("scannerId") + + if len(scannerId) != 36 { + log.Error().Msgf("Error parsing scanner id: %v", scannerId) + return c.SendStatus(fiber.StatusBadRequest) + } + + usedByUserId := c.Locals("userId").(string) + + database.DB.Model(&structs.Scanner{}).Where("id = ?", scannerId).Updates(structs.Scanner{UsedByUserId: usedByUserId}) + + socketclients.BroadcastMessage(structs.SendSocketMessage{ + Cmd: utils.SentCmdUpdateScannerUsedBy, + Body: struct { + ScannerId string + UsedByUserId string + }{ + ScannerId: scannerId, + UsedByUserId: usedByUserId, + }, + }) + + return c.SendStatus(fiber.StatusOK) +} diff --git a/routers/router/api/v1/user/auth.go b/routers/router/api/v1/user/auth.go index 0e5eae9..337b6f8 100644 --- a/routers/router/api/v1/user/auth.go +++ b/routers/router/api/v1/user/auth.go @@ -65,8 +65,6 @@ func UserLogin(c *fiber.Ctx) error { UserId: user.Id, UserAgent: string(c.Context().UserAgent())}) - log.Info().Msg("Login user: " + user.Email) - return c.JSON(structs.UserLoginResponse{Session: session}) } diff --git a/routers/router/api/v1/user/avatar.go b/routers/router/api/v1/user/avatar.go index 07cf72f..28a95d7 100644 --- a/routers/router/api/v1/user/avatar.go +++ b/routers/router/api/v1/user/avatar.go @@ -15,8 +15,6 @@ import ( ) func UpdateAvatar(c *fiber.Ctx) error { - log.Info().Msg("update avatar") - fileHeader, err := c.FormFile("file") if err != nil { @@ -29,14 +27,10 @@ func UpdateAvatar(c *fiber.Ctx) error { return c.SendStatus(fiber.StatusRequestEntityTooLarge) } - log.Debug().Msgf("userid", c.Locals("userId")) - user := structs.User{Id: c.Locals("userId").(string)} database.DB.First(&user) - log.Debug().Msgf("Found user %s", user.Avatar) - if user.Avatar != "" { os.Remove("./public/avatars/" + user.Avatar) } diff --git a/routers/router/router.go b/routers/router/router.go index cc18743..04d5568 100644 --- a/routers/router/router.go +++ b/routers/router/router.go @@ -23,6 +23,7 @@ func SetupRoutes(app *fiber.App) { s.Post("/", jxscanner.AddScanner) s.Post("/scan", scannerSessionValidation, jxscanner.ScanResult) s.Delete("/", scannerSessionValidation, jxscanner.DeleteScanner) + s.Patch("/:scannerId", userSessionValidation, jxscanner.UpdateScannerUsedByUserId) app.Static("/", "./public") }