summaryrefslogtreecommitdiffstats
path: root/api4
diff options
context:
space:
mode:
Diffstat (limited to 'api4')
-rw-r--r--api4/apitestlib.go27
-rw-r--r--api4/compliance.go3
-rw-r--r--api4/file.go2
-rw-r--r--api4/file_test.go11
-rw-r--r--api4/user_test.go20
5 files changed, 29 insertions, 34 deletions
diff --git a/api4/apitestlib.go b/api4/apitestlib.go
index d777f8c19..6f066a140 100644
--- a/api4/apitestlib.go
+++ b/api4/apitestlib.go
@@ -689,19 +689,20 @@ func s3New(endpoint, accessKey, secretKey string, secure bool, signV2 bool, regi
return s3.NewWithCredentials(endpoint, creds, secure, region)
}
-func cleanupTestFile(info *model.FileInfo) error {
- if *utils.Cfg.FileSettings.DriverName == model.IMAGE_DRIVER_S3 {
- endpoint := utils.Cfg.FileSettings.AmazonS3Endpoint
- accessKey := utils.Cfg.FileSettings.AmazonS3AccessKeyId
- secretKey := utils.Cfg.FileSettings.AmazonS3SecretAccessKey
- secure := *utils.Cfg.FileSettings.AmazonS3SSL
- signV2 := *utils.Cfg.FileSettings.AmazonS3SignV2
- region := utils.Cfg.FileSettings.AmazonS3Region
+func (me *TestHelper) cleanupTestFile(info *model.FileInfo) error {
+ cfg := me.App.Config()
+ if *cfg.FileSettings.DriverName == model.IMAGE_DRIVER_S3 {
+ endpoint := cfg.FileSettings.AmazonS3Endpoint
+ accessKey := cfg.FileSettings.AmazonS3AccessKeyId
+ secretKey := cfg.FileSettings.AmazonS3SecretAccessKey
+ secure := *cfg.FileSettings.AmazonS3SSL
+ signV2 := *cfg.FileSettings.AmazonS3SignV2
+ region := cfg.FileSettings.AmazonS3Region
s3Clnt, err := s3New(endpoint, accessKey, secretKey, secure, signV2, region)
if err != nil {
return err
}
- bucket := utils.Cfg.FileSettings.AmazonS3Bucket
+ bucket := cfg.FileSettings.AmazonS3Bucket
if err := s3Clnt.RemoveObject(bucket, info.Path); err != nil {
return err
}
@@ -717,19 +718,19 @@ func cleanupTestFile(info *model.FileInfo) error {
return err
}
}
- } else if *utils.Cfg.FileSettings.DriverName == model.IMAGE_DRIVER_LOCAL {
- if err := os.Remove(utils.Cfg.FileSettings.Directory + info.Path); err != nil {
+ } else if *cfg.FileSettings.DriverName == model.IMAGE_DRIVER_LOCAL {
+ if err := os.Remove(cfg.FileSettings.Directory + info.Path); err != nil {
return err
}
if info.ThumbnailPath != "" {
- if err := os.Remove(utils.Cfg.FileSettings.Directory + info.ThumbnailPath); err != nil {
+ if err := os.Remove(cfg.FileSettings.Directory + info.ThumbnailPath); err != nil {
return err
}
}
if info.PreviewPath != "" {
- if err := os.Remove(utils.Cfg.FileSettings.Directory + info.PreviewPath); err != nil {
+ if err := os.Remove(cfg.FileSettings.Directory + info.PreviewPath); err != nil {
return err
}
}
diff --git a/api4/compliance.go b/api4/compliance.go
index 91d00fdf4..d58398595 100644
--- a/api4/compliance.go
+++ b/api4/compliance.go
@@ -8,7 +8,6 @@ import (
"strconv"
l4g "github.com/alecthomas/log4go"
- "github.com/mattermost/mattermost-server/app"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/utils"
"github.com/mssola/user_agent"
@@ -100,7 +99,7 @@ func downloadComplianceReport(c *Context, w http.ResponseWriter, r *http.Request
return
}
- reportBytes, err := app.GetComplianceFile(job)
+ reportBytes, err := c.App.GetComplianceFile(job)
if err != nil {
c.Err = err
return
diff --git a/api4/file.go b/api4/file.go
index a8297df04..883d4f3c8 100644
--- a/api4/file.go
+++ b/api4/file.go
@@ -201,7 +201,7 @@ func getFileLink(c *Context, w http.ResponseWriter, r *http.Request) {
}
resp := make(map[string]string)
- resp["link"] = app.GeneratePublicLink(c.GetSiteURLHeader(), info)
+ resp["link"] = c.App.GeneratePublicLink(c.GetSiteURLHeader(), info)
w.Write([]byte(model.MapToJson(resp)))
}
diff --git a/api4/file_test.go b/api4/file_test.go
index 394406d6e..7010b3039 100644
--- a/api4/file_test.go
+++ b/api4/file_test.go
@@ -10,7 +10,6 @@ import (
"testing"
"time"
- "github.com/mattermost/mattermost-server/app"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/store"
)
@@ -94,7 +93,7 @@ func TestUploadFile(t *testing.T) {
// Wait a bit for files to ready
time.Sleep(2 * time.Second)
- if err := cleanupTestFile(info); err != nil {
+ if err := th.cleanupTestFile(info); err != nil {
t.Fatal(err)
}
@@ -363,7 +362,7 @@ func TestGetFileLink(t *testing.T) {
if result := <-th.App.Srv.Store.FileInfo().Get(fileId); result.Err != nil {
t.Fatal(result.Err)
} else {
- cleanupTestFile(result.Data.(*model.FileInfo))
+ th.cleanupTestFile(result.Data.(*model.FileInfo))
}
}
@@ -520,7 +519,7 @@ func TestGetPublicFile(t *testing.T) {
result := <-th.App.Srv.Store.FileInfo().Get(fileId)
info := result.Data.(*model.FileInfo)
- link := app.GeneratePublicLink(Client.Url, info)
+ link := th.App.GeneratePublicLink(Client.Url, info)
// Wait a bit for files to ready
time.Sleep(2 * time.Second)
@@ -551,9 +550,9 @@ func TestGetPublicFile(t *testing.T) {
t.Fatal("should've failed to get image with public link after salt changed")
}
- if err := cleanupTestFile(store.Must(th.App.Srv.Store.FileInfo().Get(fileId)).(*model.FileInfo)); err != nil {
+ if err := th.cleanupTestFile(store.Must(th.App.Srv.Store.FileInfo().Get(fileId)).(*model.FileInfo)); err != nil {
t.Fatal(err)
}
- cleanupTestFile(info)
+ th.cleanupTestFile(info)
}
diff --git a/api4/user_test.go b/api4/user_test.go
index d2bbdcd7b..12b808aa1 100644
--- a/api4/user_test.go
+++ b/api4/user_test.go
@@ -841,7 +841,7 @@ func TestGetProfileImage(t *testing.T) {
CheckNoError(t, resp)
info := &model.FileInfo{Path: "/users/" + user.Id + "/profile.png"}
- if err := cleanupTestFile(info); err != nil {
+ if err := th.cleanupTestFile(info); err != nil {
t.Fatal(err)
}
}
@@ -2089,7 +2089,7 @@ func TestSetProfileImage(t *testing.T) {
assert.True(t, buser.LastPictureUpdate < ruser.LastPictureUpdate, "Picture should have updated for user")
info := &model.FileInfo{Path: "users/" + user.Id + "/profile.png"}
- if err := cleanupTestFile(info); err != nil {
+ if err := th.cleanupTestFile(info); err != nil {
t.Fatal(err)
}
}
@@ -2381,11 +2381,9 @@ func TestDisableUserAccessToken(t *testing.T) {
testDescription := "test token"
- enableUserAccessTokens := *utils.Cfg.ServiceSettings.EnableUserAccessTokens
- defer func() {
- *utils.Cfg.ServiceSettings.EnableUserAccessTokens = enableUserAccessTokens
- }()
- *utils.Cfg.ServiceSettings.EnableUserAccessTokens = true
+ enableUserAccessTokens := *th.App.Config().ServiceSettings.EnableUserAccessTokens
+ defer th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = enableUserAccessTokens })
+ *th.App.Config().ServiceSettings.EnableUserAccessTokens = true
th.App.UpdateUserRoles(th.BasicUser.Id, model.ROLE_SYSTEM_USER.Id+" "+model.ROLE_SYSTEM_USER_ACCESS_TOKEN.Id, false)
token, resp := Client.CreateUserAccessToken(th.BasicUser.Id, testDescription)
@@ -2428,11 +2426,9 @@ func TestEnableUserAccessToken(t *testing.T) {
testDescription := "test token"
- enableUserAccessTokens := *utils.Cfg.ServiceSettings.EnableUserAccessTokens
- defer func() {
- *utils.Cfg.ServiceSettings.EnableUserAccessTokens = enableUserAccessTokens
- }()
- *utils.Cfg.ServiceSettings.EnableUserAccessTokens = true
+ enableUserAccessTokens := *th.App.Config().ServiceSettings.EnableUserAccessTokens
+ defer th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = enableUserAccessTokens })
+ *th.App.Config().ServiceSettings.EnableUserAccessTokens = true
th.App.UpdateUserRoles(th.BasicUser.Id, model.ROLE_SYSTEM_USER.Id+" "+model.ROLE_SYSTEM_USER_ACCESS_TOKEN.Id, false)
token, resp := Client.CreateUserAccessToken(th.BasicUser.Id, testDescription)
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-02 14:22:32 +0000