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

intercept first authedRequest to determine if accessToken can be send by header (clearer structure)

Browse Source
This commit is contained in:
Krombel
2017-07-04 16:16:10 +02:00
parent 07868f701a
commit dd0ff3eeb5
1 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/http-api.js
View File

@@ -385,8 +385,8 @@ module.exports.MatrixHttpApi.prototype = {
if (!queryParams) { if (!queryParams) {
queryParams = {}; queryParams = {};
} }
if (this.authorization_header_supported === undefined || if (this.authorizationHeaderSupported === undefined ||
this.authorization_header_supported) { this.authorizationHeaderSupported) {
if (isFinite(opts)) { if (isFinite(opts)) {
// opts used to be localTimeoutMs // opts used to be localTimeoutMs
opts = { opts = {
@@ -422,18 +422,44 @@ module.exports.MatrixHttpApi.prototype = {
const self = this; const self = this;
requestPromise.catch(function(err) { if (this.authorizationHeaderSupported === undefined) {
const defer = q.defer();
const returnPromise = defer.promise;
returnPromise.abort = requestPromise.abort;
requestPromise.then((resp) => {
self.authorizationHeaderSupported = true;
defer.resolve(resp);
}, (err) => {
if (err.errcode == 'M_MISSING_TOKEN' || if (err.errcode == 'M_MISSING_TOKEN' ||
err.toString().indexOf("Error: CORS request rejected") != -1) { err.toString().indexOf("Error: CORS request rejected") != -1) {
self.authorization_header_supported = false; self.authorizationHeaderSupported = false;
queryParams.access_token = opts.headers.Authorization.substr(7); queryParams.access_token = opts.headers.Authorization.substr(7);
delete opts.headers.Authorization; delete opts.headers.Authorization;
const secondPromise = self.request( const secondPromise = self.request(
callback, method, path, queryParams, data, opts, callback, method, path, queryParams, data, opts,
); );
requestPromise.abort = secondPromise.abort; returnPromise.abort = secondPromise.abort;
return secondPromise; secondPromise.then((resp) => {
defer.resolve(resp);
}, (err) => {
if (err.errcode == 'M_UNKNOWN_TOKEN') {
self.event_emitter.emit("Session.logged_out");
} }
defer.reject(err);
});
} else if (err.errcode == 'M_UNKNOWN_TOKEN') {
self.event_emitter.emit("Session.logged_out");
defer.reject(err);
} else {
defer.reject(err);
}
});
return returnPromise;
}
requestPromise.catch(function(err) {
if (err.errcode == 'M_UNKNOWN_TOKEN') { if (err.errcode == 'M_UNKNOWN_TOKEN') {
self.event_emitter.emit("Session.logged_out"); self.event_emitter.emit("Session.logged_out");
} }