From 8c69bb70b3b0b357b29b0f45da5e8c91773696e6 Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Thu, 18 Mar 2021 11:26:07 +0100 Subject: Use uuid in socket api (cherry picked from commit 86f86acc1860b308e947188d821081be6dcf92c4) --- src/gui/socketapi/socketapi.cpp | 7 ++++--- src/gui/socketapi/socketuploadjob.cpp | 10 ++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'src/gui/socketapi') diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp index cc253cbdc..6e2c96ca1 100644 --- a/src/gui/socketapi/socketapi.cpp +++ b/src/gui/socketapi/socketapi.cpp @@ -848,10 +848,11 @@ void SocketApi::command_V2_LIST_ACCOUNTS(const QSharedPointer &j { QJsonArray out; for (auto acc : AccountManager::instance()->accounts()) { - // TODO: Use uuid once https://github.com/owncloud/client/pull/8397 is merged - out << QJsonObject({ { "name", acc->account()->displayName() }, { "id", acc->account()->id() } }); + out << QJsonObject({ { QStringLiteral("name"), acc->account()->displayName() }, + { QStringLiteral("id"), acc->account()->id() }, + { QStringLiteral("uuid"), acc->account()->uuid().toString(QUuid::WithoutBraces) } }); } - job->success({ { "accounts", out } }); + job->success({ { QStringLiteral("accounts"), out } }); } void SocketApi::command_V2_UPLOAD_FILES_FROM(const QSharedPointer &job) const diff --git a/src/gui/socketapi/socketuploadjob.cpp b/src/gui/socketapi/socketuploadjob.cpp index 467a46973..2e1b4f1ca 100644 --- a/src/gui/socketapi/socketuploadjob.cpp +++ b/src/gui/socketapi/socketuploadjob.cpp @@ -37,9 +37,15 @@ SocketUploadJob::SocketUploadJob(const QSharedPointer &job) } _pattern = job->arguments()[QLatin1String("pattern")].toString(); - // TODO: use uuid const auto accname = job->arguments()[QLatin1String("account")][QLatin1String("name")].toString(); - auto account = AccountManager::instance()->account(accname); + const auto accUUID = QUuid::fromString(job->arguments()[QLatin1String("account")][QLatin1String("uuid")].toString()); + AccountStatePtr account; + if (accUUID.isNull()) { + job->setWarning("Using the name as identifier is deprecated, please use the uuid"); + account = AccountManager::instance()->account(accname); + } else { + account = AccountManager::instance()->account(accUUID); + } if (!QFileInfo(_localPath).isAbsolute()) { job->failure(QStringLiteral("Local path must be a an absolute path")); -- cgit v1.2.3