diff options
| author | Chris Shyi <chrisshyi13@gmail.com> | 2020-11-14 17:53:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-14 17:53:43 +0100 |
| commit | d025d84d91a43a691d748323cd74d0fdc5ecc9bf (patch) | |
| tree | 37b2954066d4a3bce3eb4e79598bc37e14d3e8ea /routers/api | |
| parent | [API] Only Return Json (#13511) (diff) | |
| download | forgejo-d025d84d91a43a691d748323cd74d0fdc5ecc9bf.tar.xz forgejo-d025d84d91a43a691d748323cd74d0fdc5ecc9bf.zip | |
Add email validity check (#13475)
* Improve error feedback for duplicate deploy keys
Instead of a generic HTTP 500 error page, a flash message is rendered
with the deploy key page template so inform the user that a key with the
intended title already exists.
* API returns 422 error when key with name exists
* Add email validity checking
Add email validity checking for the following routes:
[Web interface]
1. User registration
2. User creation by admin
3. Adding an email through user settings
[API]
1. POST /admin/users
2. PATCH /admin/users/:username
3. POST /user/emails
* Add further tests
* Add signup email tests
* Add email validity check for linking existing account
* Address PR comments
* Remove unneeded DB session
* Move email check to updateUser
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'routers/api')
| -rw-r--r-- | routers/api/v1/admin/user.go | 3 | ||||
| -rw-r--r-- | routers/api/v1/user/email.go | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index dc095f3a13..c4b52e4bd6 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -101,6 +101,7 @@ func CreateUser(ctx *context.APIContext, form api.CreateUserOption) { models.IsErrEmailAlreadyUsed(err) || models.IsErrNameReserved(err) || models.IsErrNameCharsNotAllowed(err) || + models.IsErrEmailInvalid(err) || models.IsErrNamePatternNotAllowed(err) { ctx.Error(http.StatusUnprocessableEntity, "", err) } else { @@ -208,7 +209,7 @@ func EditUser(ctx *context.APIContext, form api.EditUserOption) { } if err := models.UpdateUser(u); err != nil { - if models.IsErrEmailAlreadyUsed(err) { + if models.IsErrEmailAlreadyUsed(err) || models.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 index 07fcde625e..d848f5e58d 100644 --- a/routers/api/v1/user/email.go +++ b/routers/api/v1/user/email.go @@ -5,6 +5,7 @@ package user import ( + "fmt" "net/http" "code.gitea.io/gitea/models" @@ -78,6 +79,9 @@ func AddEmail(ctx *context.APIContext, form api.CreateEmailOption) { if err := models.AddEmailAddresses(emails); err != nil { if models.IsErrEmailAlreadyUsed(err) { ctx.Error(http.StatusUnprocessableEntity, "", "Email address has been used: "+err.(models.ErrEmailAlreadyUsed).Email) + } else if models.IsErrEmailInvalid(err) { + errMsg := fmt.Sprintf("Email address %s invalid", err.(models.ErrEmailInvalid).Email) + ctx.Error(http.StatusUnprocessableEntity, "", errMsg) } else { ctx.Error(http.StatusInternalServerError, "AddEmailAddresses", err) } |