diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-11 08:05:23 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-11 08:05:23 -0400 |
| commit | 91557bbd978500388a11b99401783164e143a966 (patch) | |
| tree | 676d6278d957df20f21d5e367d1f447ee281414e /api | |
| parent | 11c60ea41afd419036edc54b5571f26ce680c93c (diff) | |
| parent | 2b27e12445ba51e1fa1ab2aceac5fcb3de66845d (diff) | |
| download | chat-91557bbd978500388a11b99401783164e143a966.tar.gz chat-91557bbd978500388a11b99401783164e143a966.tar.bz2 chat-91557bbd978500388a11b99401783164e143a966.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'api')
| -rw-r--r-- | api/emoji_test.go | 2 | ||||
| -rw-r--r-- | api/user.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/api/emoji_test.go b/api/emoji_test.go index 69922a54a..108c416e1 100644 --- a/api/emoji_test.go +++ b/api/emoji_test.go @@ -272,7 +272,7 @@ func TestDeleteEmoji(t *testing.T) { func createTestEmoji(t *testing.T, a *app.App, emoji *model.Emoji, imageData []byte) *model.Emoji { emoji = store.Must(a.Srv.Store.Emoji().Save(emoji)).(*model.Emoji) - if err := a.WriteFile(imageData, "emoji/"+emoji.Id+"/image"); err != nil { + if _, err := a.WriteFile(bytes.NewReader(imageData), "emoji/"+emoji.Id+"/image"); err != nil { store.Must(a.Srv.Store.Emoji().Delete(emoji.Id, time.Now().Unix())) t.Fatalf("failed to write image: %v", err.Error()) } diff --git a/api/user.go b/api/user.go index 15fd4c7ea..5931eac1e 100644 --- a/api/user.go +++ b/api/user.go @@ -107,7 +107,7 @@ func login(c *Context, w http.ResponseWriter, r *http.Request) { ldapOnly := props["ldap_only"] == "true" c.LogAudit("attempt - user_id=" + id + " login_id=" + loginId) - user, err := c.App.AuthenticateUserForLogin(id, loginId, password, mfaToken, deviceId, ldapOnly) + user, err := c.App.AuthenticateUserForLogin(id, loginId, password, mfaToken, ldapOnly) if err != nil { c.LogAudit("failure - user_id=" + id + " login_id=" + loginId) c.Err = err @@ -1072,7 +1072,7 @@ func checkMfa(c *Context, w http.ResponseWriter, r *http.Request) { } rdata := map[string]string{} - if user, err := c.App.GetUserForLogin(loginId, false); err != nil { + if user, err := c.App.GetUserForLogin("", loginId); err != nil { rdata["mfa_required"] = "false" } else { rdata["mfa_required"] = strconv.FormatBool(user.MfaActive) |