From 7635e646a007123f989ba5c5747c4af1ebd27178 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Wed, 22 Jul 2015 11:14:51 -0400 Subject: added error message when trying to sign up with gitlab using an email already used in the system --- web/web.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/web.go b/web/web.go index b0b926cd8..15c978ff1 100644 --- a/web/web.go +++ b/web/web.go @@ -499,6 +499,11 @@ func signupCompleteOAuth(c *api.Context, w http.ResponseWriter, r *http.Request) return } + if result := <-api.Srv.Store.User().GetByEmail(team.Id, user.Email); result.Err == nil { + c.Err = model.NewAppError("signupCompleteOAuth", "Team "+team.DisplayName+" already has a user with the email address attached to your "+service+" account", "email="+user.Email) + return + } + user.TeamId = team.Id page := NewHtmlTemplatePage("signup_user_oauth", "Complete User Sign Up") -- cgit v1.2.3-1-g7c22