From ce2b2be5de578bd9eb44b26e04db75ca61d67ca5 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 31 Oct 2017 09:39:31 -0500 Subject: Refactoring cfg refs and load / save functions (#7749) * refactoring cfg refs and load / save functions * improve error output --- api/file_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'api/file_test.go') diff --git a/api/file_test.go b/api/file_test.go index cdf06c04d..8b04c732c 100644 --- a/api/file_test.go +++ b/api/file_test.go @@ -517,7 +517,7 @@ func TestGetPublicFileOld(t *testing.T) { // reconstruct old style of link siteURL := fmt.Sprintf("http://localhost:%v", th.App.Srv.ListenAddr.Port) - link := generatePublicLinkOld(siteURL, th.BasicTeam.Id, channel.Id, th.BasicUser.Id, fileId+"/test.png") + link := generatePublicLinkOld(siteURL, th.BasicTeam.Id, channel.Id, th.BasicUser.Id, fileId+"/test.png", *th.App.Config().FileSettings.PublicLinkSalt) // Wait a bit for files to ready time.Sleep(2 * time.Second) @@ -553,8 +553,8 @@ func TestGetPublicFileOld(t *testing.T) { } } -func generatePublicLinkOld(siteURL, teamId, channelId, userId, filename string) string { - hash := app.GeneratePublicLinkHash(filename, *utils.Cfg.FileSettings.PublicLinkSalt) +func generatePublicLinkOld(siteURL, teamId, channelId, userId, filename, salt string) string { + hash := app.GeneratePublicLinkHash(filename, salt) return fmt.Sprintf("%s%s/public/files/get/%s/%s/%s/%s?h=%s", siteURL, model.API_URL_SUFFIX_V3, teamId, channelId, userId, filename, hash) } -- cgit v1.2.3-1-g7c22