evan/AnthoLume
evan/AnthoLume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(api): ko json content type
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Evan Reichard 2025-05-13 12:14:57 -04:00
parent 162adfbe16
commit 451735d261
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/api.go
View File

@ -189,7 +189,7 @@ func (api *API) registerWebAppRoutes(router *gin.Engine) {
} }
func (api *API) registerKOAPIRoutes(apiGroup *gin.RouterGroup) { func (api *API) registerKOAPIRoutes(apiGroup *gin.RouterGroup) {
koGroup := apiGroup.Group("/ko") koGroup := apiGroup.Group("/ko", koJSONMiddleware)
// KO sync routes (webapp uses - progress & activity) // KO sync routes (webapp uses - progress & activity)
koGroup.GET("/documents/:document/file", api.authKOMiddleware, api.createDownloadDocumentHandler(apiErrorPage)) koGroup.GET("/documents/:document/file", api.authKOMiddleware, api.createDownloadDocumentHandler(apiErrorPage))
@ -325,6 +325,13 @@ func (api *API) loadTemplates(
return nil return nil
} }
func (api *API) templateMiddleware(router *gin.Engine) gin.HandlerFunc {
return func(c *gin.Context) {
router.HTMLRender = *api.generateTemplates()
c.Next()
}
}
func loggingMiddleware(c *gin.Context) { func loggingMiddleware(c *gin.Context) {
// Start timer // Start timer
startTime := time.Now() startTime := time.Now()
@ -361,9 +368,12 @@ func loggingMiddleware(c *gin.Context) {
log.WithFields(logData).Info(fmt.Sprintf("%s %s", c.Request.Method, c.Request.URL.Path)) log.WithFields(logData).Info(fmt.Sprintf("%s %s", c.Request.Method, c.Request.URL.Path))
} }
func (api *API) templateMiddleware(router *gin.Engine) gin.HandlerFunc { // koJSONMiddleware forces JSON Content-Type to only return `application/json`. This is addressing
return func(c *gin.Context) { // the following issue: https://github.com/koreader/koreader/issues/13629
router.HTMLRender = *api.generateTemplates() func koJSONMiddleware(c *gin.Context) {
c.Next() c.Next()
contentType := c.Writer.Header().Get("Content-Type")
if strings.HasPrefix(contentType, "application/json") {
c.Header("Content-Type", "application/json")
} }
} }