diff options
Diffstat (limited to 'api')
| -rw-r--r-- | api/apitestlib.go | 1 | ||||
| -rw-r--r-- | api/file.go | 2 | ||||
| -rw-r--r-- | api/user.go | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/api/apitestlib.go b/api/apitestlib.go index 6e2b8c045..699b0eb90 100644 --- a/api/apitestlib.go +++ b/api/apitestlib.go @@ -100,6 +100,7 @@ func setupTestHelper(enterprise bool) *TestHelper { *cfg.TeamSettings.MaxUsersPerTeam = 50 *cfg.RateLimitSettings.Enable = false cfg.EmailSettings.SendEmailNotifications = true + *cfg.ServiceSettings.EnableAPIv3 = true }) prevListenAddress := *th.App.Config().ServiceSettings.ListenAddress if testStore != nil { diff --git a/api/file.go b/api/file.go index 3b8984816..63432eda5 100644 --- a/api/file.go +++ b/api/file.go @@ -76,7 +76,7 @@ func uploadFile(c *Context, w http.ResponseWriter, r *http.Request) { return } - resStruct, err := c.App.UploadFiles(c.TeamId, channelId, c.Session.UserId, m.File["files"], m.Value["client_ids"]) + resStruct, err := c.App.UploadMultipartFiles(c.TeamId, channelId, c.Session.UserId, m.File["files"], m.Value["client_ids"]) if err != nil { c.Err = err return diff --git a/api/user.go b/api/user.go index ad4f12ef3..14cc881dc 100644 --- a/api/user.go +++ b/api/user.go @@ -752,7 +752,7 @@ func sendPasswordReset(c *Context, w http.ResponseWriter, r *http.Request) { return } - if sent, err := c.App.SendPasswordReset(email, utils.GetSiteURL()); err != nil { + if sent, err := c.App.SendPasswordReset(email, c.App.GetSiteURL()); err != nil { c.Err = err return } else if sent { @@ -1046,7 +1046,7 @@ func updateMfa(c *Context, w http.ResponseWriter, r *http.Request) { return } - if err := c.App.SendMfaChangeEmail(user.Email, activate, user.Locale, utils.GetSiteURL()); err != nil { + if err := c.App.SendMfaChangeEmail(user.Email, activate, user.Locale, c.App.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }) @@ -1180,7 +1180,7 @@ func completeSaml(c *Context, w http.ResponseWriter, r *http.Request) { } c.LogAuditWithUserId(user.Id, "Revoked all sessions for user") c.App.Go(func() { - if err := c.App.SendSignInChangeEmail(user.Email, strings.Title(model.USER_AUTH_SERVICE_SAML)+" SSO", user.Locale, utils.GetSiteURL()); err != nil { + if err := c.App.SendSignInChangeEmail(user.Email, strings.Title(model.USER_AUTH_SERVICE_SAML)+" SSO", user.Locale, c.App.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }) |