ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Quotient's job for password changing

Browse Source
This commit is contained in:
Tobias Fella
2024-12-25 15:53:32 +01:00
parent b595a2966c
commit ef8c89b999
4 changed files with 9 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@@ -130,8 +130,6 @@ add_library(neochat STATIC
jobs/neochatdeactivateaccountjob.h jobs/neochatdeactivateaccountjob.h
jobs/neochatdeletedevicejob.cpp jobs/neochatdeletedevicejob.cpp
jobs/neochatdeletedevicejob.h jobs/neochatdeletedevicejob.h
jobs/neochatchangepasswordjob.cpp
jobs/neochatchangepasswordjob.h
jobs/neochatgetcommonroomsjob.cpp jobs/neochatgetcommonroomsjob.cpp
jobs/neochatgetcommonroomsjob.h jobs/neochatgetcommonroomsjob.h
mediasizehelper.cpp mediasizehelper.cpp

16
src/jobs/neochatchangepasswordjob.cpp
View File

@@ -1,16 +0,0 @@
// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
// SPDX-License-Identifier: GPL-2.0-or-later
#include "neochatchangepasswordjob.h"
using namespace Quotient;
NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const std::optional<QJsonObject> &auth)
: BaseJob(HttpVerb::Post, u"ChangePasswordJob"_s, "/_matrix/client/r0/account/password")
{
QJsonObject _data;
addParam<>(_data, u"new_password"_s, newPassword);
addParam<IfNotEmpty>(_data, u"logout_devices"_s, logoutDevices);
addParam<IfNotEmpty>(_data, u"auth"_s, auth);
setRequestData(_data);
}

12
src/jobs/neochatchangepasswordjob.h
View File

@@ -1,12 +0,0 @@
// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include <Quotient/jobs/basejob.h>
class NeochatChangePasswordJob : public Quotient::BaseJob
{
public:
explicit NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const std::optional<QJsonObject> &auth = {});
};

19
src/neochatconnection.cpp
View File

@@ -6,7 +6,6 @@
#include <QImageReader> #include <QImageReader>
#include <QJsonDocument> #include <QJsonDocument>
#include "jobs/neochatchangepasswordjob.h"
#include "jobs/neochatdeactivateaccountjob.h" #include "jobs/neochatdeactivateaccountjob.h"
#include "neochatconfig.h" #include "neochatconfig.h"
#include "neochatroom.h" #include "neochatroom.h"
@@ -20,6 +19,7 @@
#include <Quotient/csapi/content-repo.h> #include <Quotient/csapi/content-repo.h>
#include <Quotient/csapi/profile.h> #include <Quotient/csapi/profile.h>
#include <Quotient/csapi/registration.h>
#include <Quotient/csapi/versions.h> #include <Quotient/csapi/versions.h>
#include <Quotient/database.h> #include <Quotient/database.h>
#include <Quotient/jobs/downloadfilejob.h> #include <Quotient/jobs/downloadfilejob.h>
@@ -220,18 +220,17 @@ bool NeoChatConnection::canCheckMutualRooms() const
void NeoChatConnection::changePassword(const QString &currentPassword, const QString &newPassword) void NeoChatConnection::changePassword(const QString &currentPassword, const QString &newPassword)
{ {
auto job = callApi<NeochatChangePasswordJob>(newPassword, false); auto job = callApi<ChangePasswordJob>(newPassword, false);
connect(job, &BaseJob::result, this, [this, job, currentPassword, newPassword] { connect(job, &BaseJob::result, this, [this, job, currentPassword, newPassword] {
if (job->error() == 103) { if (job->error() == 103) {
QJsonObject replyData = job->jsonData(); QJsonObject replyData = job->jsonData();
QJsonObject authData; AuthenticationData authData;
authData["session"_L1] = replyData["session"_L1]; authData.session = replyData["session"_L1].toString();
authData["password"_L1] = currentPassword; authData.type = "m.login.password"_L1;
authData["type"_L1] = "m.login.password"_L1; authData.authInfo["password"_L1] = currentPassword;
authData["user"_L1] = user()->id(); authData.authInfo["user"_L1] = user()->id();
QJsonObject identifier = {{"type"_L1, "m.id.user"_L1}, {"user"_L1, user()->id()}}; authData.authInfo["identifier"_L1] = QJsonObject{{"type"_L1, "m.id.user"_L1}, {"user"_L1, user()->id()}};
authData["identifier"_L1] = identifier; auto innerJob = callApi<ChangePasswordJob>(newPassword, false, authData);
NeochatChangePasswordJob *innerJob = callApi<NeochatChangePasswordJob>(newPassword, false, authData);
connect(innerJob, &BaseJob::success, this, [this]() { connect(innerJob, &BaseJob::success, this, [this]() {
Q_EMIT passwordStatus(PasswordStatus::Success); Q_EMIT passwordStatus(PasswordStatus::Success);
}); });