feat:#36 added real ip for proxy, extended error logging

This commit is contained in:
Elmar Kresse
2024-06-18 16:19:25 +02:00
parent 08140b5802
commit a87d911494
10 changed files with 74 additions and 21 deletions

View File

@@ -3,7 +3,6 @@ package service
import (
"encoding/json"
"github.com/gofiber/fiber/v3"
"github.com/gofiber/fiber/v3/log"
"htwkalender/ical/model"
"htwkalender/ical/service/ical"
"log/slog"
@@ -21,8 +20,8 @@ func AddFeedRoutes(app model.AppType) {
results, err := ical.Feed(app, token)
if err != nil {
slog.Error("Failed to get feed", "error", err)
return c.SendStatus(fiber.StatusInternalServerError)
slog.Error("Failed to get feed", "error", err, "token", token)
return c.SendStatus(fiber.StatusBadRequest)
}
c.Response().Header.Set("Content-type", "text/calendar")
c.Response().Header.Set("charset", "utf-8")
@@ -38,7 +37,7 @@ func AddFeedRoutes(app model.AppType) {
//obtain the body of the request
err := json.Unmarshal(c.Body(), &modules)
if err != nil {
log.Error("Failed to unmarshal request body", "error", err)
slog.Error("Failed to parse request body", "error", err, "body", string(c.Body()))
return c.SendStatus(fiber.StatusBadRequest)
}
@@ -46,8 +45,8 @@ func AddFeedRoutes(app model.AppType) {
token, err := ical.CreateFeed(app, modules)
if err != nil {
println(err)
log.Error("Failed to create feed", "error", err)
return c.SendStatus(fiber.StatusInternalServerError)
slog.Error("Failed to create feed", "error", err)
return c.SendStatus(fiber.StatusBadRequest)
}
return c.JSON(token)
@@ -60,8 +59,8 @@ func AddFeedRoutes(app model.AppType) {
results, err := ical.FeedRecord(app, token)
if err != nil {
slog.Error("Failed to get feed", "error", err)
return c.SendStatus(fiber.StatusInternalServerError)
slog.Error("Failed to get feed", "error", err, "token", token)
return c.SendStatus(fiber.StatusBadRequest)
}
c.Response().Header.Set("Content-type", "application/json; charset=UTF-8")
@@ -73,7 +72,7 @@ func AddFeedRoutes(app model.AppType) {
token := c.Query("token")
err := ical.DeleteFeedRecord(app, token)
if err != nil {
slog.Error("Feed could not be deleted", "error", err)
slog.Error("Feed could not be deleted", "error", err, "token", token)
return c.JSON(http.StatusNotFound, "Feed could not be deleted")
} else {
return c.JSON(http.StatusOK, "Feed deleted")