Merge pull request #680 from govynnus/token-registration

Support token authenticated registration
This commit is contained in:
DeepBlueV7.X 2021-08-15 18:22:01 +00:00 committed by GitHub
commit b1634d60a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3,6 +3,7 @@
// //
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
#include <QInputDialog>
#include <QLabel> #include <QLabel>
#include <QMetaType> #include <QMetaType>
#include <QPainter> #include <QPainter>
@ -481,6 +482,23 @@ RegisterPage::doUIA(const mtx::user_interactive::Unauthorized &unauthorized)
doRegistrationWithAuth( doRegistrationWithAuth(
mtx::user_interactive::Auth{session, mtx::user_interactive::auth::Dummy{}}); mtx::user_interactive::Auth{session, mtx::user_interactive::auth::Dummy{}});
} else if (current_stage == mtx::user_interactive::auth_types::registration_token) {
bool ok;
QString token =
QInputDialog::getText(this,
tr("Registration token"),
tr("Please enter a valid registration token."),
QLineEdit::Normal,
QString(),
&ok);
if (ok) {
emit registrationWithAuth(mtx::user_interactive::Auth{
session,
mtx::user_interactive::auth::RegistrationToken{token.toStdString()}});
} else {
emit errorOccurred();
}
} else { } else {
// use fallback // use fallback
auto dialog = new dialogs::FallbackAuth( auto dialog = new dialogs::FallbackAuth(