diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-11-03 10:41:11 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-11-03 10:41:11 -0400 |
commit | 0234f793f29a90572d2288b7b22b75cd5ab83648 (patch) | |
tree | 76f67d1be0756c9186973f4db27a77643efcdfeb /model | |
parent | 5b34ac6e1e4d24f51c754926305149b7986f38c4 (diff) | |
download | chat-0234f793f29a90572d2288b7b22b75cd5ab83648.tar.gz chat-0234f793f29a90572d2288b7b22b75cd5ab83648.tar.bz2 chat-0234f793f29a90572d2288b7b22b75cd5ab83648.zip |
EE: PLT-4512 Show secret in addition to QR code when activating MFA (#4427)
* EE: Update MFA to display secret for manual entry
* Width adjustments for secret (#4423)
* Add unit test
Diffstat (limited to 'model')
-rw-r--r-- | model/client.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/model/client.go b/model/client.go index 02c6ac9b2..8a361c177 100644 --- a/model/client.go +++ b/model/client.go @@ -696,15 +696,16 @@ func (c *Client) CheckMfa(loginId string) (*Result, *AppError) { } } -// GenerateMfaQrCode returns a QR code imagem containing the secret, to be scanned -// by a multi-factor authentication mobile application. Must be authenticated. -func (c *Client) GenerateMfaQrCode() (*Result, *AppError) { - if r, err := c.DoApiGet("/users/generate_mfa_qr", "", ""); err != nil { +// GenerateMfaSecret returns a QR code image containing the secret, to be scanned +// by a multi-factor authentication mobile application. It also returns the secret +// for manual entry. Must be authenticated. +func (c *Client) GenerateMfaSecret() (*Result, *AppError) { + if r, err := c.DoApiGet("/users/generate_mfa_secret", "", ""); err != nil { return nil, err } else { defer closeBody(r) return &Result{r.Header.Get(HEADER_REQUEST_ID), - r.Header.Get(HEADER_ETAG_SERVER), r.Body}, nil + r.Header.Get(HEADER_ETAG_SERVER), MapFromJson(r.Body)}, nil } } |