Merge branch '10-issue' into 'main'

add health skip function in lib

Closes #10

See merge request h6n/users!10
This commit is contained in:
Nicolas Boufidjeline 2024-04-01 17:35:08 +00:00
commit 6e8f65223c
2 changed files with 15 additions and 10 deletions

View file

@ -9,6 +9,7 @@ import (
echoSwagger "github.com/swaggo/echo-swagger"
logins "gitlab.g3e.fr/h6n/users/internal"
"gitlab.g3e.fr/h6n/users/lib"
"gitlab.g3e.fr/h6n/users/lib/health"
"gorm.io/gorm"
_ "github.com/lib/pq"
@ -39,7 +40,7 @@ func isLoggedIn(c echo.Context) error {
return c.NoContent(http.StatusNoContent)
}
func health(c echo.Context) error {
func status(c echo.Context) error {
return c.NoContent(http.StatusOK)
}
@ -58,20 +59,14 @@ func skip_auth(c echo.Context) bool {
if c.Request().Method == "POST" && c.Path() == "/" {
return true
}
if c.Request().Method == "GET" && c.Path() == "/health" {
return true
}
if len(c.Path()) > 9 && c.Path()[:9] == "/swagger/" {
return true
}
return false
return health.IsHealth(c)
}
func skip_log(c echo.Context) bool {
if c.Request().Method == "GET" && c.Path() == "/health" {
return true
}
return false
return health.IsHealth(c)
}
// @title Users
@ -109,7 +104,7 @@ func main() {
e.GET("/", isLoggedIn)
e.POST("/", login)
e.DELETE("/", logout)
e.GET("/health", health)
e.GET("/health", status)
e.GET("/swagger/*", echoSwagger.WrapHandler)
// Start server

10
lib/health/isHealth.go Normal file
View file

@ -0,0 +1,10 @@
package health
import "github.com/labstack/echo/v4"
func IsHealth(c echo.Context) bool {
if c.Request().Method == "GET" && c.Path() == "/health" {
return true
}
return false
}