diff --git a/src/gui/creds/oauth.cpp b/src/gui/creds/oauth.cpp index 4980b8db980..bed210f4fde 100644 --- a/src/gui/creds/oauth.cpp +++ b/src/gui/creds/oauth.cpp @@ -22,6 +22,7 @@ #include <QJsonDocument> #include "theme.h" #include "networkjobs.h" +#include "creds/httpcredentials.h" namespace OCC { @@ -85,6 +86,8 @@ void OAuth::start() QString basicAuth = QString("%1:%2").arg( Theme::instance()->oauthClientId(), Theme::instance()->oauthClientSecret()); req.setRawHeader("Authorization", "Basic " + basicAuth.toUtf8().toBase64()); + // We just added the Authorization header, don't let HttpCredentialsAccessManager tamper with it + req.setAttribute(HttpCredentials::DontAddCredentialsAttribute, true); auto requestBody = new QBuffer; QUrlQuery arguments(QString( diff --git a/src/gui/wizard/owncloudoauthcredspage.cpp b/src/gui/wizard/owncloudoauthcredspage.cpp index 6d9ed4c75bb..83dff92d812 100644 --- a/src/gui/wizard/owncloudoauthcredspage.cpp +++ b/src/gui/wizard/owncloudoauthcredspage.cpp @@ -45,6 +45,7 @@ OwncloudOAuthCredsPage::OwncloudOAuthCredsPage() connect(_ui.openLinkButton, &QCommandLinkButton::clicked, [this] { _ui.errorLabel->hide(); + qobject_cast<OwncloudWizard *>(wizard())->account()->clearCookieJar(); // #6574 if (_asyncAuth) _asyncAuth->openBrowser(); });