feat: able to use email to login (close #343,#348)

This commit is contained in:
CalciumIon 2024-07-08 16:28:56 +08:00
parent e062cf32e3
commit 45b9de9df9

View File

@ -295,10 +295,15 @@ func (user *User) ValidateAndFill() (err error) {
// that means if your fields value is 0, '', false or other zero values,
// it wont be used to build query conditions
password := user.Password
if user.Username == "" || password == "" {
if (user.Username == "" && user.Email == "") || password == "" {
return errors.New("用户名或密码为空")
}
// find buy username or email
if user.Username != "" {
DB.Where(User{Username: user.Username}).First(user)
} else if user.Email != "" {
DB.Where(User{Email: user.Email}).First(user)
}
okay := common.ValidatePasswordAndHash(password, user.Password)
if !okay || user.Status != common.UserStatusEnabled {
return errors.New("用户名或密码错误,或用户已被封禁")