feat: jwt autification sing-in

README.md

@@ -15,7 +15,7 @@ https://habr.com/ru/posts/823682/
 
 # Запуск postgress локально на своей машине разворачиваем в Docker
 -- docker pull postgres
--- docker run --name=calculation-db -e POSTGRES_PASSWORD='qwerty' -p 5436:5432 -d --rm postgress
+-- docker run --name=calculation-db -e POSTGRES_PASSWORD='qwerty' -p 5436:5432 -d --rm postgres
 // если нужны файлы миграции(не нужно они созданы)
 -- migrate create -ext sql -dir ./schema -seq init
 // поднять файлы миграции 

go.mod

@@ -31,6 +31,7 @@ require (
 )
 
 require (
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/gin-gonic/gin v1.10.0
 	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect

go.sum

@@ -10,6 +10,8 @@ github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQ
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=

internal/entity/user/user.go

@@ -1,7 +1,7 @@
 package Calculation
 
 type User struct {
-	Id       int    `json:"-"`
+	Id       int    `json:"-" db:"id"`
 	Name     string `json:"name" binding:"required"`
 	Username string `json:"username" binding:"required"`
 	Password string `json:"password" binding:"required"`

internal/handler/auth.go

@@ -7,10 +7,6 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func (h *Handler) signIn(w *gin.Context) {
-
-}
-
 // @Summary SignUp
 // @Tags auth
 // @Description create account
@@ -41,16 +37,43 @@ func (h *Handler) signUp(c *gin.Context) {
 		"id": id,
 	})
 
-	// err := r.ParseForm()
-	// if err != nil {
-	// 	http.Error(w, "Error parsing form", http.StatusBadRequest)
-	// 	return
-	// }
-	// username := r.FormValue("username")
-	// password := r.FormValue("password")
-	// fmt.Print(username, password)
-	// w.Header().Set("Content-Type", "text/plain")
-	// fmt.Fprintf(w, "Received username: %s have %s pass", username, password)
+}
+
+type singInInput struct {
+	Username string `json:"username" binding:"required"`
+	Password string `json:"password" binding:"required"`
+}
+
+// @Summary SignIn
+// @Tags auth
+// @Description login
+// @ID login
+// @Accept  json
+// @Produce  json
+// @Param input body signInInput true "credentials"
+// @Success 200 {string} string "token"
+// @Failure 400,404 {object} errorResponse
+// @Failure 500 {object} errorResponse
+// @Failure default {object} errorResponse
+// @Router /auth/sign-in [post]
+func (h *Handler) signIn(c *gin.Context) {
+	var input singInInput
+
+	if err := c.BindJSON(&input); err != nil {
+		newErrorResponse(c, http.StatusBadRequest, err.Error())
+		return
+	}
+
+	token, err := h.services.Autorization.GenerateToken(input.Username, input.Password)
+
+	if err != nil {
+		newErrorResponse(c, http.StatusInternalServerError, err.Error())
+		return
+	}
+
+	c.JSON(http.StatusOK, map[string]interface{}{
+		"token": token,
+	})
 }
 
 func (h *Handler) logout(w *gin.Context) {

internal/handler/handler.go

@@ -14,8 +14,6 @@ func NewHandler(services *service.Service) *Handler {
 	return &Handler{services: services}
 }
 
-// @FIX-ME
-// GIN Есть вопрос стоит ли использовать фреймворк gin для работы с http или пользоваться нативом
 func (h *Handler) InitRoutes() *gin.Engine {
 	router := gin.New()
 

repository/auth_postgres.go

@@ -25,3 +25,11 @@ func (r *AuthPostgres) CreateUser(user Calculation.User) (int, error) {
 
 	return id, nil
 }
+
+func (r *AuthPostgres) GetUser(username, password string) (Calculation.User, error) {
+	var user Calculation.User
+	query := fmt.Sprintf("SELECT id FROM %s WHERE username=$1 AND password_hash=$2", usersTable)
+	err := r.db.Get(&user, query, username, password)
+
+	return user, err
+}

repository/repository.go

@@ -8,6 +8,7 @@ import (
 
 type Autorization interface {
 	CreateUser(user Calculation.User) (int, error)
+	GetUser(username, password string) (Calculation.User, error)
 }
 
 type Repository struct {

service/auth.go

@@ -5,12 +5,22 @@ import (
 	"calculation-service/repository"
 	"crypto/sha1"
 	"fmt"
+	"time"
+
+	"github.com/dgrijalva/jwt-go"
 )
 
 const (
-	salt = "asjdhaskdhqwhejkqwhe123123hhhrjqwehqjw"
+	salt       = "asjdhaskdhqwhejkqwhe123123hhhrjqwehqjw"
+	tokenTTL   = 12 * time.Hour
+	signingKey = "werwerwerwerwerwerwr"
 )
 
+type tokenClaims struct {
+	jwt.StandardClaims
+	UserId int `json:"user_id"`
+}
+
 type AuthService struct {
 	repo repository.Autorization
 }
@@ -25,6 +35,22 @@ func (s *AuthService) CreateUser(user Calculation.User) (int, error) {
 	return s.repo.CreateUser(user)
 }
 
+func (s *AuthService) GenerateToken(username, password string) (string, error) {
+	user, err := s.repo.GetUser(username, generatePasswordHash(password))
+	if err != nil {
+		return "", err
+	}
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, &tokenClaims{
+		jwt.StandardClaims{
+			ExpiresAt: time.Now().Add(tokenTTL).Unix(),
+			IssuedAt:  time.Now().Unix(),
+		},
+		user.Id,
+	})
+
+	return token.SignedString([]byte(signingKey))
+}
+
 func generatePasswordHash(password string) string {
 	hash := sha1.New()
 	hash.Write([]byte(password))

service/service.go

@@ -7,6 +7,7 @@ import (
 
 type Autorization interface {
 	CreateUser(user Calculation.User) (int, error)
+	GenerateToken(username, password string) (string, error)
 }
 
 type Service struct {