dkforest

commit e2d8ddaa4e80f6841182240d626b4b18556eab63
parent 3affa208058a7e0745a1bc7e9e7d1ad927cf2a88
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Fri, 26 May 2023 05:40:59 -0700

avoid fetching user twice every requests

Diffstat:
M
pkg/web/middlewares/middlewares.go
 | 
2
+-
M
pkg/web/web.go
 | 
7
+++----

2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/pkg/web/middlewares/middlewares.go b/pkg/web/middlewares/middlewares.go
@@ -200,7 +200,7 @@ func I18nMiddleware(bundle *i18n.Bundle, defaultLang string) echo.MiddlewareFunc
 			// - Default en
 
 			lang := ""
-			user := c.Get("authUser").(*database.User)
+			user, _ := c.Get("authUser").(*database.User)
 			if user != nil && user.Lang != "" {
 				lang = user.Lang
 			} else if defaultLang != "" {
diff --git a/pkg/web/web.go b/pkg/web/web.go
@@ -310,14 +310,13 @@ func getBaseServer(db *database.DkfDB) *echo.Echo {
 	e.Renderer = renderer
 	e.Use(middlewares.SetUselessHeadersMiddleware)
 	e.Use(middlewares.SetDatabaseMiddleware(db))
-	e.Use(middlewares.SetUserMiddleware)
 	e.Use(middlewares.I18nMiddleware(i18nBundle, "en"))
 	e.GET("/file-drop/:uuid", handlers.FileDropHandler)
 	e.POST("/file-drop/:uuid", handlers.FileDropHandler)
 	e.POST("/file-drop/:uuid/dkfupload", handlers.FileDropDkfUploadHandler)
-	e.POST("/api/v1/file-drop/:uuid/dkfdownload", handlers.FileDropDkfDownloadHandler, middlewares.IsAuthMiddleware)
-	e.GET("/downloads/:fileName", handlers.FileDropDownloadHandler)
-	e.POST("/downloads/:fileName", handlers.FileDropDownloadHandler)
+	e.POST("/api/v1/file-drop/:uuid/dkfdownload", handlers.FileDropDkfDownloadHandler, middlewares.SetUserMiddleware, middlewares.IsAuthMiddleware)
+	e.GET("/downloads/:fileName", handlers.FileDropDownloadHandler, middlewares.SetUserMiddleware)
+	e.POST("/downloads/:fileName", handlers.FileDropDownloadHandler, middlewares.SetUserMiddleware)
 	e.Any("*", getMainServer(db, i18nBundle, renderer))
 	return e
 }