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

Merge pull request #1009 from matrix-org/jryans/user-settings-toggle-3pid

Browse Source 
Add API for bulk lookup on the Identity Server
This commit is contained in:
J. Ryan Stinnett
2019-08-07 18:05:58 +01:00
committed by GitHub
parent 649fe7a490 9c24bcb7a9
commit 64ddbd97dd
2 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/http-api.js
View File

@@ -396,16 +396,19 @@ module.exports.MatrixHttpApi.prototype = {
withCredentials: false,
json: false,
_matrix_opts: this.opts,
headers: {},
};
if (method == 'GET') {
opts.qs = params;
} else {
} else if (typeof params === "object") {
opts.form = params;
} else if (typeof params === "string") {
// Assume the caller has serialised the body to JSON
opts.body = params;
opts.headers['Content-Type'] = "application/json";
}
if (accessToken) {
opts.headers = {
Authorization: `Bearer ${accessToken}`,
};
opts.headers['Authorization'] = `Bearer ${accessToken}`;
}
const defer = Promise.defer();