d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-10-30 09:30:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix registration on construct

Browse source
This commit is contained in:
Nicolas Werner 2020-04-17 00:27:43 +02:00
parent 70b0cbcd0f
commit 695c3c0814
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -335,7 +335,7 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare( FetchContent_Declare(
MatrixClient MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
GIT_TAG 729d9b086d645799dda2a803c64e5b72d5e1959d GIT_TAG 48e100e09b470c5c8be1f13837d4abd990283068
) )
FetchContent_MakeAvailable(MatrixClient) FetchContent_MakeAvailable(MatrixClient)
else() else()

18
src/RegisterPage.cpp
View file

@ -145,7 +145,8 @@ RegisterPage::RegisterPage(QWidget *parent)
const mtx::user_interactive::Unauthorized &unauthorized) { const mtx::user_interactive::Unauthorized &unauthorized) {
auto completed_stages = unauthorized.completed; auto completed_stages = unauthorized.completed;
auto flows = unauthorized.flows; auto flows = unauthorized.flows;
auto session = unauthorized.session; auto session = unauthorized.session.empty() ? http::client()->generate_txn_id()
: unauthorized.session;
nhlog::ui()->info("Completed stages: {}", completed_stages.size()); nhlog::ui()->info("Completed stages: {}", completed_stages.size());
@ -252,7 +253,7 @@ RegisterPage::RegisterPage(QWidget *parent)
// The server requires registration flows. // The server requires registration flows.
if (err->status_code == boost::beast::http::status::unauthorized) { if (err->status_code == boost::beast::http::status::unauthorized) {
if (err->matrix_error.unauthorized.session.empty()) { if (err->matrix_error.unauthorized.flows.empty()) {
nhlog::net()->warn( nhlog::net()->warn(
"failed to retrieve registration flows: ({}) " "failed to retrieve registration flows: ({}) "
"{}", "{}",
@ -268,8 +269,11 @@ RegisterPage::RegisterPage(QWidget *parent)
return; return;
} }
nhlog::net()->warn("failed to register: status_code ({})", nhlog::net()->warn("failed to register: status_code ({}), "
static_cast<int>(err->status_code)); "matrix_error: ({}), parser error ({})",
static_cast<int>(err->status_code),
err->matrix_error.error,
err->parse_error);
emit registerErrorCb(QString::fromStdString(err->matrix_error.error)); emit registerErrorCb(QString::fromStdString(err->matrix_error.error));
}); });
@ -325,9 +329,9 @@ RegisterPage::onRegisterButtonClicked()
// The server requires registration flows. // The server requires registration flows.
if (err->status_code == boost::beast::http::status::unauthorized) { if (err->status_code == boost::beast::http::status::unauthorized) {
if (err->matrix_error.unauthorized.session.empty()) { if (err->matrix_error.unauthorized.flows.empty()) {
nhlog::net()->warn( nhlog::net()->warn(
"failed to retrieve registration flows: ({}) " "failed to retrieve registration flows1: ({}) "
"{}", "{}",
static_cast<int>(err->status_code), static_cast<int>(err->status_code),
err->matrix_error.error); err->matrix_error.error);
@ -342,7 +346,7 @@ RegisterPage::onRegisterButtonClicked()
return; return;
} }
nhlog::net()->warn( nhlog::net()->error(
"failed to register: status_code ({}), matrix_error({})", "failed to register: status_code ({}), matrix_error({})",
static_cast<int>(err->status_code), static_cast<int>(err->status_code),
err->matrix_error.error); err->matrix_error.error);