Set stream errors to be ignored during account creation/deletion

https://xmpp.org/extensions/xep-0077.html#usecases-cancel specifies the
usage of the stream error <not-authorized/>.
That is now handled as a valid response to the account deletion request
instead of a result IQ stanza or in addition to it.
The same applies to the stream error <conflict> since some servers send
that instead of the <not-authorized/> stream error.

There are servers closing the connection during account creation with a
<connection-timeout/> stream error.
That is now ignored.

src/client/QXmppClient.cpp

@@ -1,5 +1,6 @@
 // SPDX-FileCopyrightText: 2009 Manjeet Dahiya <[email protected]>
 // SPDX-FileCopyrightText: 2019 Linus Jahn <[email protected]>
+// SPDX-FileCopyrightText: 2023 Melvin Keskin <[email protected]>
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
@@ -123,6 +124,13 @@ QStringList QXmppClientPrivate::discoveryFeatures()
 
 void QXmppClientPrivate::onErrorOccurred(const QString &text, const QXmppOutgoingClient::ConnectionError &err, QXmppClient::Error oldError)
 {
+    // Skip stream errors that are valid during special procedures such as account
+    // creation/deletion.
+    if (const auto streamError = std::get_if<QXmpp::StreamError>(&err);
+        streamError && ignoredStreamErrors.contains(*streamError)) {
+        return;
+    }
+
     if (q->configuration().autoReconnectionEnabled()) {
         if (oldError == QXmppClient::XmppStreamError) {
             // if we receive a resource conflict, inhibit reconnection
@@ -931,6 +939,18 @@ bool QXmppClient::injectMessage(QXmppMessage &&message)
     return handled;
 }
 
+///
+/// Sets stream errors that are ignored if they occur.
+///
+/// \param errors stream errors to be ignored
+///
+/// \since QXmpp 1.9
+///
+void QXmppClient::setIgnoredStreamErrors(const QVector<QXmpp::StreamError> &errors)
+{
+    d->ignoredStreamErrors = errors;
+}
+
 ///
 /// Give extensions a chance to handle incoming stanzas.
 ///

src/client/QXmppClient.h

@@ -1,5 +1,6 @@
 // SPDX-FileCopyrightText: 2009 Manjeet Dahiya <[email protected]>
 // SPDX-FileCopyrightText: 2019 Linus Jahn <[email protected]>
+// SPDX-FileCopyrightText: 2023 Melvin Keskin <[email protected]>
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
@@ -11,6 +12,7 @@
 #include "QXmppPresence.h"
 #include "QXmppSendResult.h"
 #include "QXmppSendStanzaParams.h"
+#include "QXmppStreamError.h"
 
 #include <memory>
 #include <variant>
@@ -321,6 +323,8 @@ public Q_SLOTS:
     void injectIq(const QDomElement &element, const std::optional<QXmppE2eeMetadata> &e2eeMetadata);
     bool injectMessage(QXmppMessage &&message);
 
+    void setIgnoredStreamErrors(const QVector<QXmpp::StreamError> &);
+
 private Q_SLOTS:
     void _q_elementReceived(const QDomElement &element, bool &handled);
     void _q_reconnect();

src/client/QXmppClient_p.h

@@ -1,5 +1,6 @@
 // SPDX-FileCopyrightText: 2020 Manjeet Dahiya <[email protected]>
 // SPDX-FileCopyrightText: 2020 Linus Jahn <[email protected]>
+// SPDX-FileCopyrightText: 2023 Melvin Keskin <[email protected]>
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
@@ -40,6 +41,7 @@ class QXmppClientPrivate
     QXmppLogger *logger;
     /// Pointer to the XMPP stream
     QXmppOutgoingClient *stream;
+    QVector<QXmpp::StreamError> ignoredStreamErrors;
 
     QXmppE2eeExtension *encryptionExtension;
 

src/client/QXmppRegistrationManager.cpp

@@ -91,6 +91,7 @@ void QXmppRegistrationManager::deleteAccount()
     auto iq = QXmppRegisterIq::createUnregistrationRequest();
     d->deleteAccountIqId = iq.id();
 
+    client()->setIgnoredStreamErrors({ QXmpp::StreamError::Conflict, QXmpp::StreamError::NotAuthorized });
     client()->sendPacket(iq);
 }
 
@@ -174,6 +175,12 @@ bool QXmppRegistrationManager::registerOnConnectEnabled() const
 void QXmppRegistrationManager::setRegisterOnConnectEnabled(bool enabled)
 {
     d->registerOnConnectEnabled = enabled;
+
+    if (enabled) {
+        client()->setIgnoredStreamErrors({ QXmpp::StreamError::ConnectionTimeout });
+    } else {
+        client()->setIgnoredStreamErrors({});
+    }
 }
 
 /// \cond
@@ -258,8 +265,7 @@ bool QXmppRegistrationManager::handleStanza(const QDomElement &stanza)
 
             switch (iq.type()) {
             case QXmppIq::Result:
-                info(u"Account deleted successfully."_s);
-                Q_EMIT accountDeleted();
+                handleAccountDeleted();
                 client()->disconnectFromServer();
                 break;
             case QXmppIq::Error:
@@ -291,8 +297,14 @@ void QXmppRegistrationManager::onRegistered(QXmppClient *client)
         connect(disco, &QXmppDiscoveryManager::infoReceived, this, &QXmppRegistrationManager::handleDiscoInfo);
     }
 
-    connect(client, &QXmppClient::disconnected, this, [this]() {
+    connect(client, &QXmppClient::disconnected, this, [this, client]() {
         setSupportedByServer(false);
+        client->setIgnoredStreamErrors({});
+
+        if (!d->deleteAccountIqId.isEmpty()) {
+            handleAccountDeleted();
+            d->deleteAccountIqId.clear();
+        }
     });
 }
 
@@ -319,3 +331,9 @@ void QXmppRegistrationManager::setSupportedByServer(bool registrationSupported)
         Q_EMIT supportedByServerChanged();
     }
 }
+
+void QXmppRegistrationManager::handleAccountDeleted()
+{
+    info(u"Account deleted successfully."_s);
+    Q_EMIT accountDeleted();
+}

src/client/QXmppRegistrationManager.h

@@ -161,12 +161,10 @@ class QXmppRegistrationManagerPrivate;
 /// <h4>Filling out the registration form</h4>
 ///
 /// Now you need to fill out the registration form. The server can close the connection during that
-/// time. If that happens, QXmppClient::errorOccurred() is emitted with
-/// QXmpp::StreamError::ConnectionTimeout as its parameter. That is due to some servers kicking
-/// unauthorized clients after some time when the clients are inactive. That is often the case when
-/// user interaction is required before the completed form is submitted to the server. In order to
-/// support account creation for both servers closing the connection and servers keeping it open,
-/// you need to handle those cases appropriately.
+/// time. It is due to some servers kicking unauthorized clients after some time when the clients
+/// are inactive. That is often the case when user interaction is required before the completed form
+/// is submitted to the server. In order to support account creation for both servers closing the
+/// connection and servers keeping it open, you need to handle those cases appropriately.
 ///
 /// If the returned IQ contains a data form, that can be displayed to a user or
 /// can be filled out in another way.
@@ -339,11 +337,10 @@ class QXMPP_EXPORT QXmppRegistrationManager : public QXmppClientExtension
     void onRegistered(QXmppClient *client) override;
     void onUnregistered(QXmppClient *client) override;
 
-private Q_SLOTS:
-    void handleDiscoInfo(const QXmppDiscoveryIq &iq);
-
 private:
+    void handleDiscoInfo(const QXmppDiscoveryIq &iq);
     void setSupportedByServer(bool supportedByServer);
+    void handleAccountDeleted();
 
     const std::unique_ptr<QXmppRegistrationManagerPrivate> d;
 };