matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-09 10:22:46 +03:00
Code Activity

Merge remote-tracking branch 'origin/develop' into dbkr/x_show_msisdn

Browse Source
This commit is contained in:
David Baker
2017-03-15 11:28:24 +00:00
parent c8868a393b 8b4b0e0d39
commit 571fcbe98d
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/interactive-auth.js
View File

@@ -272,10 +272,16 @@ InteractiveAuth.prototype = {
// doesn't look like an interactive-auth failure. fail the whole lot.
throw error;
}
// if the error didn't come with flows or session ID,
// copy over the ones we have
if (!error.data.flows) error.data.flows = self._data.flows;
if (!error.data.session) error.data.session = self._data.session;
// if the error didn't come with flows, completed flows or session ID,
// copy over the ones we have. Synapse sometimes sends responses without
// any UI auth data (eg. when polling for email validation, if the email
// has not yet been validated). This appears to be a Synapse bug, which
// we workaround here.
if (!error.data.flows && !error.data.completed && !error.data.session) {
error.data.flows = self._data.flows;
error.data.completed = self._data.completed;
error.data.session = self._data.session;
}
self._data = error.data;
self._startNextAuthStage();
},