xinyin025/new-api
1
0
Fork 0
mirror of https://github.com/linux-do/new-api.git synced 2025-09-19 00:46:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
CalciumIon 2024-07-08 16:28:56 +08:00
parent e062cf32e3
commit 45b9de9df9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
model/user.go
View File

@ -295,10 +295,15 @@ func (user *User) ValidateAndFill() (err error) {
// that means if your field’s value is 0, '', false or other zero values, // that means if your field’s value is 0, '', false or other zero values,
// it won’t be used to build query conditions // it won’t be used to build query conditions
password := user.Password password := user.Password
if user.Username == "" || password == "" { if (user.Username == "" && user.Email == "") || password == "" {
return errors.New("用户名或密码为空") return errors.New("用户名或密码为空")
} }
DB.Where(User{Username: user.Username}).First(user) // 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) okay := common.ValidatePasswordAndHash(password, user.Password)
if !okay || user.Status != common.UserStatusEnabled { if !okay || user.Status != common.UserStatusEnabled {
return errors.New("用户名或密码错误，或用户已被封禁") return errors.New("用户名或密码错误，或用户已被封禁")