jacob1123/budgeteer
1
1
Fork 0
Code Issues 12 Pull Requests 1 Packages Releases 1 Wiki Activity

Continue migration to echo

Browse Source
This commit is contained in:
Jan Bader
2022-08-20 22:44:59 +00:00
parent 1a11555075
commit 9da4a6f03e
10 changed files with 76 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/session.go
View File

@@ -7,7 +7,6 @@ import (
"git.javil.eu/jacob1123/budgeteer"
"git.javil.eu/jacob1123/budgeteer/postgres"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/labstack/echo/v4"
)
@@ -18,8 +17,8 @@ const (
ParamName = "token"
)
func MustGetToken(c *gin.Context) budgeteer.Token { //nolint:ireturn
token := c.MustGet(ParamName)
func MustGetToken(c echo.Context) budgeteer.Token { //nolint:ireturn
token := c.Get(ParamName)
if token, ok := token.(budgeteer.Token); ok {
return token
}
@@ -27,16 +26,16 @@ func MustGetToken(c *gin.Context) budgeteer.Token { //nolint:ireturn
panic("Token is not a valid Token")
}
func (h *Handler) verifyLogin(c echo.Context) (budgeteer.Token, *ErrorResponse) { //nolint:ireturn
func (h *Handler) verifyLogin(c echo.Context) (budgeteer.Token, error) { //nolint:ireturn
tokenString := c.Request().Header.Get(HeaderName)
if len(tokenString) <= len(Bearer) {
return nil, &ErrorResponse{"no authorization header supplied"}
return nil, echo.NewHTTPError(http.StatusUnauthorized, "no authorization header supplied")
}
tokenString = tokenString[7:]
token, err := h.TokenVerifier.VerifyToken(tokenString)
if err != nil {
return nil, &ErrorResponse{fmt.Sprintf("verify token '%s': %s", tokenString, err)}
return nil, fmt.Errorf("verify token '%s': %s", tokenString, err)
}
return token, nil
@@ -107,16 +106,16 @@ func (h *Handler) registerPost(c echo.Context) error {
var register registerInformation
err := c.Bind(&register)
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, ErrorResponse{"error parsing body"})
return echo.NewHTTPError(http.StatusBadRequest, "error parsing body")
}
if register.Email == "" || register.Password == "" || register.Name == "" {
return echo.NewHTTPError(http.StatusBadRequest, ErrorResponse{"e-mail, password and name are required"})
return echo.NewHTTPError(http.StatusBadRequest, "e-mail, password and name are required")
}
_, err = h.Service.GetUserByUsername(c.Request().Context(), register.Email)
if err == nil {
return echo.NewHTTPError(http.StatusBadRequest, ErrorResponse{"email is already taken"})
return echo.NewHTTPError(http.StatusBadRequest, "email is already taken")
}
hash, err := h.CredentialsVerifier.Hash(register.Password)