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

PR feedback

Browse Source
This commit is contained in:
David Baker
2019-05-22 13:09:24 +01:00
parent e87ac86e48
commit 87c6d11fca
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/interactive-auth.js
View File

@@ -125,7 +125,9 @@ InteractiveAuth.prototype = {
* no suitable authentication flow can be found * no suitable authentication flow can be found
*/ */
attemptAuth: function() { attemptAuth: function() {
return new Promise(async (resolve, reject) => { // This promise will be quite long-lived and will resolve when the
// request is authenticated and completes successfully.
return new Promise((resolve, reject) => {
this._resolveFunc = resolve; this._resolveFunc = resolve;
this._rejectFunc = reject; this._rejectFunc = reject;
@@ -268,7 +270,6 @@ InteractiveAuth.prototype = {
_doRequest: async function(auth, background) { _doRequest: async function(auth, background) {
try { try {
const result = await this._requestCallback(auth, background); const result = await this._requestCallback(auth, background);
console.log("result from request: ", result);
this._resolveFunc(result); this._resolveFunc(result);
} catch (error) { } catch (error) {
// sometimes UI auth errors don't come with flows // sometimes UI auth errors don't come with flows
@@ -282,7 +283,10 @@ InteractiveAuth.prototype = {
// We ignore all failures here (even non-UI auth related ones) // We ignore all failures here (even non-UI auth related ones)
// since we don't want to suddenly fail if the internet connection // since we don't want to suddenly fail if the internet connection
// had a blip whilst we were polling // had a blip whilst we were polling
console.log("Ignoring error from UI auth: " + error); console.log(
"Background poll request failed doing UI auth: ignoring",
error,.
);
} }
} }
// if the error didn't come with flows, completed flows or session ID, // if the error didn't come with flows, completed flows or session ID,
@@ -314,6 +318,12 @@ InteractiveAuth.prototype = {
this._data.session, this._data.session,
); );
this._emailSid = requestTokenResult.sid; this._emailSid = requestTokenResult.sid;
// NB. promise is not resolved here - at some point, doRequest
// will be called again and if the user has jumped through all
// the hoops correctly, auth will be complete and the request
// will succeed.
// Also, we should expose the fact that this request has compledted
// so clients can know that the email has actually been sent.
} catch (e) { } catch (e) {
// we failed to request an email token, so fail the request. // we failed to request an email token, so fail the request.
// This could be due to the email already beeing registered // This could be due to the email already beeing registered
@@ -333,7 +343,7 @@ InteractiveAuth.prototype = {
* @private * @private
* @throws {NoAuthFlowFoundError} If no suitable authentication flow can be found * @throws {NoAuthFlowFoundError} If no suitable authentication flow can be found
*/ */
_startNextAuthStage: async function() { _startNextAuthStage: function() {
const nextStage = this._chooseStage(); const nextStage = this._chooseStage();
if (!nextStage) { if (!nextStage) {
throw new Error("No incomplete flows from the server"); throw new Error("No incomplete flows from the server");