diff options
author | Christian Kamm <mail@ckamm.de> | 2017-01-03 12:37:42 +0300 |
---|---|---|
committer | Christian Kamm <mail@ckamm.de> | 2017-01-03 12:38:20 +0300 |
commit | 22135f9f57a35944db6aacd8551807d03e3b00c8 (patch) | |
tree | a7d7c13f567cd139d679590b95c9a504464cd380 /src/gui/accountmanager.cpp | |
parent | 0fd06a225cb923a7b0d3ef21afba7dec97fa5564 (diff) |
Fixup broken authType on load #5408
Diffstat (limited to 'src/gui/accountmanager.cpp')
-rw-r--r-- | src/gui/accountmanager.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp index 86f5ca256..8e59278ad 100644 --- a/src/gui/accountmanager.cpp +++ b/src/gui/accountmanager.cpp @@ -214,6 +214,17 @@ AccountPtr AccountManager::loadAccountHelper(QSettings& settings) auto acc = createAccount(); QString authType = settings.value(QLatin1String(authTypeC)).toString(); + + // There was an account-type saving bug when 'skip folder config' was used + // See #5408. This attempts to fix up the "dummy" authType + if (authType == QLatin1String("dummy")) { + if (settings.contains(QLatin1String("http_user"))) { + authType = "http"; + } else if (settings.contains(QLatin1String("shibboleth_shib_user"))) { + authType = "shibboleth"; + } + } + QString overrideUrl = Theme::instance()->overrideServerUrl(); QString forceAuth = Theme::instance()->forceConfigAuthType(); if(!forceAuth.isEmpty() && !overrideUrl.isEmpty() ) { |