chore(deps): remove dependencies from handler package

db/auth.go

@@ -13,9 +13,8 @@ import (
 )
 
 var (
-	ErrUserNotFound    = errors.New("User not found")
-	ErrUserExists      = errors.New("User already exists")
-	ErrSessionNotFound = errors.New("Session not found")
+	ErrNotFound   = errors.New("value not found")
+	ErrUserExists = errors.New("user already exists")
 )
 
 type User struct {
@@ -56,20 +55,44 @@ func NewSession(id string, userId uuid.UUID, createdAt time.Time) *Session {
 	}
 }
 
+type Token struct {
+	UserId    uuid.UUID
+	Token     string
+	Type      string
+	CreatedAt time.Time
+	ExpiresAt time.Time
+}
+
+func NewToken(userId uuid.UUID, token string, tokenType string, createdAt time.Time, expiresAt time.Time) *Token {
+	return &Token{
+		UserId:    userId,
+		Token:     token,
+		Type:      tokenType,
+		CreatedAt: createdAt,
+		ExpiresAt: expiresAt,
+	}
+}
+
 type AuthDb interface {
 	InsertUser(user *User) error
+	UpdateUser(user *User) error
 	GetUser(email string) (*User, error)
 	GetUserById(userId uuid.UUID) (*User, error)
 	DeleteUser(userId uuid.UUID) error
 	UpdateUserPassword(userId uuid.UUID, newHash []byte) error
 
 	InsertEmailVerificationToken(userId uuid.UUID, token string) error
+	InsertForgotPasswordToken(email string, token string) error
 	GetEmailVerificationToken(userId uuid.UUID) (string, error)
+	GetToken(token string) (*Token, error)
+	DeleteToken(token string) error
+
+	VerifyEmail(token string) error
 
 	InsertSession(session *Session) error
 	GetSession(sessionId string) (*Session, error)
-	DeleteOldSessions(userId uuid.UUID) error
 	DeleteSession(sessionId string) error
+	DeleteOldSessions(userId uuid.UUID) error
 }
 
 type AuthDbSqlite struct {
@@ -98,6 +121,21 @@ func (db AuthDbSqlite) InsertUser(user *User) error {
 	return nil
 }
 
+func (db AuthDbSqlite) UpdateUser(user *User) error {
+	_, err := db.db.Exec(`
+		UPDATE user 
+		SET email_verified = ?, email_verified_at = ?, password = ?
+		WHERE user_uuid = ?`,
+		user.EmailVerified, user.EmailVerifiedAt, user.Password, user.Id)
+
+	if err != nil {
+		utils.LogError("SQL error UpdateUser", err)
+		return types.ErrInternal
+	}
+
+	return nil
+}
+
 func (db AuthDbSqlite) GetUser(email string) (*User, error) {
 	var (
 		userId          uuid.UUID
@@ -115,7 +153,7 @@ func (db AuthDbSqlite) GetUser(email string) (*User, error) {
 		WHERE email = ?`, email).Scan(&userId, &emailVerified, &emailVerifiedAt, &password, &salt, &createdAt)
 	if err != nil {
 		if err == sql.ErrNoRows {
-			return nil, ErrUserNotFound
+			return nil, ErrNotFound
 		} else {
 			utils.LogError("SQL error GetUser", err)
 			return nil, types.ErrInternal
@@ -142,7 +180,7 @@ func (db AuthDbSqlite) GetUserById(userId uuid.UUID) (*User, error) {
 		WHERE user_uuid = ?`, userId).Scan(&email, &emailVerified, &emailVerifiedAt, &password, &salt, &createdAt)
 	if err != nil {
 		if err == sql.ErrNoRows {
-			return nil, ErrUserNotFound
+			return nil, ErrNotFound
 		} else {
 			utils.LogError("SQL error GetUser", err)
 			return nil, types.ErrInternal
@@ -236,6 +274,51 @@ func (db AuthDbSqlite) GetEmailVerificationToken(userId uuid.UUID) (string, erro
 	return token, nil
 }
 
+func (db AuthDbSqlite) GetToken(token string) (*Token, error) {
+	var (
+		userId       uuid.UUID
+		tokenType    string
+		createdAtStr string
+		expiresAtStr string
+		createdAt    time.Time
+		expiresAt    time.Time
+	)
+
+	err := db.db.QueryRow(`
+		SELECT user_uuid, type, created_at, expires_at 
+		FROM user_token 
+		WHERE token = ? 
+		AND type = 'email_verify'`, token).Scan(&userId, &tokenType, &createdAtStr, &expiresAtStr)
+
+	if err != nil && err != sql.ErrNoRows {
+		utils.LogError("Could not get token", err)
+		return nil, types.ErrInternal
+	}
+
+	createdAt, err = time.Parse(time.RFC3339, createdAtStr)
+	if err != nil {
+		utils.LogError("Could not parse token.created_at", err)
+		return nil, types.ErrInternal
+	}
+
+	expiresAt, err = time.Parse(time.RFC3339, expiresAtStr)
+	if err != nil {
+		utils.LogError("Could not parse token.expires_at", err)
+		return nil, types.ErrInternal
+	}
+
+	return NewToken(userId, token, tokenType, createdAt, expiresAt), nil
+}
+
+func (db AuthDbSqlite) DeleteToken(token string) error {
+	_, err := db.db.Exec("DELETE FROM user_token WHERE token = ?", token)
+	if err != nil {
+		utils.LogError("Could not delete token", err)
+		return types.ErrInternal
+	}
+	return nil
+}
+
 func (db AuthDbSqlite) InsertSession(session *Session) error {
 
 	_, err := db.db.Exec(`
@@ -264,7 +347,7 @@ func (db AuthDbSqlite) GetSession(sessionId string) (*Session, error) {
 			WHERE session_id = ?`, sessionId).Scan(&userId, &sessionCreatedAt)
 
 	if err != nil {
-		return nil, ErrSessionNotFound
+		return nil, ErrNotFound
 	}
 
 	return NewSession(sessionId, userId, sessionCreatedAt), nil
@@ -292,3 +375,61 @@ func (db AuthDbSqlite) DeleteSession(sessionId string) error {
 
 	return nil
 }
+
+func (db AuthDbSqlite) VerifyEmail(token string) error {
+
+	result, err := db.db.Exec(`
+		UPDATE user
+		SET email_verified = true, email_verified_at = datetime()
+		WHERE user_uuid = (
+			SELECT user_uuid
+			FROM user_token
+			WHERE type = "email_verify"
+			AND token = ?
+		);
+	`, token)
+
+	if err != nil {
+		utils.LogError("Could not update user on verify response", err)
+		return types.ErrInternal
+	}
+
+	i, err := result.RowsAffected()
+	if err != nil {
+		utils.LogError("Could not get rows affected on verify response", err)
+		return types.ErrInternal
+	}
+
+	if i == 0 {
+		return types.ErrInternal
+	}
+
+	return nil
+}
+
+func (db AuthDbSqlite) InsertForgotPasswordToken(email string, token string) error {
+
+	res, err := db.db.Exec(`
+		INSERT INTO user_token (user_uuid, type, token, created_at, expires_at)
+		SELECT user_uuid, 'password_reset', ?, datetime(), datetime('now', '+15 minute')
+		FROM user
+		WHERE email = ?
+		`, token, email)
+
+	if err != nil {
+		utils.LogError("Could not insert token", err)
+		return types.ErrInternal
+	}
+
+	i, err := res.RowsAffected()
+	if err != nil {
+		utils.LogError("Could not get rows affected", err)
+		return types.ErrInternal
+	}
+
+	if i == 0 {
+		return ErrNotFound
+	}
+
+	return nil
+}

db/auth_test.go

@@ -38,7 +38,7 @@ func TestUser(t *testing.T) {
 		underTest := AuthDbSqlite{db: db}
 
 		_, err := underTest.GetUser("someNonExistentEmail")
-		assert.Equal(t, ErrUserNotFound, err)
+		assert.Equal(t, ErrNotFound, err)
 	})
 
 	t.Run("should insert and get user", func(t *testing.T) {