From 0234f793f29a90572d2288b7b22b75cd5ab83648 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 3 Nov 2016 10:41:11 -0400 Subject: 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 --- model/client.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'model') 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 } } -- cgit v1.2.3-1-g7c22