Always reset access manager before resolving URLs and determining auth typework/check-basic-auth-creds-in-wizard

1 files changed, 5 insertions, 3 deletions

diff --git a/src/gui/newwizard/setupwizardcontroller.cpp b/src/gui/newwizard/setupwizardcontroller.cpp
index d28e0655f..5705c2a8e 100644
--- a/src/gui/newwizard/setupwizardcontroller.cpp
+++ b/src/gui/newwizard/setupwizardcontroller.cpp
@@ -89,9 +89,6 @@ void SetupWizardController::nextStep(std::optional<PageIndex> currentPage, std::
             // therefore we clear the certificates storage before resolving the URL
             _accountBuilder = {};
 
-            _accessManager->deleteLater();
-            _accessManager = new AccessManager(this);
-
             const auto *pagePtr = qobject_cast<ServerUrlSetupWizardPage *>(_currentPage);
 
             const auto serverUrl = [pagePtr]() {
@@ -190,6 +187,11 @@ void SetupWizardController::nextStep(std::optional<PageIndex> currentPage, std::
         });
 
         connect(messageBox, &QMessageBox::accepted, this, [this, showFirstPage]() {
+            // when moving back to this page (or retrying a failed credentials check), we need to make sure existing cookies
+            // and certificates are deleted from the access manager
+            _accessManager->deleteLater();
+            _accessManager = new AccessManager(this);
+
             // first, we must resolve the actual server URL
             auto resolveJob = Jobs::ResolveUrlJobFactory(_accessManager).startJob(_accountBuilder.serverUrl());