Jannex
/
admin-dashboard-backend
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

logger

main
alex 2023-10-21 09:17:54 +02:00
parent 227d9e6b56
commit b92b030dbc
6 changed files with 11 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
routers/router/api/v1/jnxscanner/scanner.go
View File

@ -8,6 +8,7 @@ import (
"jannex/admin-dashboard-backend/socketclients"
"time"
"git.ex.umbach.dev/Alex/roese-utils/rslogger"
"git.ex.umbach.dev/Alex/roese-utils/rsutils"
"git.ex.umbach.dev/Alex/roese-utils/rsvalidator"
"github.com/gofiber/fiber/v2"
@ -53,7 +54,7 @@ func AddScanner(c *fiber.Ctx) error {
Body: scanner,
})
logger.AddSystemLog("Scanner %s %s was registered", scanner.Id, scanner.Name)
logger.AddSystemLog(rslogger.LogTypeInfo, "Scanner %s %s was registered", scanner.Id, scanner.Name)
return c.JSON(structs.ScannerResponse{Id: id, Session: session})
}
@ -91,7 +92,7 @@ func ScanResult(c *fiber.Ctx) error {
Body: body.ScanResult,
})
logger.AddSystemLog("Scanner %s has scanned %s", scannerId, body.ScanResult)
logger.AddSystemLog(rslogger.LogTypeInfo, "Scanner %s has scanned %s", scannerId, body.ScanResult)
return c.SendStatus(fiber.StatusOK)
}
@ -114,7 +115,7 @@ func DeleteScanner(c *fiber.Ctx) error {
},
})
logger.AddSystemLog("Scanner %s was deleted", scanner.Id)
logger.AddSystemLog(rslogger.LogTypeInfo, "Scanner %s was deleted", scanner.Id)
return c.SendStatus(fiber.StatusOK)
}

57
routers/router/api/v1/logger/logger.go
View File

@ -1,57 +0,0 @@
package logger
/*
func GetSystemLog(c *fiber.Ctx) error {
t := c.Query("type")
date := c.Query("date")
lang := c.Query("lang")
if t == "" || date == "" || lang == "" {
return c.SendStatus(fiber.StatusBadRequest)
}
if t == "g" && !socketclients.HasPermission(c.Locals("userId").(string), utils.PermissionGroupTasksHistory) || t == "s" && !socketclients.HasPermission(c.Locals("userId").(string), utils.PermissionAdminAreaLogs) {
return c.SendStatus(fiber.StatusUnauthorized)
}
logType := "Group Tasks"
if t == "s" {
logType = "System"
}
logger.AddSystemLog("User %s has viewed %s logs of the date %s",
c.Locals("userId").(string), logType, date)
// / TODO: remove this by rendering the log message on backend site
var groupTasks []structs.GroupTasks
database.DB.Find(&groupTasks)
return c.JSON([]string{})
/*
if t == "g" {
// grouptasks logs
return c.JSON(structs.LogMessageResponse{
Logs: logger.ReadLogs(date, false, lang),
Dates: logger.GetAllLogMessagesDates(false),
Users: socketclients.GetAllUsers(),
Roles: socketclients.GetAllRoles(),
CategoryGroups: cache.GetCategoryGroupsSorted(),
GroupTasks: groupTasks,
GroupTasksSteps: grouptasks.GetAllGroupTasksSteps(),
})
}
// system logs
return c.JSON(structs.LogMessageResponse{
Logs: logger.ReadLogs(date, true, lang),
Dates: logger.GetAllLogMessagesDates(true),
Users: socketclients.GetAllUsers(),
Roles: socketclients.GetAllRoles(),
CategoryGroups: cache.GetCategoryGroupsSorted(),
GroupTasks: groupTasks,
GroupTasksSteps: grouptasks.GetAllGroupTasksSteps(),
}) */ /*
} */

5
routers/router/api/v1/user/auth.go
View File

@ -8,6 +8,7 @@ import (
"jannex/admin-dashboard-backend/modules/utils"
"jannex/admin-dashboard-backend/socketclients"
"git.ex.umbach.dev/Alex/roese-utils/rslogger"
"git.ex.umbach.dev/Alex/roese-utils/rsutils"
"github.com/gofiber/fiber/v2"
"github.com/rs/zerolog/log"
@ -88,7 +89,7 @@ func UserLogin(c *fiber.Ctx) error {
UserAgent: string(c.Context().UserAgent()),
ExpiresAt: utils.GetSessionExpiresAtTime()})
logger.AddSystemLog("User %s has logged in", user.Id)
logger.AddSystemLog(rslogger.LogTypeInfo, "User %s has logged in", user.Id)
return c.JSON(structs.UserLoginResponse{Session: session})
}
@ -117,7 +118,7 @@ func UserLogout(c *fiber.Ctx) error {
socketclients.CloseAllUserSessionConnections(session)
logger.AddSystemLog("User %s has logged out", c.Locals("userId").(string))
logger.AddSystemLog(rslogger.LogTypeInfo, "User %s has logged out", c.Locals("userId").(string))
return c.SendStatus(fiber.StatusCreated)
}

3
routers/router/api/v1/user/avatar.go
View File

@ -11,6 +11,7 @@ import (
"os"
"strings"
"git.ex.umbach.dev/Alex/roese-utils/rslogger"
"github.com/gofiber/fiber/v2"
"github.com/rs/zerolog/log"
"github.com/savsgio/gotils/uuid"
@ -84,7 +85,7 @@ func UpdateAvatar(c *fiber.Ctx) error {
},
})
logger.AddSystemLog("User %s has changed his avatar", user.Id)
logger.AddSystemLog(rslogger.LogTypeInfo, "User %s has changed his avatar", user.Id)
return c.SaveFile(fileHeader, fmt.Sprintf("%savatars/%s", config.Cfg.FolderPaths.PublicStatic, fileName))
}

3
routers/router/api/v1/user/session.go
View File

@ -6,6 +6,7 @@ import (
"jannex/admin-dashboard-backend/modules/structs"
"jannex/admin-dashboard-backend/socketclients"
"git.ex.umbach.dev/Alex/roese-utils/rslogger"
"github.com/gofiber/fiber/v2"
"github.com/rs/zerolog/log"
)
@ -53,7 +54,7 @@ func SignOutSession(c *fiber.Ctx) error {
socketclients.UpdateUserSessionsForUser(userSession.UserId, userSession.Id)
logger.AddSystemLog("User %s has logged out one of his account sessions", c.Locals("userId").(string))
logger.AddSystemLog(rslogger.LogTypeInfo, "User %s has logged out one of his account sessions", c.Locals("userId").(string))
}
return c.JSON(fiber.Map{"status": "ok"})

3
routers/router/router.go
View File

@ -41,9 +41,6 @@ func SetupRoutes(app *fiber.App) {
//s.Post("/scan", scannerSessionValidation, jxscanner.ScanResult)
//s.Delete("/", scannerSessionValidation, jxscanner.DeleteScanner)
//l := v1.Group("/log")
//l.Get("/", requestAccessValidation, log.GetSystemLog)
gs := v1.Group("/grouptasks")
gs.Get("/:category", requestAccessValidation, grouptasks.GetGroupTasks)
gs.Post("/start", requestAccessValidation, grouptasks.StartGroupTask)