mirror of
https://github.com/go-gitea/gitea
synced 2024-08-18 21:31:02 +02:00
fix bug when user login and want to resend register confirmation email (#6482)
This commit is contained in:
parent
b04a1d9d63
commit
ef2a343e27
@ -616,9 +616,9 @@ func ExternalUserLogin(user *User, login, password string, source *LoginSource,
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if !user.IsActive {
|
||||
return nil, ErrUserInactive{user.ID, user.Name}
|
||||
} else if user.ProhibitLogin {
|
||||
// WARN: DON'T check user.IsActive, that will be checked on reqSign so that
|
||||
// user could be hint to resend confirm email.
|
||||
if user.ProhibitLogin {
|
||||
return nil, ErrUserProhibitLogin{user.ID, user.Name}
|
||||
}
|
||||
|
||||
@ -658,9 +658,9 @@ func UserSignIn(username, password string) (*User, error) {
|
||||
switch user.LoginType {
|
||||
case LoginNoType, LoginPlain, LoginOAuth2:
|
||||
if user.IsPasswordSet() && user.ValidatePassword(password) {
|
||||
if !user.IsActive {
|
||||
return nil, ErrUserInactive{user.ID, user.Name}
|
||||
} else if user.ProhibitLogin {
|
||||
// WARN: DON'T check user.IsActive, that will be checked on reqSign so that
|
||||
// user could be hint to resend confirm email.
|
||||
if user.ProhibitLogin {
|
||||
return nil, ErrUserProhibitLogin{user.ID, user.Name}
|
||||
}
|
||||
|
||||
|
@ -339,7 +339,7 @@ func RegisterRoutes(m *macaron.Macaron) {
|
||||
|
||||
m.Group("/user", func() {
|
||||
// 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.Get("/email2user", user.Email2User)
|
||||
m.Get("/forgot_password", user.ForgotPasswd)
|
||||
|
Loading…
Reference in New Issue
Block a user