feature(signup): migrate simple-signup to standard browser

.gitignore

@@ -18,6 +18,7 @@ build*
 cscope.*
 tags
 t1.cfg
+.idea
 
 ## Ignore Visual Studio Code config & environment files
 

src/gui/CMakeLists.txt

@@ -166,6 +166,8 @@ set(client_SRCS
     proxyauthdialog.cpp
     tooltipupdater.h
     tooltipupdater.cpp
+    urischemehandler.h
+    urischemehandler.cpp
     notificationconfirmjob.h
     notificationconfirmjob.cpp
     guiutility.h
@@ -237,6 +239,8 @@ set(client_SRCS
     wizard/flow2authcredspage.cpp
     wizard/flow2authwidget.h
     wizard/flow2authwidget.cpp
+    wizard/providersignuppage.h
+    wizard/providersignuppage.cpp
     wizard/owncloudsetuppage.h
     wizard/owncloudsetuppage.cpp
     wizard/termsofservicecheckwidget.h

src/gui/application.cpp

@@ -1,3 +1,3 @@
 /*
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2014 ownCloud GmbH
@@ -15,13 +15,13 @@
 #include "configfile.h"
 #include "connectionvalidator.h"
 #include "creds/abstractcredentials.h"
-#include "editlocallymanager.h"
 #include "folder.h"
 #include "folderman.h"
 #include "logger.h"
 #include "pushnotifications.h"
 #include "socketapi/socketapi.h"
 #include "theme.h"
+#include "urischemehandler.h"
 
 #if defined(BUILD_UPDATER)
 #include "updater/ocupdater.h"
@@ -49,7 +49,6 @@
 #include <QMessageBox>
 #include <QDesktopServices>
 #include <QGuiApplication>
-#include <QUrlQuery>
 #include <QVersionNumber>
 #include <QRandomGenerator>
 #include <QHttp2Configuration>
@@ -124,7 +123,7 @@
 {
     ConfigFile configFile;
     const auto shouldTryToMigrate = configFile.shouldTryToMigrate();
     if (!shouldTryToMigrate) {
         qCInfo(lcApplication) << "This is not an upgrade/downgrade/migration. Proceed to read current application config file.";
         configFile.setMigrationPhase(ConfigFile::MigrationPhase::Done);
         return false;
@@ -300,7 +299,7 @@
                 qCDebug(lcApplication) << "Failed to move the old config directory to its new location (" << legacyDir << "to" << confDir << ")";
 
                 // Try to move the files one by one
                 if (QFileInfo(confDir).isDir() || QDir().mkdir(confDir)) {
                     const QStringList filesList = QDir(legacyDir).entryList(QDir::Files);
                     qCDebug(lcApplication) << "Will move the individual files" << filesList;
                     for (const auto &name : filesList) {
@@ -312,7 +311,7 @@
             } else {
 #ifndef Q_OS_WIN
                 // Create a symbolic link so a downgrade of the client would still find the config.
                 QFile::link(confDir, legacyDir);
 #endif
             }
         }
@@ -418,7 +417,7 @@
     _gui->setupCloudProviders();
 #endif
 
     if (_theme->doNotUseProxy()) {
         ConfigFile().setProxyType(QNetworkProxy::NoProxy);
         const auto &allAccounts = AccountManager::instance()->accounts();
         for (const auto &accountState : allAccounts) {
@@ -476,7 +475,7 @@
 
     _gui->createTray();
 
-    handleEditLocallyFromOptions();
+    handleUriFromOptions();
 
 #ifdef Q_OS_MACOS
     // If any sync folder needs sandbox reapproval after upgrading to v33+,
@@ -600,7 +599,7 @@
         const auto foldersRestoreMessage = foldersListSize > 1
             ? tr("%1 folders", "number of folders imported").arg(QString::number(foldersListSize))
             : tr("1 folder");
         const auto messageBox = new QMessageBox(QMessageBox::Information,
                                                 tr("Legacy import"),
                                                 tr("Imported %1 and %2 from a legacy desktop client.\n%3",
                                                    "number of accounts and folders imported. list of users.")
@@ -617,7 +616,7 @@
     qCWarning(lcApplication) << accountsListSize << "account(s) migrated:" << prettyNamesList(accounts);
 }
 
 void Application::setupConfigFile()
 {
     // Migrate from version <= 2.4
     setApplicationName(_theme->appNameGUI());
@@ -656,7 +655,7 @@
             const QStringList filesList = QDir(oldDir).entryList(QDir::Files);
             qCDebug(lcApplication) << "Will move the individual files" << filesList;
             for (const auto &name : filesList) {
                 if (!QFile::rename(oldDir + "/" + name,  confDir + "/" + name)) {
                     qCDebug(lcApplication) << "Fallback move of " << name << "also failed";
                 }
             }
@@ -669,9 +668,9 @@
     }
 }
 
 AccountManager::AccountsRestoreResult Application::restoreLegacyAccount()
 {
     ConfigFile cfg;
     const auto tryMigrate = cfg.overrideServerUrl().isEmpty();
     auto accountsRestoreResult = AccountManager::AccountsRestoreFailure;
     if (accountsRestoreResult = AccountManager::instance()->restore(tryMigrate);
@@ -748,7 +747,7 @@
 // FIXME: This is not ideal yet since a ConnectionValidator might already be running and is in
 // progress of timing out in some seconds.
 // Maybe we need 2 validators, one triggered by timer, one by network configuration changes?
 void Application::slotSystemOnlineConfigurationChanged()
 {
     if (QNetworkInformation::instance()->reachability() == QNetworkInformation::Reachability::Site ||
             QNetworkInformation::instance()->reachability() == QNetworkInformation::Reachability::Online) {
@@ -844,7 +843,7 @@
             qApp->quit();
         }
 
-        handleEditLocallyFromOptions();
+        handleUriFromOptions();
 
         if (AccountSetupCommandLineManager::instance()->isCommandLineParsed()) {
             AccountSetupCommandLineManager::instance()->setupAccountFromCommandLine();
@@ -931,18 +930,21 @@
         } else if (option.endsWith(QStringLiteral(APPLICATION_DOTVIRTUALFILE_SUFFIX))) {
             // virtual file, open it after the Folder were created (if the app is not terminated)
             QTimer::singleShot(0, this, [this, option] { openVirtualFile(option); });
-        } else if (option.startsWith(QStringLiteral(APPLICATION_URI_HANDLER_SCHEME "://open"))) {
-            // see the section Local file editing of the Architecture page of the user documentation
-            _editFileLocallyUrl = QUrl::fromUserInput(option);
-            if (!_editFileLocallyUrl.isValid()) {
-                _editFileLocallyUrl.clear();
-                const auto errorParsingLocalFileEditingUrl = QStringLiteral("The supplied url for local file editing '%1' is invalid!").arg(option);
-                qCInfo(lcApplication) << errorParsingLocalFileEditingUrl;
-                showHint(errorParsingLocalFileEditingUrl.toStdString());
+        } else if (option.startsWith(QStringLiteral(APPLICATION_URI_HANDLER_SCHEME "://"))) {
+            _uriSchemeUrl = QUrl{option};
+            qCInfo(lcApplication) << "Command line contains custom URI scheme request:"
+                                  << "scheme=" << _uriSchemeUrl.scheme()
+                                  << "host=" << _uriSchemeUrl.host()
+                                  << "path=" << _uriSchemeUrl.path();
+            if (!_uriSchemeUrl.isValid()) {
+                _uriSchemeUrl.clear();
+                const auto errorParsingUri = QStringLiteral("The supplied url '%1' is invalid!").arg(option);
+                qCInfo(lcApplication) << errorParsingUri;
+                showHint(errorParsingUri.toStdString());
             }
         } else if (option == QStringLiteral("--overrideserverurl")) {
             if (it.hasNext() && !it.peekNext().startsWith(QLatin1String("--"))) {
                 const auto overrideUrl = it.next();
                 const auto isUrlValid = (overrideUrl.startsWith(QStringLiteral("http://")) || overrideUrl.startsWith(QStringLiteral("https://")))
                     && QUrl::fromUserInput(overrideUrl).isValid();
                 if (!isUrlValid) {
@@ -1071,14 +1073,19 @@
     _helpOnly = true;
 }
 
-void Application::handleEditLocallyFromOptions()
+void Application::handleUriFromOptions()
 {
-    if (!_editFileLocallyUrl.isValid()) {
+    if (!_uriSchemeUrl.isValid()) {
+        qCDebug(lcApplication) << "No pending custom URI scheme request from command line options.";
         return;
     }
 
-    EditLocallyManager::instance()->handleRequest(_editFileLocallyUrl);
-    _editFileLocallyUrl.clear();
+    qCInfo(lcApplication) << "Dispatching pending custom URI scheme request from command line options:"
+                          << "scheme=" << _uriSchemeUrl.scheme()
+                          << "host=" << _uriSchemeUrl.host()
+                          << "path=" << _uriSchemeUrl.path();
+    UriSchemeHandler::handleUri(_uriSchemeUrl);
+    _uriSchemeUrl.clear();
 }
 
 QString enforcedLanguage()
@@ -1138,7 +1145,7 @@
         if (!qtTranslator->load(qtTrFile, qtTrPath)) {
             if (!qtTranslator->load(qtTrFile, trPath)) {
                 if (!qtTranslator->load(qtBaseTrFile, qtTrPath)) {
                     if (!qtTranslator->load(qtBaseTrFile, trPath)) {
                         qCDebug(lcApplication()) << "impossible to load Qt translation catalog" << qtBaseTrFile;
                     }
                 }
@@ -1239,8 +1246,11 @@
         } else if (!openEvent->url().isEmpty() && openEvent->url().isValid()) {
             // On macOS, Qt does not handle receiving a custom URI as it does on other systems (as an application argument).
             // Instead, it sends out a QFileOpenEvent. We therefore need custom handling for our URI handling on macOS.
-            qCInfo(lcApplication) << "macOS: Opening local file for editing: " << openEvent->url();
-            EditLocallyManager::instance()->handleRequest(openEvent->url());
+            qCInfo(lcApplication) << "macOS QFileOpenEvent contains custom URI scheme request:"
+                                  << "scheme=" << openEvent->url().scheme()
+                                  << "host=" << openEvent->url().host()
+                                  << "path=" << openEvent->url().path();
+            UriSchemeHandler::handleUri(openEvent->url());
         } else {
             const auto errorParsingLocalFileEditingUrl = QStringLiteral("The supplied url for local file editing '%1' is invalid!").arg(openEvent->url().toString());
             qCInfo(lcApplication) << errorParsingLocalFileEditingUrl;

src/gui/application.h

@@ -50,7 +50,7 @@
  * @brief The Application class
  * @ingroup gui
  */
 class Application : public QApplication
 {
     Q_OBJECT
 public:
@@ -109,13 +109,13 @@
     void slotCleanup();
     void slotAccountStateAdded(OCC::AccountState *accountState);
     void slotAccountStateRemoved(OCC::AccountState *accountState);
     void slotSystemOnlineConfigurationChanged();
     void slotGuiIsShowingSettings();
 
 private:
     void setHelp();
 
-    void handleEditLocallyFromOptions();
+    void handleUriFromOptions();
 
     AccountManager::AccountsRestoreResult restoreLegacyAccount();
     void setupConfigFile();
@@ -153,7 +153,7 @@
     bool _userTriggeredConnect = false;
     bool _debugMode = false;
     bool _backgroundMode = false;
-    QUrl _editFileLocallyUrl;
+    QUrl _uriSchemeUrl;
 
     ClientProxy _proxy;
 

src/gui/cocoainitializer_mac.mm

@@ -10,7 +10,9 @@
 #import <AppKit/NSApplication.h>
 
 #include "application.h"
-#include "editlocallymanager.h"
+#include "urischemehandler.h"
+
+#include <QTimer>
 
 /* In theory, we should be able to just capture QFileOpenEvents
  * when we open our custom URLs in our Application class and be
@@ -51,7 +53,21 @@ - (void)handleURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEv
 {
     NSURL* url = [NSURL URLWithString:[[event paramDescriptorForKeyword:keyDirectObject] stringValue]];
     const auto qtUrl = QUrl::fromNSURL(url);
-    OCC::EditLocallyManager::instance()->handleRequest(qtUrl);
+    qCInfo(OCC::lcApplication) << "macOS AppleEvent contains custom URI scheme request:"
+                               << "scheme=" << qtUrl.scheme()
+                               << "host=" << qtUrl.host()
+                               << "path=" << qtUrl.path();
+    if (qApp) {
+        QTimer::singleShot(0, qApp, [qtUrl] {
+            qCInfo(OCC::lcApplication) << "Dispatching macOS AppleEvent custom URI scheme request:"
+                                       << "scheme=" << qtUrl.scheme()
+                                       << "host=" << qtUrl.host()
+                                       << "path=" << qtUrl.path();
+            OCC::UriSchemeHandler::handleUri(qtUrl);
+        });
+    } else {
+        qCWarning(OCC::lcApplication) << "Could not dispatch macOS AppleEvent custom URI scheme request because qApp is not available yet.";
+    }
 }
 
 @end

src/gui/creds/flow2auth.cpp

@@ -1,3 +1,3 @@
 /*
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: GPL-2.0-or-later
@@ -8,7 +8,6 @@
 #include "abstractnetworkjob.h"
 #include "account.h"
 #include "config.h"
-#include "configfile.h"
 #include "guiutility.h"
 #include "networkjobs.h"
 #include "theme.h"
@@ -21,16 +20,23 @@
 #include <QJsonObject>
 #include <QJsonDocument>
 
+#include <chrono>
+
 namespace OCC {
 
 Q_LOGGING_CATEGORY(lcFlow2auth, "nextcloud.sync.credentials.flow2auth", QtInfoMsg)
 
+namespace {
+constexpr auto loginFlowV2PollInterval = std::chrono::seconds(1);
+}
 
 Flow2Auth::Flow2Auth(Account *account, QObject *parent)
     : QObject(parent)
     , _account(account)
 {
-    _pollTimer.setInterval(1000);
+    _pollTimer.setInterval(static_cast<int>(
+        std::chrono::duration_cast<std::chrono::milliseconds>(loginFlowV2PollInterval).count()));
+    _pollTimer.setTimerType(Qt::PreciseTimer);
     QObject::connect(&_pollTimer, &QTimer::timeout, this, &Flow2Auth::slotPollTimerTimeout);
 }
 
@@ -79,7 +85,7 @@
     request.setHeader(QNetworkRequest::ContentLengthHeader, "0");
     request.setHeader(QNetworkRequest::UserAgentHeader, Utility::userAgentString());
 
     auto job = _account->sendRequest("POST", loginV2url, request);
     job->setTimeout(qMin(30 * 1000ll, job->timeoutMsec()));
 
     QObject::connect(job, &SimpleNetworkJob::finishedSignal, this, [this, action](QNetworkReply *reply) {
@@ -101,7 +107,7 @@
         _loginUrl = loginUrl;
 
         if (_account->isUsernamePrefillSupported()) {
             constexpr auto setUserNameForLogin = [] (const auto &userName, auto &loginUrl) -> void {
                 auto query = QUrlQuery(loginUrl);
                 query.addQueryItem(QStringLiteral("user"), userName);
                 loginUrl.setQuery(query);
@@ -117,10 +123,12 @@
         _pollToken = pollToken;
         _pollEndpoint = pollEndpoint;
 
-        // Start polling
-        std::chrono::milliseconds polltime = ConfigFile().remotePollInterval();
-        qCInfo(lcFlow2auth) << "setting remote poll timer interval to" << polltime.count() << "msec";
-        _secondsInterval = (polltime.count() / 1000);
+        // Start polling. Login Flow v2 is an interactive handshake, so use a
+        // short interval instead of the global remote sync poll interval.
+        qCInfo(lcFlow2auth) << "setting login flow v2 poll timer interval to"
+                            << std::chrono::duration_cast<std::chrono::milliseconds>(loginFlowV2PollInterval).count()
+                            << "msec";
+        _secondsInterval = loginFlowV2PollInterval.count();
         _secondsLeft = _secondsInterval;
         emit statusChanged(PollStatus::statusPollCountdown, _secondsLeft);
 
@@ -128,7 +136,7 @@
             _pollTimer.start();
         }
 
         switch (action) {
         case actionOpenBrowser:
             // Try to open Browser
             if (!Utility::openBrowser(authorisationLink())) {
@@ -169,10 +177,10 @@
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
 
     auto requestBody = new QBuffer;
     QUrlQuery arguments(QStringLiteral("token=%1").arg(_pollToken));
     requestBody->setData(arguments.query(QUrl::FullyEncoded).toLatin1());
 
     auto job = _account->sendRequest("POST", _pollEndpoint, request, requestBody);
     job->setTimeout(qMin(30 * 1000ll, job->timeoutMsec()));
 
     QObject::connect(job, &SimpleNetworkJob::finishedSignal, this, [this](QNetworkReply *reply) {
@@ -219,7 +227,7 @@
     });
 }
 
 QJsonObject Flow2Auth::handleResponse(QNetworkReply *reply)
 {
     const auto jsonData = reply->readAll();
     QJsonParseError jsonParseError{};

src/gui/owncloudsetupwizard.cpp

@@ -1,10 +1,10 @@
 /*
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2012 ownCloud GmbH
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "accessmanager.h"
 #include "account.h"
 #include "accountmanager.h"
 #include "clientproxy.h"
@@ -17,6 +17,7 @@
 #include "owncloudsetupwizard.h"
 #include "owncloudpropagator_p.h"
 #include "sslerrordialog.h"
+#include "wizard/flow2authcredspage.h"
 #include "wizard/owncloudwizard.h"
 #include "wizard/owncloudwizardcommon.h"
 #include "account.h"
@@ -91,6 +92,30 @@
     owncloudSetupWizard->startWizard();
 }
 
+void OwncloudSetupWizard::runWizardForLoginFlow(QObject *obj, const char *amember, const QUrl &serverUrl, QWidget *parent)
+{
+#if defined ENFORCE_SINGLE_ACCOUNT
+    if (!AccountManager::instance()->accounts().isEmpty()) {
+        return;
+    }
+#endif
+
+    if (!owncloudSetupWizard.isNull()) {
+        qCInfo(lcWizard) << "Restarting existing setup wizard for URI login flow.";
+        FolderMan::instance()->setSyncEnabled(false);
+        owncloudSetupWizard->startWizardForLoginFlow(serverUrl);
+        bringWizardToFrontIfVisible();
+        return;
+    }
+
+    owncloudSetupWizard = new OwncloudSetupWizard(parent);
+    connect(owncloudSetupWizard, SIGNAL(ownCloudWizardDone(int)), obj, amember);
+    connect(owncloudSetupWizard->_ocWizard, &OwncloudWizard::wizardClosed, obj, [] { owncloudSetupWizard.clear(); });
+
+    FolderMan::instance()->setSyncEnabled(false);
+    owncloudSetupWizard->startWizardForLoginFlow(serverUrl);
+}
+
 bool OwncloudSetupWizard::bringWizardToFrontIfVisible()
 {
     if (owncloudSetupWizard.isNull()) {
@@ -103,14 +128,35 @@
 
 void OwncloudSetupWizard::startWizard()
 {
-    AccountPtr account = AccountManager::createAccount();
-    account->setCredentials(CredentialsFactory::create("dummy"));
     const auto defaultUrl =
         Theme::instance()->multipleOverrideServers() ? QString{} : Theme::instance()->overrideServerUrl();
-    account->setUrl(defaultUrl);
+    initializeWizardAccount(QUrl{defaultUrl});
+
+    const auto isEnforcedServerSetup =
+        Theme::instance()->startLoginFlowAutomatically() && Theme::instance()->forceOverrideServerUrl() && !_ocWizard->account()->url().isEmpty();
+
+#ifdef WITH_PROVIDERS
+    const auto startPage = isEnforcedServerSetup ? WizardCommon::Page_ServerSetup : WizardCommon::Page_Welcome;
+#else // WITH_PROVIDERS
+    const auto startPage = WizardCommon::Page_ServerSetup;
+#endif // WITH_PROVIDERS
+    openWizardAtPage(startPage);
+}
+
+void OwncloudSetupWizard::startWizardForLoginFlow(const QUrl &serverUrl)
+{
+    initializeWizardAccount(serverUrl);
+    _ocWizard->_credentialsPage = _ocWizard->_flow2CredsPage;
+    openWizardAtPage(WizardCommon::Page_Flow2AuthCreds);
+}
+
+void OwncloudSetupWizard::initializeWizardAccount(const QUrl &serverUrl)
+{
+    AccountPtr account = AccountManager::createAccount();
+    account->setCredentials(CredentialsFactory::create("dummy"));
+    account->setUrl(serverUrl);
     _ocWizard->setAccount(account);
     _ocWizard->setOCUrl(account->url().toString());
-
     _remoteFolder = Theme::instance()->defaultServerFolder();
     // remoteFolder may be empty, which means /
     QString localFolder = Theme::instance()->defaultClientFolder();
@@ -132,15 +178,10 @@
     // remember the local folder to compare later if it changed, but clean first
     _initLocalFolder = Utility::trailingSlashPath(QDir::fromNativeSeparators(localFolder));
     _ocWizard->setRemoteFolder(_remoteFolder);
+}
 
-    const auto isEnforcedServerSetup =
-        Theme::instance()->startLoginFlowAutomatically() && Theme::instance()->forceOverrideServerUrl() && !account->url().isEmpty();
-
-#ifdef WITH_PROVIDERS
-    const auto startPage = isEnforcedServerSetup ? WizardCommon::Page_ServerSetup : WizardCommon::Page_Welcome;
-#else // WITH_PROVIDERS
-    const auto startPage = WizardCommon::Page_ServerSetup;
-#endif // WITH_PROVIDERS
+void OwncloudSetupWizard::openWizardAtPage(WizardCommon::Pages startPage)
+{
     _ocWizard->setStartId(startPage);
     _ocWizard->restart();
     _ocWizard->adjustWizardSize();
@@ -155,7 +196,7 @@
     account->setUrl(serverURL);
 
     account->setProxyType(proxySettings._proxyType);
     switch (proxySettings._proxyType)
     {
     case QNetworkProxy::HttpCachingProxy:
     case QNetworkProxy::FtpCachingProxy:
@@ -166,7 +207,7 @@
         account->networkAccessManager()->setProxy({QNetworkProxy::NoProxy});
         break;
     case QNetworkProxy::Socks5Proxy:
     case QNetworkProxy::HttpProxy:
         account->setProxyHostName(proxySettings._host);
         account->setProxyPort(proxySettings._port);
         account->setProxyNeedsAuth(proxySettings._needsAuth == WizardProxySettingsDialog::ProxyAuthentication::AuthenticationRequired);
@@ -406,11 +447,11 @@
     job->setFollowRedirects(false);
     job->setProperties(QList<QByteArray>() << "getlastmodified");
     connect(job, &PropfindJob::result, _ocWizard, &OwncloudWizard::successfulStep);
     connect(job, &PropfindJob::finishedWithError, this, [this] (QNetworkReply *reply) -> void {
         if (reply && reply->error() == QNetworkReply::ContentAccessDenied) {
             // A 403 might indicate that the terms of service need to be signed.
             // catch this special case here, fall back to the standard error handler if it's not TOS-related
             auto davException = OCC::getExceptionFromReply(reply);
             if (!davException.first.isEmpty() && davException.first == QStringLiteral(R"(OCA\TermsOfService\TermsNotSignedException)")) {
                 // authentication was successful, but the user hasn't signed the terms of service yet.  Prompt for that in the next step
                 qCInfo(lcWizard) << "Terms of service not accepted yet!  Will prompt the user in the next step";
@@ -444,7 +485,7 @@
 
         // strip the expected path
         QString path = redirectUrl.path();
         static QString expectedPath = u'/' + _ocWizard->account()->davPath();
         if (path.endsWith(expectedPath)) {
             path.chop(expectedPath.size());
             redirectUrl.setPath(path);

src/gui/owncloudsetupwizard.h

@@ -7,16 +7,18 @@
 #ifndef OWNCLOUDSETUPWIZARD_H
 #define OWNCLOUDSETUPWIZARD_H
 
 #include <QObject>
 #include <QWidget>
 #include <QProcess>
 #include <QNetworkReply>
 #include <QPointer>
+#include <QUrl>
 
 #include "accountfwd.h"
 #include "theme.h"
 #include "networkjobs.h"
 
+#include "wizard/owncloudwizardcommon.h"
 #include "wizard/wizardproxysettingsdialog.h"
 
 namespace OCC {
@@ -30,12 +32,13 @@
  * @brief The OwncloudSetupWizard class
  * @ingroup gui
  */
 class OwncloudSetupWizard : public QObject
 {
     Q_OBJECT
 public:
     /** Run the wizard */
     static void runWizard(QObject *obj, const char *amember, QWidget *parent = nullptr);
+    static void runWizardForLoginFlow(QObject *obj, const char *amember, const QUrl &serverUrl, QWidget *parent = nullptr);
     static bool bringWizardToFrontIfVisible();
 
 signals:
@@ -67,6 +70,9 @@
     explicit OwncloudSetupWizard(QObject *parent = nullptr);
     ~OwncloudSetupWizard() override;
     void startWizard();
+    void startWizardForLoginFlow(const QUrl &serverUrl);
+    void initializeWizardAccount(const QUrl &serverUrl);
+    void openWizardAtPage(WizardCommon::Pages startPage);
     void testOwnCloudConnect();
     void createRemoteFolder();
     void finalizeSetup(bool);