thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1523 from Nheko-Reborn/qmlFallbackAuth

Browse source 
QML the fallback auth dialog
This commit is contained in:
DeepBlueV7.X 2023-08-10 07:01:52 +00:00 • committed by GitHub
commit ff079f6b6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 149 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/ui/UIA.cpp
View file

@ -13,8 +13,6 @@
#include "Logging.h"
#include "MatrixClient.h"
#include "ReCaptcha.h"
#include "dialogs/FallbackAuth.h"
UIA *
UIA::instance()
@ -132,23 +130,18 @@ UIA::genericHandler(QString context)
}
} else {
// use fallback
auto dialog = new dialogs::FallbackAuth(QString::fromStdString(current_stage),
QString::fromStdString(u.session),
nullptr);
dialog->setWindowTitle(context);
connect(dialog, &dialogs::FallbackAuth::confirmation, this, [h, u, dialog]() {
dialog->close();
dialog->deleteLater();
auto fallback = new FallbackAuth(QString::fromStdString(u.session),
QString::fromStdString(current_stage),
nullptr);
QQmlEngine::setObjectOwnership(fallback, QQmlEngine::JavaScriptOwnership);
connect(fallback, &FallbackAuth::confirmation, this, [h, u]() {
h.next(mtx::user_interactive::Auth{u.session,
mtx::user_interactive::auth::Fallback{}});
});
connect(dialog, &dialogs::FallbackAuth::cancel, this, [this]() {
connect(fallback, &FallbackAuth::cancelled, this, [this]() {
emit error(tr("Registration aborted"));
});
dialog->show();
emit fallbackAuth(fallback);
}
});
});

2
src/ui/UIA.h
View file

@ -9,6 +9,7 @@
#include <mtxclient/http/client.hpp>
#include "FallbackAuth.h"
#include "ReCaptcha.h"
class UIA final : public QObject
@ -62,6 +63,7 @@ signals:
void email();
void phoneNumber();
void reCaptcha(ReCaptcha *recaptcha);
void fallbackAuth(FallbackAuth *fallback);
void confirm3pidToken();
void prompt3pidToken();