3
0
mirror of https://github.com/ergochat/ergo.git synced 2024-12-23 11:12:44 +01:00

Merge pull request #1819 from slingamn/password_message

fix error message for NS SET EMAIL without the password
This commit is contained in:
Shivaram Lingamneni 2021-11-08 03:20:45 -05:00 committed by GitHub
commit 4a3ac617a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1130,8 +1130,12 @@ func nsConfirmPassword(server *Server, account, passphrase string) (errorMessage
errorMessage = `You're not logged into an account`
} else {
hash := accountData.Credentials.PassphraseHash
if hash != nil && passwd.CompareHashAndPassword(hash, []byte(passphrase)) != nil {
errorMessage = `Password incorrect`
if hash != nil {
if passphrase == "" {
errorMessage = `You must supply a password`
} else if passwd.CompareHashAndPassword(hash, []byte(passphrase)) != nil {
errorMessage = `Password incorrect`
}
}
}
return