diff options
author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2020-11-09 16:20:36 +0300 |
---|---|---|
committer | Hannah von Reth <vonreth@kde.org> | 2020-11-10 14:13:39 +0300 |
commit | 3d5249d7e2b3d3865011508214425908a2575748 (patch) | |
tree | fdf836183241757c219ddf15add194e382aa6835 /src/gui/connectionvalidator.cpp | |
parent | dc1eebe074ed1049d6ff79653cd01cc815c96ab2 (diff) |
Revert "Add idp username, used for oidc authentication"
This reverts commit b9a0df55ad0677c354f84c6f9d0fa01a471f4713.
The issue of getting ocis internal identifier instead of the user name
was fixed in ocis.
Diffstat (limited to 'src/gui/connectionvalidator.cpp')
-rw-r--r-- | src/gui/connectionvalidator.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/gui/connectionvalidator.cpp b/src/gui/connectionvalidator.cpp index 8763dce7c..0e1125418 100644 --- a/src/gui/connectionvalidator.cpp +++ b/src/gui/connectionvalidator.cpp @@ -299,19 +299,14 @@ bool ConnectionValidator::setAndCheckServerVersion(const QString &version) void ConnectionValidator::slotUserFetched(const QJsonDocument &json) { - const auto data = json.object().value("ocs").toObject().value("data").toObject(); - const QString user = data.value("id").toString(); + QString user = json.object().value("ocs").toObject().value("data").toObject().value("id").toString(); if (!user.isEmpty()) { _account->setDavUser(user); } - const QString displayName = data.value("display-name").toString(); + QString displayName = json.object().value("ocs").toObject().value("data").toObject().value("display-name").toString(); if (!displayName.isEmpty()) { _account->setDavDisplayName(displayName); } - const QString userName = data.value("username").toString(); - if (!userName.isEmpty()) { - _account->setIdpUserName(userName); - } #ifndef TOKEN_AUTH_ONLY AvatarJob *job = new AvatarJob(_account, _account->davUser(), 128, this); job->setTimeout(20 * 1000); |