Skip to content

Commit

Permalink
Maybe use the correct stable endpoint too
Browse files Browse the repository at this point in the history
  • Loading branch information
turt2live committed Jul 2, 2024
1 parent 9697e11 commit 85e7cbe
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions test/msc3916_downloads_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func (s *MSC3916DownloadsSuite) TestFederationDownloads() {
assert.NotEmpty(t, mediaId)

// Verify the federation download *fails* when lacking auth
uri := fmt.Sprintf("/_matrix/federation/v1.v2/media/download/%s", mediaId)
uri := fmt.Sprintf("/_matrix/federation/v1/media/download/%s", mediaId)
raw, err := remoteClient.DoRaw("GET", uri, nil, "", nil)
assert.NoError(t, err)
assert.Equal(t, http.StatusUnauthorized, raw.StatusCode)
Expand All @@ -145,7 +145,7 @@ func (s *MSC3916DownloadsSuite) TestFederationMakesAuthedDownloads() {
err := matrix.TestsOnlyInjectSigningKey(s.deps.Homeservers[0].ServerName, s.deps.Homeservers[0].ExternalClientServerApiUrl)
assert.NoError(t, err)
testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
assert.Equal(t, fmt.Sprintf("/_matrix/federation/v1.v2/media/download/%s", mediaId), r.URL.Path)
assert.Equal(t, fmt.Sprintf("/_matrix/federation/v1/media/download/%s", mediaId), r.URL.Path)
origin, err := matrix.ValidateXMatrixAuth(r, true)
assert.NoError(t, err)
assert.Equal(t, client1.ServerName, origin)
Expand Down Expand Up @@ -187,7 +187,7 @@ func (s *MSC3916DownloadsSuite) TestFederationFollowsRedirects() {

// Mock homeserver (1st hop)
testServer1 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
assert.Equal(t, fmt.Sprintf("/_matrix/federation/v1.v2/media/download/%s", mediaId), r.URL.Path)
assert.Equal(t, fmt.Sprintf("/_matrix/federation/v1/media/download/%s", mediaId), r.URL.Path)
origin, err := matrix.ValidateXMatrixAuth(r, true)
assert.NoError(t, err)
assert.Equal(t, client1.ServerName, origin)
Expand Down Expand Up @@ -226,7 +226,7 @@ func (s *MSC3916DownloadsSuite) TestFederationMakesAuthedDownloadsAndFallsBack()
origin, err := matrix.ValidateXMatrixAuth(r, true)
assert.NoError(t, err)
assert.Equal(t, client1.ServerName, origin)
assert.Equal(t, fmt.Sprintf("/_matrix/federation/v1.v2/media/download/%s", mediaId), r.URL.Path)
assert.Equal(t, fmt.Sprintf("/_matrix/federation/v1/media/download/%s", mediaId), r.URL.Path)
w.WriteHeader(http.StatusNotFound)
_, _ = w.Write([]byte("{\"errcode\":\"M_UNRECOGNIZED\"}"))
reqNum++
Expand Down
2 changes: 1 addition & 1 deletion test/msc3916_thumbnails_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func (s *MSC3916ThumbnailsSuite) TestFederationThumbnails() {
assert.NotEmpty(t, mediaId)

// Verify the federation download *fails* when lacking auth
uri := fmt.Sprintf("/_matrix/federation/v1.v2/media/thumbnail/%s", mediaId)
uri := fmt.Sprintf("/_matrix/federation/v1/media/thumbnail/%s", mediaId)
qs := url.Values{
"width": []string{"96"},
"height": []string{"96"},
Expand Down

0 comments on commit 85e7cbe

Please sign in to comment.