gitea/opengist
0
0
Fork 0
mirror of https://github.com/thomiceli/opengist.git synced 2025-07-12 19:01:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change json response detection (#361)

Browse Source
This commit is contained in:
Thomas Miceli
2024-10-31 14:41:42 +01:00
committed by GitHub
parent d0b4815798
commit 20372f44e4
4 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/web/util.go
View File

@ -19,14 +19,6 @@ import (
type dataTypeKey string
type HTMLError struct {
*echo.HTTPError
}
type JSONError struct {
*echo.HTTPError
}
const dataKey dataTypeKey = "data"
func setData(ctx echo.Context, key string, value any) {
@ -54,7 +46,11 @@ func htmlWithCode(ctx echo.Context, code int, template string) error {
return ctx.Render(code, template, ctx.Request().Context().Value(dataKey))
}
func json(ctx echo.Context, code int, data any) error {
func json(ctx echo.Context, data any) error {
return jsonWithCode(ctx, 200, data)
}
func jsonWithCode(ctx echo.Context, code int, data any) error {
return ctx.JSON(code, data)
}
@ -76,7 +72,7 @@ func errorRes(code int, message string, err error) error {
skipLogger.Error().Err(err).Msg(message)
}
return &HTMLError{&echo.HTTPError{Code: code, Message: message, Internal: err}}
return &echo.HTTPError{Code: code, Message: message, Internal: err}
}
func jsonErrorRes(code int, message string, err error) error {
@ -85,7 +81,7 @@ func jsonErrorRes(code int, message string, err error) error {
skipLogger.Error().Err(err).Msg(message)
}
return &JSONError{&echo.HTTPError{Code: code, Message: message, Internal: err}}
return &echo.HTTPError{Code: code, Message: message, Internal: err}
}
func getUserLogged(ctx echo.Context) *db.User {