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

readd failover if server does not handle access-token via header

Browse Source
This commit is contained in:
Krombel
2017-07-01 14:30:37 +02:00
parent 59160a5d42
commit c6d2d4ccda
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -13,7 +13,7 @@
"build": "babel -s -d lib src && rimraf dist && mkdir dist && browserify -d browser-index.js | exorcist dist/browser-matrix.js.map > dist/browser-matrix.js && uglifyjs -c -m -o dist/browser-matrix.min.js --source-map dist/browser-matrix.min.js.map --in-source-map dist/browser-matrix.js.map dist/browser-matrix.js", "build": "babel -s -d lib src && rimraf dist && mkdir dist && browserify -d browser-index.js | exorcist dist/browser-matrix.js.map > dist/browser-matrix.js && uglifyjs -c -m -o dist/browser-matrix.min.js --source-map dist/browser-matrix.min.js.map --in-source-map dist/browser-matrix.js.map dist/browser-matrix.js",
"dist": "npm run build", "dist": "npm run build",
"watch": "watchify -d browser-index.js -o 'exorcist dist/browser-matrix.js.map > dist/browser-matrix.js' -v", "watch": "watchify -d browser-index.js -o 'exorcist dist/browser-matrix.js.map > dist/browser-matrix.js' -v",
"lint": "eslint --max-warnings 112 src spec", "lint": "eslint --max-warnings 110 src spec",
"prepublish": "npm run build && git rev-parse HEAD > git-revision.txt" "prepublish": "npm run build && git rev-parse HEAD > git-revision.txt"
}, },
"repository": { "repository": {

4
src/http-api.js
View File

@@ -423,7 +423,8 @@ module.exports.MatrixHttpApi.prototype = {
const self = this; const self = this;
requestPromise.catch(function(err) { requestPromise.catch(function(err) {
if (err.toString().indexOf("Error: CORS request rejected") != -1) { if (err.errcode == 'M_MISSING_TOKEN' ||
err.toString().indexOf("Error: CORS request rejected") != -1) {
self.authorization_header_supported = false; self.authorization_header_supported = 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;
@@ -431,6 +432,7 @@ module.exports.MatrixHttpApi.prototype = {
callback, method, path, queryParams, data, opts, callback, method, path, queryParams, data, opts,
); );
requestPromise.abort = secondPromise.abort; requestPromise.abort = secondPromise.abort;
return secondPromise;
} }
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");