logging in with either username or email

2 files changed, 21 insertions, 3 deletions

diff --git a/user/service.go b/user/service.go
index 5e0632b..4544cb4 100644
--- a/user/service.go
+++ b/user/service.go
@@ -27,6 +27,25 @@ func (u *User) Create() error {
 	return res.Error
 }
 
+func GetUserWithAccountName(user *User, accountName, method string) error {
+	if method != "username" && method != "email" {
+		return e.ErrInvalidLoginMethod
+	}
+
+	res := db.Where(method + " = ?", accountName).Find(&user)
+
+	// TODO: handle potential errors
+	if res.Error != nil {
+		return res.Error
+	}
+
+	if res.RowsAffected == 0 {
+		return e.ErrNotFound
+	}
+
+	return nil
+}
+
 func GetUser(user *User, id uint) error {
 	res := db.Find(&user, id)
 
diff --git a/user/user.go b/user/user.go
index 68ceb47..ee36e95 100644
--- a/user/user.go
+++ b/user/user.go
@@ -44,9 +44,8 @@ type User struct {
 	IsVerified bool
 }
 
-func CheckPassword(id uint, pass string) error {
-	var user User
-	err := GetUser(&user, id)
+func CheckPassword(user *User, accountName, method, pass string) error {
+	err := GetUserWithAccountName(user, accountName, method)
 	if err != nil {
 		return err
 	}