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

Start migration to echo

Browse Source
This commit is contained in:
Jan Bader
2022-08-20 22:08:41 +00:00
parent dd0f620b7a
commit b573553424
5 changed files with 101 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
server/session.go
View File

@ -9,6 +9,7 @@ import (
"git.javil.eu/jacob1123/budgeteer/postgres"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/labstack/echo/v4"
)
const (
@ -26,8 +27,8 @@ func MustGetToken(c *gin.Context) budgeteer.Token { //nolint:ireturn
panic("Token is not a valid Token")
}
func (h *Handler) verifyLogin(c *gin.Context) (budgeteer.Token, *ErrorResponse) { //nolint:ireturn
tokenString := c.GetHeader(HeaderName)
func (h *Handler) verifyLogin(c echo.Context) (budgeteer.Token, *ErrorResponse) { //nolint:ireturn
tokenString := c.Request().Header.Get(HeaderName)
if len(tokenString) <= len(Bearer) {
return nil, &ErrorResponse{"no authorization header supplied"}
}
@ -41,16 +42,17 @@ func (h *Handler) verifyLogin(c *gin.Context) (budgeteer.Token, *ErrorResponse)
return token, nil
}
func (h *Handler) verifyLoginWithForbidden(c *gin.Context) {
token, err := h.verifyLogin(c)
if err != nil {
// c.Header("WWW-Authenticate", "Bearer")
c.AbortWithStatusJSON(http.StatusForbidden, err)
return
}
func (h *Handler) verifyLoginWithForbidden(next echo.HandlerFunc) echo.HandlerFunc {
return func(c echo.Context) error {
token, err := h.verifyLogin(c)
if err != nil {
// c.Header("WWW-Authenticate", "Bearer")
return echo.NewHTTPError(http.StatusForbidden, err)
}
c.Set(ParamName, token)
c.Next()
c.Set(ParamName, token)
return next(c)
}
}
type loginInformation struct {
@ -58,37 +60,35 @@ type loginInformation struct {
User string `json:"user"`
}
func (h *Handler) loginPost(c *gin.Context) {
func (h *Handler) loginPost(c echo.Context) error {
var login loginInformation
err := c.BindJSON(&login)
err := c.Bind(&login)
if err != nil {
return
return err
}
user, err := h.Service.GetUserByUsername(c.Request.Context(), login.User)
user, err := h.Service.GetUserByUsername(c.Request().Context(), login.User)
if err != nil {
c.AbortWithError(http.StatusUnauthorized, err)
return
return err
}
if err = h.CredentialsVerifier.Verify(login.Password, user.Password); err != nil {
c.AbortWithError(http.StatusUnauthorized, err)
return
return err
}
token, err := h.TokenVerifier.CreateToken(&user)
if err != nil {
c.AbortWithError(http.StatusUnauthorized, err)
return err
}
go h.UpdateLastLogin(user.ID)
budgets, err := h.Service.GetBudgetsForUser(c.Request.Context(), user.ID)
budgets, err := h.Service.GetBudgetsForUser(c.Request().Context(), user.ID)
if err != nil {
return
return err
}
c.JSON(http.StatusOK, LoginResponse{token, user, budgets})
return c.JSON(http.StatusOK, LoginResponse{token, user, budgets})
}
type LoginResponse struct {
@ -103,29 +103,25 @@ type registerInformation struct {
Name string `json:"name"`
}
func (h *Handler) registerPost(c *gin.Context) {
func (h *Handler) registerPost(c echo.Context) error {
var register registerInformation
err := c.BindJSON(&register)
err := c.Bind(&register)
if err != nil {
c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"error parsing body"})
return
return echo.NewHTTPError(http.StatusBadRequest, ErrorResponse{"error parsing body"})
}
if register.Email == "" || register.Password == "" || register.Name == "" {
c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"e-mail, password and name are required"})
return
return echo.NewHTTPError(http.StatusBadRequest, ErrorResponse{"e-mail, password and name are required"})
}
_, err = h.Service.GetUserByUsername(c.Request.Context(), register.Email)
_, err = h.Service.GetUserByUsername(c.Request().Context(), register.Email)
if err == nil {
c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"email is already taken"})
return
return echo.NewHTTPError(http.StatusBadRequest, ErrorResponse{"email is already taken"})
}
hash, err := h.CredentialsVerifier.Hash(register.Password)
if err != nil {
c.AbortWithError(http.StatusBadRequest, err)
return
return err
}
createUser := postgres.CreateUserParams{
@ -133,24 +129,24 @@ func (h *Handler) registerPost(c *gin.Context) {
Password: hash,
Email: register.Email,
}
user, err := h.Service.CreateUser(c.Request.Context(), createUser)
user, err := h.Service.CreateUser(c.Request().Context(), createUser)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
return err
}
token, err := h.TokenVerifier.CreateToken(&user)
if err != nil {
c.AbortWithError(http.StatusUnauthorized, err)
return err
}
go h.UpdateLastLogin(user.ID)
budgets, err := h.Service.GetBudgetsForUser(c.Request.Context(), user.ID)
budgets, err := h.Service.GetBudgetsForUser(c.Request().Context(), user.ID)
if err != nil {
return
return err
}
c.JSON(http.StatusOK, LoginResponse{token, user, budgets})
return c.JSON(http.StatusOK, LoginResponse{token, user, budgets})
}
func (h *Handler) UpdateLastLogin(userID uuid.UUID) {