Password login

Makefile

@@ -1,11 +1,14 @@
-SUB_DIRS = protobuf migrations
+SUB_DIRS = protobuf
 PACKAGES	?= $(shell go list ./...)
 
 all: $(SUB_DIRS)
 
 $(SUB_DIRS):
 	make -C $@
 
+migrations:
+	make -C migrations
+
 test:
 	-mkdir build
 	go test $(PACKAGES) -v -cover -failfast

internal/services/auth/login.go

@@ -3,19 +3,21 @@ package auth
 import (
 	"context"
 	"database/sql"
+	"errors"
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/google/uuid"
 	"go.uber.org/zap"
+	"golang.org/x/crypto/bcrypt"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"monify/internal/middlewares"
 	monify "monify/protobuf"
 	"time"
 )
 
-func findEmailUser(ctx context.Context, email string, db *sql.DB) (uuid.UUID, error) {
+func matchEmailUser(ctx context.Context, email string, password string, db *sql.DB) (uuid.UUID, error) {
 	query, err := db.QueryContext(ctx, `
-	SELECT user_id 
+	SELECT user_id, password 
 	FROM email_login 
 	WHERE email = $1`, email)
 	defer query.Close()
@@ -28,10 +30,17 @@ func findEmailUser(ctx context.Context, email string, db *sql.DB) (uuid.UUID, er
 	}
 
 	var userId uuid.UUID
-	err = query.Scan(&userId)
+	var hashedPassword string
+	err = query.Scan(&userId, &hashedPassword)
 	if err != nil {
 		return uuid.Nil, err
 	}
+
+	_ = bcrypt.CompareHashAndPassword([]byte(hashedPassword), []byte(password))
+	if err != nil {
+		return uuid.Nil, errors.New("incorrect password")
+	}
+
 	return userId, nil
 }
 
@@ -55,7 +64,7 @@ func (s Service) EmailLogin(ctx context.Context, req *monify.EmailLoginRequest)
 	logger := ctx.Value(middlewares.LoggerContextKey{}).(*zap.Logger)
 	db := ctx.Value(middlewares.StorageContextKey{}).(*sql.DB)
 
-	userId, err := findEmailUser(ctx, req.Email, db)
+	userId, err := matchEmailUser(ctx, req.Email, req.Password, db)
 	if err != nil {
 		logger.Error("", zap.Error(err))
 		return nil, status.Errorf(codes.Internal, "internal err.")

internal/services/auth/register.go

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"github.com/google/uuid"
 	"go.uber.org/zap"
+	"golang.org/x/crypto/bcrypt"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"monify/internal/middlewares"
@@ -24,15 +25,21 @@ func emailExists(ctx context.Context, email string, db *sql.DB) (bool, error) {
 	return rows.Next(), nil
 }
 
-func createUser(ctx context.Context, db *sql.DB, email string) (uuid.UUID, error) {
+func createUser(ctx context.Context, db *sql.DB, email string, password string) (uuid.UUID, error) {
+	hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
+	if err != nil {
+		return [16]byte{}, err
+	}
+
 	userId := uuid.New()
-	_, err := db.ExecContext(ctx, `
+	_, err = db.ExecContext(ctx, `
 		INSERT INTO user_identity (user_id) VALUES ($1)
 	`, userId)
 	if err != nil {
 		return uuid.Nil, err
 	}
-	_, err = db.ExecContext(ctx, `INSERT INTO email_login(email, user_id) VALUES ($1, $2)`, email, userId)
+
+	_, err = db.ExecContext(ctx, `INSERT INTO email_login(email, user_id, password) VALUES ($1, $2, $3)`, email, userId, string(hashedPassword))
 	if err != nil {
 		return uuid.Nil, err
 	}
@@ -51,7 +58,7 @@ func (s Service) EmailRegister(ctx context.Context, req *monify.EmailRegisterReq
 		return nil, status.Error(codes.AlreadyExists, "Email already exists.")
 	}
 
-	userId, err := createUser(ctx, db, req.Email)
+	userId, err := createUser(ctx, db, req.Email, req.Password)
 	if err != nil {
 		logger.Error("failed to create user", zap.Error(err))
 		return nil, status.Error(codes.Internal, "Internal err.")

internal/services/group/list_joined.go

@@ -1 +1,11 @@
 package group
+
+import (
+	"context"
+	monify "monify/protobuf"
+)
+
+func (g Service) ListJoinedGroups(context.Context, *monify.Empty) (*monify.ListJoinedGroupsResponse, error) {
+	panic("")
+
+}

migrations/2405200834_add_password.down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE email_login DROP COLUMN password;
+

migrations/2405200834_add_password.up.sql

@@ -0,0 +1 @@
+ALTER TABLE email_login ADD COLUMN password CHAR(255) NOT NULL;

protobuf/Makefile

@@ -1,4 +1,3 @@
-
 MODULES = $(wildcard *.proto)
 
 OUTPUT = $(MODULES:%.proto=%.pb.go)

protobuf/auth.proto

@@ -10,6 +10,7 @@ service AuthService{
 
 message EmailLoginRequest{
   string email = 1;
+  string password = 2;
 }
 
 
@@ -22,6 +23,7 @@ message EmailLoginResponse{
 
 message EmailRegisterRequest{
   string email = 1;
+  string password = 2;
 }
 
 message EmailRegisterResponse{