GODT-1503 GODT-1492: Improve email validation and username in bug report.

This commit is contained in:
Jakub
2022-02-16 11:38:06 +01:00
parent 61e4ca5814
commit aa8cc3fc4b
3 changed files with 8 additions and 2 deletions

View File

@ -39,6 +39,12 @@ var ErrSizeTooLarge = errors.New("file is too big")
// ReportBug reports a new bug from the user.
func (b *Bridge) ReportBug(osType, osVersion, description, accountName, address, emailClient string, attachLogs bool) error {
if user, err := b.GetUser(address); err == nil {
accountName = user.Username()
} else if users := b.GetUsers(); len(users) > 0 {
accountName = users[0].Username()
}
report := pmapi.ReportBugReq{
OS: osType,
OSVersion: osVersion,

View File

@ -181,7 +181,7 @@ SettingsView {
}
function isValidEmail(text){
var reEmail = /\w+@\w+\.\w+/
var reEmail = /^[^@]+@[^@]+\.[A-Za-z]+\s*$/
return reEmail.test(text)
}

View File

@ -53,7 +53,7 @@ func (f *FrontendQt) reportBug(description, address, emailClient string, include
core.QSysInfo_ProductType(),
core.QSysInfo_PrettyProductName(),
description,
"Unknown account",
address,
address,
emailClient,
includeLogs,