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

Implement failover when server does not allow setting the Authorized-header (CORS)

Browse Source
This commit is contained in:
Krombel
2017-07-01 12:16:46 +02:00
parent 5da6423fd6
commit 59160a5d42
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/http-api.js
View File

@@ -386,7 +386,7 @@ module.exports.MatrixHttpApi.prototype = {
queryParams = {}; queryParams = {};
} }
if (this.authorization_header_supported === undefined || if (this.authorization_header_supported === undefined ||
this.authorization_header_supported) { this.authorization_header_supported) {
if (isFinite(opts)) { if (isFinite(opts)) {
// opts used to be localTimeoutMs // opts used to be localTimeoutMs
opts = { opts = {
@@ -400,7 +400,15 @@ module.exports.MatrixHttpApi.prototype = {
opts.headers = {}; opts.headers = {};
} }
if (!opts.headers.Authorization) { if (!opts.headers.Authorization) {
opts.headers.Authorization = "Bearer " + this.opts.accessToken; if (queryParams.access_token) {
opts.headers.Authorization = "Bearer " + queryParams.access_token;
delete queryParams.access_token;
} else {
opts.headers.Authorization = "Bearer " + this.opts.accessToken;
}
}
if (queryParams.access_token) {
delete queryParams.access_token;
} }
} else { } else {
if (!queryParams.access_token) { if (!queryParams.access_token) {
@@ -408,25 +416,30 @@ module.exports.MatrixHttpApi.prototype = {
} }
} }
const request_promise = this.request( const requestPromise = this.request(
callback, method, path, queryParams, data, opts, callback, method, path, queryParams, data, opts,
); );
const self = this; const self = this;
request_promise.catch(function(err) {
requestPromise.catch(function(err) {
if (err.toString().indexOf("Error: CORS request rejected") != -1) {
self.authorization_header_supported = false;
queryParams.access_token = opts.headers.Authorization.substr(7);
delete opts.headers.Authorization;
const secondPromise = self.request(
callback, method, path, queryParams, data, opts,
);
requestPromise.abort = secondPromise.abort;
}
if (err.errcode == 'M_UNKNOWN_TOKEN') { if (err.errcode == 'M_UNKNOWN_TOKEN') {
if (self.authorization_header_supported === undefined) {
self.authorization_header_supported = false;
return self.authedRequest(
callback, method, path, queryParams, data, opts);
}
self.event_emitter.emit("Session.logged_out"); self.event_emitter.emit("Session.logged_out");
} }
}); });
// return the original promise, otherwise tests break due to it having to // return the original promise, otherwise tests break due to it having to
// go around the event loop one more time to process the result of the request // go around the event loop one more time to process the result of the request
return request_promise; return requestPromise;
}, },
/** /**