summaryrefslogtreecommitdiffstats
path: root/api/user.go
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-10-22 10:53:39 -0400
committerJoramWilander <jwawilander@gmail.com>2015-10-22 10:53:39 -0400
commit4734912c521be4367b1d8ca255cc76c0095839b4 (patch)
tree641c4fe0667ddad97cd7ec0a09b4ba3b6441200e /api/user.go
parent2d922fde7e33125b55fd70f713c867db89ebfcf5 (diff)
downloadchat-4734912c521be4367b1d8ca255cc76c0095839b4.tar.gz
chat-4734912c521be4367b1d8ca255cc76c0095839b4.tar.bz2
chat-4734912c521be4367b1d8ca255cc76c0095839b4.zip
Prevent users from resetting their password when the user is using SSO
Diffstat (limited to 'api/user.go')
-rw-r--r--api/user.go10
1 files changed, 10 insertions, 0 deletions
diff --git a/api/user.go b/api/user.go
index 0c7278711..5e5ff79f1 100644
--- a/api/user.go
+++ b/api/user.go
@@ -1241,6 +1241,11 @@ func sendPasswordReset(c *Context, w http.ResponseWriter, r *http.Request) {
user = result.Data.(*model.User)
}
+ if len(user.AuthData) != 0 {
+ c.Err = model.NewAppError("sendPasswordReset", "Cannot reset password for SSO accounts", "userId="+user.Id+", teamId="+team.Id)
+ return
+ }
+
newProps := make(map[string]string)
newProps["user_id"] = user.Id
newProps["time"] = fmt.Sprintf("%v", model.GetMillis())
@@ -1325,6 +1330,11 @@ func resetPassword(c *Context, w http.ResponseWriter, r *http.Request) {
user = result.Data.(*model.User)
}
+ if len(user.AuthData) != 0 {
+ c.Err = model.NewAppError("resetPassword", "Cannot reset password for SSO accounts", "userId="+user.Id+", teamId="+team.Id)
+ return
+ }
+
if user.TeamId != team.Id {
c.Err = model.NewAppError("resetPassword", "Trying to reset password for user on wrong team.", "userId="+user.Id+", teamId="+team.Id)
c.Err.StatusCode = http.StatusForbidden