web/forgejo
10
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-06-03 17:04:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Add login by email

Browse source
This commit is contained in:
Unknown 2014-04-27 01:54:08 -06:00
parent ce05a8d7b6
commit 62240b6bc1
4 changed files with 14 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

18
models/user.go
View file

@ -410,21 +410,27 @@ func GetUserByEmail(email string) (*User, error) {
}
// LoginUserPlain validates user by raw user name and password.
func LoginUserPlain(name, passwd string) (*User, error) {
user := User{LowerName: strings.ToLower(name)}
has, err := orm.Get(&user)
func LoginUserPlain(uname, passwd string) (*User, error) {
var u *User
if strings.Contains(uname, "@") {
u = &User{Email: uname}
} else {
u = &User{LowerName: strings.ToLower(uname)}
}
has, err := orm.Get(u)
if err != nil {
return nil, err
} else if !has {
return nil, ErrUserNotExist
}
newUser := &User{Passwd: passwd, Salt: user.Salt}
newUser := &User{Passwd: passwd, Salt: u.Salt}
newUser.EncodePasswd()
if user.Passwd != newUser.Passwd {
if u.Passwd != newUser.Passwd {
return nil, ErrUserNotExist
}
return &user, nil
return u, nil
}
// Follow is connection request for receiving user notifycation.