Skip to content
Snippets Groups Projects
Commit 695c3c08 authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Fix registration on construct

parent 70b0cbcd
No related branches found
No related tags found
No related merge requests found
......@@ -335,7 +335,7 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare(
MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
GIT_TAG 729d9b086d645799dda2a803c64e5b72d5e1959d
GIT_TAG 48e100e09b470c5c8be1f13837d4abd990283068
)
FetchContent_MakeAvailable(MatrixClient)
else()
......
......@@ -145,7 +145,8 @@ RegisterPage::RegisterPage(QWidget *parent)
const mtx::user_interactive::Unauthorized &unauthorized) {
auto completed_stages = unauthorized.completed;
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());
......@@ -252,7 +253,7 @@ RegisterPage::RegisterPage(QWidget *parent)
// The server requires registration flows.
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(
"failed to retrieve registration flows: ({}) "
"{}",
......@@ -268,8 +269,11 @@ RegisterPage::RegisterPage(QWidget *parent)
return;
}
nhlog::net()->warn("failed to register: status_code ({})",
static_cast<int>(err->status_code));
nhlog::net()->warn("failed to register: 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));
});
......@@ -325,9 +329,9 @@ RegisterPage::onRegisterButtonClicked()
// The server requires registration flows.
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(
"failed to retrieve registration flows: ({}) "
"failed to retrieve registration flows1: ({}) "
"{}",
static_cast<int>(err->status_code),
err->matrix_error.error);
......@@ -342,7 +346,7 @@ RegisterPage::onRegisterButtonClicked()
return;
}
nhlog::net()->warn(
nhlog::net()->error(
"failed to register: status_code ({}), matrix_error({})",
static_cast<int>(err->status_code),
err->matrix_error.error);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment