Fix test

go-gitea · Mar 14, 2022 · b523619 · b523619
1 parent 3048360
commit b523619
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go
@@ -119,6 +119,7 @@ func CreateUser(ctx *context.APIContext) {
  user_model.IsErrEmailAlreadyUsed(err) ||
  db.IsErrNameReserved(err) ||
  db.IsErrNameCharsNotAllowed(err) ||
+ user_model.IsErrEmailCharIsNotSupported(err) ||
  user_model.IsErrEmailInvalid(err) ||
  db.IsErrNamePatternNotAllowed(err) {
  ctx.Error(http.StatusUnprocessableEntity, "", err)
@@ -265,7 +266,9 @@ func EditUser(ctx *context.APIContext) {
  }
 
  if err := user_model.UpdateUser(u, emailChanged); err != nil {
- if user_model.IsErrEmailAlreadyUsed(err) || user_model.IsErrEmailInvalid(err) {
+ if user_model.IsErrEmailAlreadyUsed(err) ||
+ user_model.IsErrEmailCharIsNotSupported(err) ||
+ user_model.IsErrEmailInvalid(err) {
  ctx.Error(http.StatusUnprocessableEntity, "", err)
  } else {
  ctx.Error(http.StatusInternalServerError, "UpdateUser", err)

diff --git a/routers/api/v1/user/email.go b/routers/api/v1/user/email.go
@@ -80,7 +80,8 @@ func AddEmail(ctx *context.APIContext) {
  if err := user_model.AddEmailAddresses(emails); err != nil {
  if user_model.IsErrEmailAlreadyUsed(err) {
  ctx.Error(http.StatusUnprocessableEntity, "", "Email address has been used: "+err.(user_model.ErrEmailAlreadyUsed).Email)
- } else if user_model.IsErrEmailInvalid(err) {
+ } else if user_model.IsErrEmailCharIsNotSupported(err) ||
+ user_model.IsErrEmailInvalid(err) {
  errMsg := fmt.Sprintf("Email address %s invalid", err.(user_model.ErrEmailInvalid).Email)
  ctx.Error(http.StatusUnprocessableEntity, "", errMsg)
  } else {

diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go
@@ -389,7 +389,8 @@ func EditUserPost(ctx *context.Context) {
  if user_model.IsErrEmailAlreadyUsed(err) {
  ctx.Data["Err_Email"] = true
  ctx.RenderWithErr(ctx.Tr("form.email_been_used"), tplUserEdit, &form)
- } else if user_model.IsErrEmailInvalid(err) {
+ } else if user_model.IsErrEmailCharIsNotSupported(err) ||
+ user_model.IsErrEmailInvalid(err) {
  ctx.Data["Err_Email"] = true
  ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tplUserEdit, &form)
  } else {

diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go
@@ -573,6 +573,9 @@ func createUserInContext(ctx *context.Context, tpl base.TplName, form interface{
  case user_model.IsErrEmailAlreadyUsed(err):
  ctx.Data["Err_Email"] = true
  ctx.RenderWithErr(ctx.Tr("form.email_been_used"), tpl, form)
+ case user_model.IsErrEmailCharIsNotSupported(err):
+ ctx.Data["Err_Email"] = true
+ ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tpl, form)
  case user_model.IsErrEmailInvalid(err):
  ctx.Data["Err_Email"] = true
  ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tpl, form)

diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go
@@ -188,7 +188,8 @@ func EmailPost(ctx *context.Context) {
 
  ctx.RenderWithErr(ctx.Tr("form.email_been_used"), tplSettingsAccount, &form)
  return
- } else if user_model.IsErrEmailInvalid(err) {
+ } else if user_model.IsErrEmailCharIsNotSupported(err) ||
+ user_model.IsErrEmailInvalid(err) {
  loadAccountData(ctx)
 
  ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tplSettingsAccount, &form)