diff options
| author | Chris Shyi <chrisshyi13@gmail.com> | 2020-11-15 00:53:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-14 11:53:43 -0500 |
| commit | d025d84d91a43a691d748323cd74d0fdc5ecc9bf (patch) | |
| tree | 37b2954066d4a3bce3eb4e79598bc37e14d3e8ea /routers/user | |
| parent | 7d2700c8be5da8f2073a576dae209ae07ac6ed22 (diff) | |
| download | gitea-d025d84d91a43a691d748323cd74d0fdc5ecc9bf.tar.gz gitea-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/user')
| -rw-r--r-- | routers/user/auth.go | 6 | ||||
| -rw-r--r-- | routers/user/setting/account.go | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/routers/user/auth.go b/routers/user/auth.go index 32b031fc74..ba6420967f 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -964,6 +964,9 @@ func LinkAccountPostRegister(ctx *context.Context, cpt *captcha.Captcha, form au case models.IsErrEmailAlreadyUsed(err): ctx.Data["Err_Email"] = true ctx.RenderWithErr(ctx.Tr("form.email_been_used"), tplLinkAccount, &form) + case models.IsErrEmailInvalid(err): + ctx.Data["Err_Email"] = true + ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tplSignUp, &form) case models.IsErrNameReserved(err): ctx.Data["Err_UserName"] = true ctx.RenderWithErr(ctx.Tr("user.form.name_reserved", err.(models.ErrNameReserved).Name), tplLinkAccount, &form) @@ -1151,6 +1154,9 @@ func SignUpPost(ctx *context.Context, cpt *captcha.Captcha, form auth.RegisterFo case models.IsErrEmailAlreadyUsed(err): ctx.Data["Err_Email"] = true ctx.RenderWithErr(ctx.Tr("form.email_been_used"), tplSignUp, &form) + case models.IsErrEmailInvalid(err): + ctx.Data["Err_Email"] = true + ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tplSignUp, &form) case models.IsErrNameReserved(err): ctx.Data["Err_UserName"] = true ctx.RenderWithErr(ctx.Tr("user.form.name_reserved", err.(models.ErrNameReserved).Name), tplSignUp, &form) diff --git a/routers/user/setting/account.go b/routers/user/setting/account.go index 99e20177bc..9b72e2a31a 100644 --- a/routers/user/setting/account.go +++ b/routers/user/setting/account.go @@ -179,6 +179,11 @@ func EmailPost(ctx *context.Context, form auth.AddEmailForm) { ctx.RenderWithErr(ctx.Tr("form.email_been_used"), tplSettingsAccount, &form) return + } else if models.IsErrEmailInvalid(err) { + loadAccountData(ctx) + + ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tplSettingsAccount, &form) + return } ctx.ServerError("AddEmailAddress", err) return |