matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-29 16:43:09 +03:00
Code Activity

Don't poll UI auth again until current poll finishes

Browse Source 
On slow networks/servers we were ending up with lots of requests in
flight.
This commit is contained in:
David Baker
2019-06-06 18:31:54 +01:00
parent c18c679b9b
commit ae9bcd6f6c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/interactive-auth.js
View File

@@ -115,6 +115,8 @@ function InteractiveAuth(opts) {
this._chosenFlow = null; this._chosenFlow = null;
this._currentStage = null; this._currentStage = null;
this._polling = false;
} }
InteractiveAuth.prototype = { InteractiveAuth.prototype = {
@@ -147,8 +149,9 @@ InteractiveAuth.prototype = {
* completed out-of-band. If so, the attemptAuth promise will * completed out-of-band. If so, the attemptAuth promise will
* be resolved. * be resolved.
*/ */
poll: function() { poll: async function() {
if (!this._data.session) return; if (!this._data.session) return;
if (this._polling) return;
let authDict = {}; let authDict = {};
if (this._currentStage == EMAIL_STAGE_TYPE) { if (this._currentStage == EMAIL_STAGE_TYPE) {
@@ -169,7 +172,12 @@ InteractiveAuth.prototype = {
} }
} }
this.submitAuthDict(authDict, true); this._polling = true;
try {
await this.submitAuthDict(authDict, true);
} finally {
this._polling = false;
}
}, },
/** /**
@@ -221,7 +229,7 @@ InteractiveAuth.prototype = {
* in the attemptAuth promise being rejected. This can be set to true * in the attemptAuth promise being rejected. This can be set to true
* for requests that just poll to see if auth has been completed elsewhere. * for requests that just poll to see if auth has been completed elsewhere.
*/ */
submitAuthDict: function(authData, background) { submitAuthDict: async function(authData, background) {
if (!this._resolveFunc) { if (!this._resolveFunc) {
throw new Error("submitAuthDict() called before attemptAuth()"); throw new Error("submitAuthDict() called before attemptAuth()");
} }
@@ -232,7 +240,7 @@ InteractiveAuth.prototype = {
}; };
utils.extend(auth, authData); utils.extend(auth, authData);
this._doRequest(auth, background); await this._doRequest(auth, background);
}, },
/** /**