diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-05-05 16:36:42 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-05 16:36:42 -0400 |
| commit | f2e788f4b12517759e016a9f48633597bed82e8f (patch) | |
| tree | b1881587688460d4f122f012e4f6e0356857f902 /api/user.go | |
| parent | d2ddf40f56191c1770c3ca93d747a7f1b749f26c (diff) | |
| download | chat-f2e788f4b12517759e016a9f48633597bed82e8f.tar.gz chat-f2e788f4b12517759e016a9f48633597bed82e8f.tar.bz2 chat-f2e788f4b12517759e016a9f48633597bed82e8f.zip | |
Allow system admins to switch user accounts to email/password (#2893)
Diffstat (limited to 'api/user.go')
| -rw-r--r-- | api/user.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/user.go b/api/user.go index f7d3eb1d3..1331bd3da 100644 --- a/api/user.go +++ b/api/user.go @@ -1702,7 +1702,7 @@ func ResetPassword(c *Context, userId, newPassword string) *model.AppError { user = result.Data.(*model.User) } - if len(user.AuthData) != 0 { + if len(user.AuthData) != 0 && !c.IsSystemAdmin() { return model.NewLocAppError("ResetPassword", "api.user.reset_password.sso.app_error", nil, "userId="+user.Id) } |