femsci/forgejo
femsci/forgejo
1
0
Fork 0
forked from NYANDEV/forgejo
Code Pull requests Activity

fix bug when user login and want to resend register confirmation email (#6482) (#6486)

Browse source
This commit is contained in:
Lauris BH 2019-04-02 11:36:56 +03:00 committed by zeripath
parent 3725eefb7f
commit 3b28de7d8e
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
models/login_source.go
View file

@ -616,9 +616,9 @@ func ExternalUserLogin(user *User, login, password string, source *LoginSource,
return nil, err return nil, err
} }
if !user.IsActive { // WARN: DON'T check user.IsActive, that will be checked on reqSign so that
return nil, ErrUserInactive{user.ID, user.Name} // user could be hint to resend confirm email.
} else if user.ProhibitLogin { if user.ProhibitLogin {
return nil, ErrUserProhibitLogin{user.ID, user.Name} return nil, ErrUserProhibitLogin{user.ID, user.Name}
} }
@ -658,9 +658,9 @@ func UserSignIn(username, password string) (*User, error) {
switch user.LoginType { switch user.LoginType {
case LoginNoType, LoginPlain, LoginOAuth2: case LoginNoType, LoginPlain, LoginOAuth2:
if user.IsPasswordSet() && user.ValidatePassword(password) { if user.IsPasswordSet() && user.ValidatePassword(password) {
if !user.IsActive { // WARN: DON'T check user.IsActive, that will be checked on reqSign so that
return nil, ErrUserInactive{user.ID, user.Name} // user could be hint to resend confirm email.
} else if user.ProhibitLogin { if user.ProhibitLogin {
return nil, ErrUserProhibitLogin{user.ID, user.Name} return nil, ErrUserProhibitLogin{user.ID, user.Name}
} }

2
routers/routes/routes.go
View file

@ -339,7 +339,7 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Group("/user", func() { m.Group("/user", func() {
// r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds) // r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds)
m.Any("/activate", user.Activate) m.Any("/activate", user.Activate, reqSignIn)
m.Any("/activate_email", user.ActivateEmail) m.Any("/activate_email", user.ActivateEmail)
m.Get("/email2user", user.Email2User) m.Get("/email2user", user.Email2User)
m.Get("/forgot_password", user.ForgotPasswd) m.Get("/forgot_password", user.ForgotPasswd)