From 767ec4ed59fd4e04458611f10ad78fd7009fbdfd Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Thu, 14 Nov 2013 17:54:38 +0100 Subject: [PATCH] Wizard: Support redirects again --- src/mirall/owncloudsetupwizard.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp index be110ac556..e31babf03e 100644 --- a/src/mirall/owncloudsetupwizard.cpp +++ b/src/mirall/owncloudsetupwizard.cpp @@ -134,13 +134,20 @@ void OwncloudSetupWizard::slotDetermineAuthType(const QString &urlString) void OwncloudSetupWizard::slotOwnCloudFoundAuth(const QUrl& url, const QVariantMap &info) { - qDebug() << Q_FUNC_INFO << url << CheckServerJob::versionString(info) << CheckServerJob::version(info); _ocWizard->appendToConfigurationLog(tr("Successfully connected to %1: %2 version %3 (%4)

") .arg(url.toString()) .arg(Theme::instance()->appNameGUI()) .arg(CheckServerJob::versionString(info)) .arg(CheckServerJob::version(info))); + if (url.path().endsWith("/status.php")) { + // We might be redirected, update the account + QUrl redirectedUrl = url; + redirectedUrl.setPath(url.path().left(url.path().length() - 11)); + _ocWizard->account()->setUrl(redirectedUrl); + qDebug() << Q_FUNC_INFO << " was redirected to" << redirectedUrl.toString(); + } + DetermineAuthTypeJob *job = new DetermineAuthTypeJob(_ocWizard->account(), this); connect(job, SIGNAL(authType(WizardCommon::AuthType)), _ocWizard, SLOT(setAuthType(WizardCommon::AuthType)));