mirror of
https://github.com/zoriya/vex.git
synced 2026-08-05 13:46:38 +00:00
Add users services and jwt
This commit is contained in:
+2
-3
@@ -25,7 +25,6 @@ func (h *Handler) AddFeed(c echo.Context) error {
|
||||
if err = c.Validate(&req); err != nil {
|
||||
return err
|
||||
}
|
||||
log.Printf("%v", req)
|
||||
|
||||
feed, err := h.feeds.AddFeed(req.Link, req.Tags, user)
|
||||
if err != nil {
|
||||
@@ -35,6 +34,6 @@ func (h *Handler) AddFeed(c echo.Context) error {
|
||||
return c.JSON(201, feed)
|
||||
}
|
||||
|
||||
func (h *Handler) RegisterFeedsRoutes(e *echo.Echo) {
|
||||
e.POST("/feeds", h.AddFeed)
|
||||
func (h *Handler) RegisterFeedsRoutes(echo *echo.Echo, restricted *echo.Group) {
|
||||
restricted.POST("/feeds", h.AddFeed)
|
||||
}
|
||||
|
||||
+15
-3
@@ -8,6 +8,7 @@ import (
|
||||
|
||||
"github.com/go-playground/validator/v10"
|
||||
"github.com/jmoiron/sqlx"
|
||||
"github.com/labstack/echo-jwt/v4"
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/labstack/echo/v4/middleware"
|
||||
_ "github.com/lib/pq"
|
||||
@@ -15,7 +16,9 @@ import (
|
||||
)
|
||||
|
||||
type Handler struct {
|
||||
feeds vex.FeedService
|
||||
feeds vex.FeedService
|
||||
users vex.UserService
|
||||
jwtSecret []byte
|
||||
}
|
||||
|
||||
func (h *Handler) GetEntries(c echo.Context) error {
|
||||
@@ -49,14 +52,23 @@ func main() {
|
||||
log.Fatal(err)
|
||||
}
|
||||
h := Handler{
|
||||
feeds: vex.NewFeedService(db),
|
||||
feeds: vex.NewFeedService(db),
|
||||
users: vex.NewUserService(db),
|
||||
jwtSecret: []byte(os.Getenv("JWT_SECRET")),
|
||||
}
|
||||
|
||||
e := echo.New()
|
||||
e.Validator = &Validator{validator: validator.New()}
|
||||
e.Use(middleware.Logger())
|
||||
|
||||
r := e.Group("")
|
||||
e.Use(echojwt.WithConfig(echojwt.Config{
|
||||
SigningKey: h.jwtSecret,
|
||||
}))
|
||||
|
||||
e.GET("/entries", h.GetEntries)
|
||||
h.RegisterFeedsRoutes(e)
|
||||
h.RegisterLoginRoutes(e, r)
|
||||
h.RegisterFeedsRoutes(e, r)
|
||||
|
||||
e.Start(":1597")
|
||||
}
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/golang-jwt/jwt"
|
||||
"github.com/google/uuid"
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/zoriya/vex"
|
||||
)
|
||||
|
||||
type LoginDto struct {
|
||||
Email string `json:"email" validate:"required"`
|
||||
Password string `json:"password" validate:"required"`
|
||||
}
|
||||
|
||||
type RegisterDto struct {
|
||||
Name string `json:"name" validate:"required"`
|
||||
Email string `json:"email" validate:"required"`
|
||||
Password string `json:"password" validate:"required,max(60)"`
|
||||
}
|
||||
|
||||
func (h *Handler) Login(c echo.Context) error {
|
||||
var req LoginDto
|
||||
err := c.Bind(&req)
|
||||
if err != nil {
|
||||
return echo.NewHTTPError(http.StatusBadRequest, err.Error())
|
||||
}
|
||||
if err = c.Validate(&req); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
user := h.users.GetByEmail(req.Email)
|
||||
if user == nil {
|
||||
return echo.NewHTTPError(403, "Invalid email")
|
||||
}
|
||||
if !h.users.CheckPassword(req.Password, user.Password) {
|
||||
return echo.NewHTTPError(403, "Invalid password")
|
||||
}
|
||||
return h.CreateToken(c, user)
|
||||
}
|
||||
|
||||
func (h *Handler) CreateToken(c echo.Context, user *vex.User) error {
|
||||
claims := &jwt.StandardClaims{
|
||||
Subject: user.Id.String(),
|
||||
}
|
||||
token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
|
||||
t, err := token.SignedString(h.jwtSecret)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return c.JSON(http.StatusOK, echo.Map{
|
||||
"token": t,
|
||||
})
|
||||
}
|
||||
|
||||
func (h *Handler) Register(c echo.Context) error {
|
||||
var req RegisterDto
|
||||
err := c.Bind(&req)
|
||||
if err != nil {
|
||||
return echo.NewHTTPError(http.StatusBadRequest, err.Error())
|
||||
}
|
||||
if err = c.Validate(&req); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
user, err := h.users.Create(req.Name, req.Email, req.Password)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return h.CreateToken(c, &user)
|
||||
}
|
||||
|
||||
func (h *Handler) GetMe(c echo.Context) error {
|
||||
id, err := GetCurrentUserId(c)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
user := h.users.GetById(id)
|
||||
if user == nil {
|
||||
return echo.NewHTTPError(500, "Internal server error")
|
||||
}
|
||||
return c.JSON(200, user)
|
||||
}
|
||||
|
||||
func GetCurrentUserId(c echo.Context) (uuid.UUID, error) {
|
||||
user := c.Get("user").(*jwt.Token)
|
||||
if user == nil {
|
||||
return uuid.UUID{}, echo.NewHTTPError(401, "Unauthorized")
|
||||
}
|
||||
claims := user.Claims.(*jwt.StandardClaims)
|
||||
if claims == nil {
|
||||
return uuid.UUID{}, echo.NewHTTPError(403, "Missing claims")
|
||||
}
|
||||
ret, err := uuid.Parse(claims.Subject)
|
||||
if err != nil {
|
||||
return uuid.UUID{}, echo.NewHTTPError(403, "Invalid id")
|
||||
}
|
||||
return ret, nil
|
||||
}
|
||||
|
||||
func (h *Handler) RegisterLoginRoutes(e *echo.Echo, r *echo.Group) {
|
||||
e.POST("/login", h.Login)
|
||||
e.POST("/register", h.Register)
|
||||
r.GET("/register", h.GetMe)
|
||||
}
|
||||
Reference in New Issue
Block a user