diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-31 09:39:31 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-10-31 10:39:31 -0400 |
| commit | ce2b2be5de578bd9eb44b26e04db75ca61d67ca5 (patch) | |
| tree | 54203a18ecfb167dcf1d7e0742cea0ed9aab220a /api/file_test.go | |
| parent | b446d0aa0aa2bd3d87028b0543752eb539507481 (diff) | |
| download | chat-ce2b2be5de578bd9eb44b26e04db75ca61d67ca5.tar.gz chat-ce2b2be5de578bd9eb44b26e04db75ca61d67ca5.tar.bz2 chat-ce2b2be5de578bd9eb44b26e04db75ca61d67ca5.zip | |
Refactoring cfg refs and load / save functions (#7749)
* refactoring cfg refs and load / save functions
* improve error output
Diffstat (limited to 'api/file_test.go')
| -rw-r--r-- | api/file_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
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) } |