Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kamm <mail@ckamm.de>2017-11-09 13:04:12 +0300
committerckamm <mail@ckamm.de>2017-11-14 14:10:35 +0300
commit3ae2071129dbeb2d7df0263157c4f3e924d5f48a (patch)
treec6c4ee2088353ffe9de2febef501460a6b8d4dbc /src/gui/creds
parent820ebf4b6e03c8f8722c40f9346f80165cb71bcc (diff)
DetermineAuth: Remove concept of Unknown #6148
This restores 2.3 behavior. Some servers reply 404 to GETs and PROPFINDs to the remote.php/webdav/ url and used to work. Being more picky would break them.
Diffstat (limited to 'src/gui/creds')
-rw-r--r--src/gui/creds/httpcredentialsgui.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/gui/creds/httpcredentialsgui.cpp b/src/gui/creds/httpcredentialsgui.cpp
index e917f88c0..3c25c886a 100644
--- a/src/gui/creds/httpcredentialsgui.cpp
+++ b/src/gui/creds/httpcredentialsgui.cpp
@@ -46,15 +46,6 @@ void HttpCredentialsGui::askFromUserAsync()
// First, we will check what kind of auth we need.
auto job = new DetermineAuthTypeJob(_account->sharedFromThis(), this);
QObject::connect(job, &DetermineAuthTypeJob::authType, this, [this](DetermineAuthTypeJob::AuthType type) {
- if (type == DetermineAuthTypeJob::Unknown) {
- // network error, timeout, unsupported auth type?
- // This fallback exists for backwards compatibility reasons:
- // in versions before 2.4 we tried basic auth when the auth type
- // couldn't be determined.
- qCWarning(lcHttpCredentialsGui) << "Could not determine auth type, falling back to Basic";
- type = DetermineAuthTypeJob::Basic;
- }
-
if (type == DetermineAuthTypeJob::OAuth) {
_asyncAuth.reset(new OAuth(_account, this));
_asyncAuth->_expectedUser = _user;
@@ -69,7 +60,7 @@ void HttpCredentialsGui::askFromUserAsync()
// We will re-enter the event loop, so better wait the next iteration
QMetaObject::invokeMethod(this, "showDialog", Qt::QueuedConnection);
} else {
- // Unsupported auth type? Shibboleth?
+ // Shibboleth?
qCWarning(lcHttpCredentialsGui) << "Bad http auth type:" << type;
emit asked();
}