summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-06 10:17:04 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-06 10:17:04 -0500
commit51da1b1ca1ff92fcfcdb70c46236f10ee3d20a3f (patch)
treea8d77ba7c6fedbbe63bb8b0da88f19177f44ac51 /api
parent93a684ca1b0030d2c13fb8e157b9db7c0541f513 (diff)
parent7eca077877787b0cd9eb7764f46e9eba78fb7382 (diff)
downloadchat-51da1b1ca1ff92fcfcdb70c46236f10ee3d20a3f.tar.gz
chat-51da1b1ca1ff92fcfcdb70c46236f10ee3d20a3f.tar.bz2
chat-51da1b1ca1ff92fcfcdb70c46236f10ee3d20a3f.zip
Merge pull request #1332 from mattermost/plt-560
PLT-560 Prevent SSO users from changing their email
Diffstat (limited to 'api')
-rw-r--r--api/user.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/user.go b/api/user.go
index c871d7c79..774ceddbf 100644
--- a/api/user.go
+++ b/api/user.go
@@ -114,7 +114,7 @@ func createUser(c *Context, w http.ResponseWriter, r *http.Request) {
sendWelcomeEmail = false
}
- if len(user.AuthData) > 0 && len(user.AuthService) > 0 {
+ if user.IsSSOUser() {
user.EmailVerified = true
}