matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-25 05:23:13 +03:00
Code Activity

use Authorization header in media/v1/upload if enabled, instead of query

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2018-06-15 09:57:30 +01:00
parent fdf4523c2a
commit 5e3b1bf6b0
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/http-api.js
View File

@@ -271,9 +271,18 @@ module.exports.MatrixHttpApi.prototype = {
}); });
} }
}); });
let url = this.opts.baseUrl + "/_matrix/media/v1/upload"; let url = this.opts.baseUrl + "/_matrix/media/v1/upload?";
url += "?access_token=" + encodeURIComponent(this.opts.accessToken);
url += "&filename=" + encodeURIComponent(fileName); const queryArgs = ["filename=" + encodeURIComponent(fileName)];
if (this.useAuthorizationHeader) {
xhr.setRequestHeader("Authorization", "Bearer " + this.opts.accessToken);
} else {
queryArgs.push("access_token="
+ encodeURIComponent(this.opts.accessToken));
}
url += queryArgs.join("&");
xhr.open("POST", url); xhr.open("POST", url);
xhr.setRequestHeader("Content-Type", contentType); xhr.setRequestHeader("Content-Type", contentType);