Delete apptoken after account removal.

Signed-off-by: allexzander <blackslayer4@gmail.com>

diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
index 165be3c97445d2caeca08efdc8116b83408d348d..150fa454513e05cf0d1b38a192f06c93ffd0473d 100644 (file)
--- a/src/gui/accountmanager.cpp
+++ b/src/gui/accountmanager.cpp
@@ -380,6 +380,8 @@ void AccountManager::deleteAccount(AccountState *account)
     // Forget E2E keys
     account->account()->e2e()->forgetSensitiveData(account->account());
 
+    account->account()->deleteAppToken();
+
     emit accountSyncConnectionRemoved(account);
     emit accountRemoved(account);
 }

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index 13e516400e3dc30b34ab0c0b4a4a89879da8e4f5..5b3289f1d65c9eca8b3c1a48c5edf5f22145af70 100644 (file)
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -23,6 +23,8 @@
 #include "pushnotifications.h"
 #include "version.h"
 
+#include <deletejob.h>
+
 #include "common/asserts.h"
 #include "clientsideencryption.h"
 
@@ -618,7 +620,8 @@ void Account::retrieveAppPassword(){
     job->start();
 }
 
-void Account::deleteAppPassword(){
+void Account::deleteAppPassword()
+{
     const QString kck = AbstractCredentials::keychainKey(
                 url().toString(),
                 credentials()->user() + app_password,
@@ -646,6 +649,25 @@ void Account::deleteAppPassword(){
     job->start();
 }
 
+void Account::deleteAppToken()
+{
+    const auto deleteAppTokenJob = new DeleteJob(sharedFromThis(), QStringLiteral("/ocs/v2.php/core/apppassword"));
+    connect(deleteAppTokenJob, &DeleteJob::finishedSignal, this, [this]() {
+        if (const auto deleteJob = qobject_cast<DeleteJob *>(QObject::sender())) {
+            const auto httpCode = deleteJob->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+            if (httpCode != 200) {
+                qCWarning(lcAccount) << "AppToken remove failed for user: " << displayName() << " with code: " << httpCode;
+            } else {
+                qCInfo(lcAccount) << "AppToken for user: " << displayName() << " has been removed.";
+            }
+        } else {
+            Q_ASSERT(false);
+            qCWarning(lcAccount) << "The sender is not a DeleteJob instance.";
+        }
+    });
+    deleteAppTokenJob->start();
+}
+
 void Account::fetchDirectEditors(const QUrl &directEditingURL, const QString &directEditingETag)
 {
     if(directEditingURL.isEmpty() || directEditingETag.isEmpty())

diff --git a/src/libsync/account.h b/src/libsync/account.h
index a95df40dd9589f81c3e5ba0992af59d75a8312b7..1b4e2d2e447700b3e73be35e1d7ab416d3c5edb2 100644 (file)
--- a/src/libsync/account.h
+++ b/src/libsync/account.h
@@ -245,6 +245,8 @@ public:
     void writeAppPasswordOnce(QString appPassword);
     void deleteAppPassword();
 
+    void deleteAppToken();
+
     /// Direct Editing
     // Check for the directEditing capability
     void fetchDirectEditors(const QUrl &directEditingURL, const QString &directEditingETag);