fix: migrate sigin to testable code #181
This commit is contained in:
52
db/auth.go
52
db/auth.go
@@ -6,6 +6,7 @@ import (
|
||||
|
||||
"database/sql"
|
||||
"errors"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
@@ -13,6 +14,7 @@ import (
|
||||
|
||||
var (
|
||||
ErrUserNotFound = errors.New("User not found")
|
||||
ErrUserExists = errors.New("User already exists")
|
||||
)
|
||||
|
||||
type User struct {
|
||||
@@ -41,6 +43,10 @@ func NewUser(id uuid.UUID, email string, emailVerified bool, emailVerifiedAt *ti
|
||||
|
||||
type DbAuth interface {
|
||||
GetUser(email string) (*User, error)
|
||||
InsertUser(user *User) error
|
||||
|
||||
GetEmailVerificationToken(userId uuid.UUID) (string, error)
|
||||
InsertEmailVerificationToken(userId uuid.UUID, token string) error
|
||||
}
|
||||
|
||||
type DbAuthSqlite struct {
|
||||
@@ -77,3 +83,49 @@ func (db DbAuthSqlite) GetUser(email string) (*User, error) {
|
||||
|
||||
return NewUser(userId, email, emailVerified, emailVerifiedAt, isAdmin, password, salt, createdAt), nil
|
||||
}
|
||||
func (db DbAuthSqlite) InsertUser(user *User) error {
|
||||
_, err := db.db.Exec(`
|
||||
INSERT INTO user (user_uuid, email, email_verified, email_verified_at, is_admin, password, salt, created_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
|
||||
user.Id, user.Email, user.EmailVerified, user.EmailVerifiedAt, user.IsAdmin, user.Password, user.Salt, user.CreateAt)
|
||||
|
||||
if err != nil {
|
||||
if strings.Contains(err.Error(), "email") {
|
||||
return ErrUserExists
|
||||
}
|
||||
|
||||
utils.LogError("SQL error InsertUser", err)
|
||||
return types.ErrInternal
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (db DbAuthSqlite) GetEmailVerificationToken(userId uuid.UUID) (string, error) {
|
||||
var token string
|
||||
|
||||
err := db.db.QueryRow(`
|
||||
SELECT token
|
||||
FROM user_token
|
||||
WHERE user_uuid = ?
|
||||
AND type = 'email_verify'`, userId).Scan(&token)
|
||||
|
||||
if err != nil && err != sql.ErrNoRows {
|
||||
utils.LogError("Could not get token", err)
|
||||
return "", types.ErrInternal
|
||||
}
|
||||
|
||||
return token, nil
|
||||
}
|
||||
func (db DbAuthSqlite) InsertEmailVerificationToken(userId uuid.UUID, token string) error {
|
||||
_, err := db.db.Exec(`
|
||||
INSERT INTO user_token (user_uuid, type, token, created_at)
|
||||
VALUES (?, 'email_verify', ?, datetime())`, userId, token)
|
||||
|
||||
if err != nil {
|
||||
utils.LogError("Could not insert token", err)
|
||||
return types.ErrInternal
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"me-fit/utils"
|
||||
|
||||
"database/sql"
|
||||
"errors"
|
||||
"reflect"
|
||||
"testing"
|
||||
"time"
|
||||
@@ -16,6 +17,9 @@ func setupDb(t *testing.T) *sql.DB {
|
||||
if err != nil {
|
||||
t.Fatalf("Error opening database: %v", err)
|
||||
}
|
||||
t.Cleanup(func() {
|
||||
db.Close()
|
||||
})
|
||||
|
||||
err = utils.RunMigrations(db, "../")
|
||||
if err != nil {
|
||||
@@ -31,7 +35,6 @@ func TestGetUser(t *testing.T) {
|
||||
t.Run("should return UserNotFound", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
db := setupDb(t)
|
||||
defer db.Close()
|
||||
|
||||
underTest := DbAuthSqlite{db: db}
|
||||
|
||||
@@ -44,7 +47,6 @@ func TestGetUser(t *testing.T) {
|
||||
t.Run("should find user in database", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
db := setupDb(t)
|
||||
defer db.Close()
|
||||
|
||||
underTest := DbAuthSqlite{db: db}
|
||||
|
||||
@@ -69,5 +71,53 @@ func TestGetUser(t *testing.T) {
|
||||
t.Errorf("Expected %v, got %v", user, actual)
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
func TestInsertUser(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
t.Run("should insert user", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
db := setupDb(t)
|
||||
|
||||
underTest := DbAuthSqlite{db: db}
|
||||
|
||||
verifiedAt := time.Date(2020, 1, 5, 13, 0, 0, 0, time.UTC)
|
||||
createAt := time.Date(2020, 1, 5, 12, 0, 0, 0, time.UTC)
|
||||
user := NewUser(uuid.New(), "some@email.de", true, &verifiedAt, false, []byte("somePass"), []byte("someSalt"), createAt)
|
||||
|
||||
err := underTest.InsertUser(user)
|
||||
if err != nil {
|
||||
t.Fatalf("Error inserting user: %v", err)
|
||||
}
|
||||
|
||||
actual, err := underTest.GetUser(user.Email)
|
||||
if err != nil {
|
||||
t.Fatalf("Error getting user: %v", err)
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(user, actual) {
|
||||
t.Errorf("Expected %v, got %v", user, actual)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("should throw error if user already exists", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
db := setupDb(t)
|
||||
|
||||
underTest := DbAuthSqlite{db: db}
|
||||
|
||||
verifiedAt := time.Date(2020, 1, 5, 13, 0, 0, 0, time.UTC)
|
||||
createAt := time.Date(2020, 1, 5, 12, 0, 0, 0, time.UTC)
|
||||
user := NewUser(uuid.New(), "some@email.de", true, &verifiedAt, false, []byte("somePass"), []byte("someSalt"), createAt)
|
||||
|
||||
err := underTest.InsertUser(user)
|
||||
if err != nil {
|
||||
t.Fatalf("Error inserting user: %v", err)
|
||||
}
|
||||
|
||||
err = underTest.InsertUser(user)
|
||||
if !errors.Is(err, ErrUserExists) {
|
||||
t.Fatalf("Error inserting user: %v", err)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user