diff options
| author | George Goldberg <george@gberg.me> | 2017-07-12 14:13:25 +0100 |
|---|---|---|
| committer | Saturnino Abril <saturnino.abril@gmail.com> | 2017-07-12 22:13:25 +0900 |
| commit | 2bf64b54c236945727a2d93afb57b1665d1daa7a (patch) | |
| tree | a7b0b3c1114faf5e398b6cb06fd9e61fb818f7b9 /api4/team.go | |
| parent | e975b84a12b8e3f547f4d811155d076a5a4fdcf9 (diff) | |
| download | chat-2bf64b54c236945727a2d93afb57b1665d1daa7a.tar.gz chat-2bf64b54c236945727a2d93afb57b1665d1daa7a.tar.bz2 chat-2bf64b54c236945727a2d93afb57b1665d1daa7a.zip | |
PLT-7025: Fix Slack Import API. (#6905)
Diffstat (limited to 'api4/team.go')
| -rw-r--r-- | api4/team.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/api4/team.go b/api4/team.go index 1cbd89481..98a672d93 100644 --- a/api4/team.go +++ b/api4/team.go @@ -5,7 +5,7 @@ package api4 import ( "bytes" - "io" + "encoding/base64" "net/http" "strconv" @@ -657,12 +657,12 @@ func importTeam(c *Context, w http.ResponseWriter, r *http.Request) { } } - w.Header().Set("Content-Disposition", "attachment; filename=MattermostImportLog.txt") - w.Header().Set("Content-Type", "application/octet-stream") + data := map[string]string{} + data["results"] = base64.StdEncoding.EncodeToString([]byte(log.Bytes())) if c.Err != nil { w.WriteHeader(c.Err.StatusCode) } - io.Copy(w, bytes.NewReader(log.Bytes())) + w.Write([]byte(model.MapToJson(data))) } func inviteUsersToTeam(c *Context, w http.ResponseWriter, r *http.Request) { |