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 send another token request while one's in flight

Browse Source 
Otherwise we end up with more tokens than are strictly necessary
This commit is contained in:
David Baker
2019-06-06 19:03:29 +01:00
parent 2e1fb15ada
commit bac73150ca
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/interactive-auth.js
View File

@@ -112,6 +112,7 @@ function InteractiveAuth(opts) {
this._clientSecret = opts.clientSecret || this._matrixClient.generateClientSecret(); this._clientSecret = opts.clientSecret || this._matrixClient.generateClientSecret();
this._emailSid = opts.emailSid; this._emailSid = opts.emailSid;
if (this._emailSid === undefined) this._emailSid = null; if (this._emailSid === undefined) this._emailSid = null;
this._requestingEmailToken = false;
this._chosenFlow = null; this._chosenFlow = null;
this._currentStage = null; this._currentStage = null;
@@ -313,12 +314,14 @@ InteractiveAuth.prototype = {
if ( if (
!this._emailSid && !this._emailSid &&
!this._requestingEmailToken &&
this._chosenFlow.stages.includes('m.login.email.identity') this._chosenFlow.stages.includes('m.login.email.identity')
) { ) {
// If we've picked a flow with email auth, we send the email // If we've picked a flow with email auth, we send the email
// now because we want the request to fail as soon as possible // now because we want the request to fail as soon as possible
// if the email address is not valid (ie. already taken or not // if the email address is not valid (ie. already taken or not
// registered, depending on what the operation is). // registered, depending on what the operation is).
this._requestingEmailToken = true;
try { try {
const requestTokenResult = await this._requestEmailTokenCallback( const requestTokenResult = await this._requestEmailTokenCallback(
this._inputs.emailAddress, this._inputs.emailAddress,
@@ -341,6 +344,8 @@ InteractiveAuth.prototype = {
// the failure up as the user can't complete auth if we can't // the failure up as the user can't complete auth if we can't
// send the email, foe whatever reason. // send the email, foe whatever reason.
this._rejectFunc(e); this._rejectFunc(e);
} finally {
this._requestingEmailToken = false;
} }
} }
} }