summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-07-22 11:14:51 -0400
committerJoramWilander <jwawilander@gmail.com>2015-07-22 11:14:51 -0400
commit7635e646a007123f989ba5c5747c4af1ebd27178 (patch)
treecc92a40e74cb38715775ef0ad77721150cddfedd /web
parent62c0603c50c7cc85003fb03ed55d1a585c32dc34 (diff)
downloadchat-7635e646a007123f989ba5c5747c4af1ebd27178.tar.gz
chat-7635e646a007123f989ba5c5747c4af1ebd27178.tar.bz2
chat-7635e646a007123f989ba5c5747c4af1ebd27178.zip
added error message when trying to sign up with gitlab using an email already used in the system
Diffstat (limited to 'web')
-rw-r--r--web/web.go5
1 files changed, 5 insertions, 0 deletions
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")