From 04c09cea1fae947e1b70f7f7c9357a0c226b5607 Mon Sep 17 00:00:00 2001 From: Andrew Ferrazzutti Date: Fri, 26 Mar 2021 02:48:11 -0400 Subject: [PATCH] Actually print message on incorrect email/password --- puppet/src/puppet.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/puppet/src/puppet.js b/puppet/src/puppet.js index 8aa3733..4fe83a1 100644 --- a/puppet/src/puppet.js +++ b/puppet/src/puppet.js @@ -58,14 +58,6 @@ export default class MessagesPuppeteer { console.error(`[Puppeteer/${this.id}]`, ...text) } - /** - * Get the inner text of an element. - * To be called in browser context. - */ - _getInnerText(element) { - return element?.innerText - } - /** * Start the browser and open the messages for web page. * This must be called before doing anything else. @@ -213,11 +205,12 @@ export default class MessagesPuppeteer { return value }), () => this.page.waitForSelector("#login_incorrect", {visible: true, timeout: 2000}) - .then(value => this.page.evaluate(_getInnerText, value)), + .then(value => this.page.evaluate(element => element?.innerText, value)), () => this._waitForLoginCancel(), ].map(promiseFn => cancelableResolve(promiseFn))) this.log("Removing observers") + // TODO __mautrixController is undefined when cancelling, why? await this.page.evaluate(ownID => window.__mautrixController.setOwnID(ownID), this.id) await this.page.evaluate(() => window.__mautrixController.removeQRChangeObserver()) await this.page.evaluate(() => window.__mautrixController.removeQRAppearObserver())