diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-04-26 08:40:47 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-04-26 08:40:47 -0400 |
commit | c2fc28aa1007ff3f7b055fc54bbc058560e50ee1 (patch) | |
tree | d364b2864c43a3fded7171a87feca43114340f37 | |
parent | 80d7debf1a992caf881c939ace66b5632eba1cf6 (diff) | |
download | chat-c2fc28aa1007ff3f7b055fc54bbc058560e50ee1.tar.gz chat-c2fc28aa1007ff3f7b055fc54bbc058560e50ee1.tar.bz2 chat-c2fc28aa1007ff3f7b055fc54bbc058560e50ee1.zip |
Fix deactivating MFA on user accounts (#2797)
-rw-r--r-- | api/user.go | 3 | ||||
-rw-r--r-- | webapp/components/user_settings/user_settings_security.jsx | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/api/user.go b/api/user.go index 16ba45dc4..b905fb639 100644 --- a/api/user.go +++ b/api/user.go @@ -2277,6 +2277,9 @@ func generateMfaQrCode(c *Context, w http.ResponseWriter, r *http.Request) { } w.Header().Del("Content-Type") // Content-Type will be set automatically by the http writer + w.Header().Set("Cache-Control", "no-cache") + w.Header().Set("Pragma", "no-cache") + w.Header().Set("Expires", "0") w.Write(img) } diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx index f28e34197..55a0a0e9a 100644 --- a/webapp/components/user_settings/user_settings_security.jsx +++ b/webapp/components/user_settings/user_settings_security.jsx @@ -139,10 +139,9 @@ class SecurityTab extends React.Component { ); } deactivateMfa() { - const data = {}; - data.activate = false; - - Client.updateMfa(data, + Client.updateMfa( + '', + false, () => { this.props.updateSection(''); AsyncClient.getMe(); |