From 12f2ea672876d770bc3f5d8f6b3e39d888b07162 Mon Sep 17 00:00:00 2001 From: Michael Schuster Date: Mon, 19 Aug 2019 20:40:30 +0200 Subject: [PATCH] Login Flow V2: remove static test url Signed-off-by: Michael Schuster --- src/gui/connectionvalidator.cpp | 3 --- src/gui/owncloudsetupwizard.cpp | 3 +-- src/libsync/networkjobs.h | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/gui/connectionvalidator.cpp b/src/gui/connectionvalidator.cpp index 27b1a4b9a..b2f04d9b5 100644 --- a/src/gui/connectionvalidator.cpp +++ b/src/gui/connectionvalidator.cpp @@ -233,9 +233,6 @@ void ConnectionValidator::checkServerCapabilities() QObject::connect(configJob, &JsonApiJob::jsonReceived, _account.data(), [=](const QJsonDocument &json) { ocsConfigReceived(json, account); - - /*int size = 0; - MessageBoxA(0, json.rawData(&size), "bla", MB_ICONINFORMATION);*/ }); configJob->start(); } diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp index 653894874..fbe07e8b2 100644 --- a/src/gui/owncloudsetupwizard.cpp +++ b/src/gui/owncloudsetupwizard.cpp @@ -105,10 +105,9 @@ void OwncloudSetupWizard::startWizard() { AccountPtr account = AccountManager::createAccount(); account->setCredentials(CredentialsFactory::create("dummy")); - account->setUrl(QUrl("https://127.0.0.1:8443/"));//Theme::instance()->overrideServerUrl()); + account->setUrl(Theme::instance()->overrideServerUrl()); _ocWizard->setAccount(account); _ocWizard->setOCUrl(account->url().toString()); -// _ocWizard->setOCUrl("https://127.0.0.1:8443/"); //account->url().toString()); _remoteFolder = Theme::instance()->defaultServerFolder(); // remoteFolder may be empty, which means / diff --git a/src/libsync/networkjobs.h b/src/libsync/networkjobs.h index 51d8df63d..d0829b463 100644 --- a/src/libsync/networkjobs.h +++ b/src/libsync/networkjobs.h @@ -413,7 +413,7 @@ public: OAuth, Shibboleth, WebViewFlow, - LoginFlowV2 + LoginFlowV2 }; explicit DetermineAuthTypeJob(AccountPtr account, QObject *parent = nullptr);