mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-28 03:49:20 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5040 from nextcloud/bugfix/local-editing-fix-account-not-found

Browse source 
Fix account not found when doing local file editing.
This commit is contained in:
allexzander 2022-10-17 14:56:38 +03:00 committed by GitHub
commit 3022363f92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/application.cpp
View file

@ -763,7 +763,7 @@ void Application::handleEditLocally(const QUrl &url) const
}
// for a sample URL "nc://open/admin@nextcloud.lan:8080/Photos/lovely.jpg", QUrl::path would return "admin@nextcloud.lan:8080/Photos/lovely.jpg"
const auto accountDisplayName = pathSplit.takeFirst();
const auto userId = pathSplit.takeFirst();
const auto fileRemotePath = pathSplit.join('/');
const auto urlQuery = QUrlQuery{url};
@ -774,7 +774,7 @@ void Application::handleEditLocally(const QUrl &url) const
qCWarning(lcApplication) << "Invalid URL for file local editing: missing token";
}
FolderMan::instance()->editFileLocally(accountDisplayName, fileRemotePath, token);
FolderMan::instance()->editFileLocally(userId, fileRemotePath, token);
}
QString substLang(const QString &lang)

22
src/gui/folderman.cpp
View file

@ -1422,7 +1422,7 @@ void FolderMan::setDirtyNetworkLimits()
}
}
void FolderMan::editFileLocally(const QString &accountDisplayName, const QString &relPath, const QString &token)
void FolderMan::editFileLocally(const QString &userId, const QString &relPath, const QString &token)
{
const auto showError = [this](const OCC::AccountStatePtr accountState, const QString &errorMessage, const QString &subject) {
if (accountState && accountState->account()) {
@ -1449,15 +1449,27 @@ void FolderMan::editFileLocally(const QString &accountDisplayName, const QString
if (token.isEmpty()) {
qCWarning(lcFolderMan) << "Edit locally request is missing a valid token. Impossible to open the file.";
showError({}, tr("Edit locally request is not valid. Opening the file is forbidden."), accountDisplayName);
showError({}, tr("Edit locally request is not valid. Opening the file is forbidden."), userId);
return;
}
const auto accountFound = AccountManager::instance()->account(accountDisplayName);
const auto accountFound = [&userId]() {
for (const auto &account : AccountManager::instance()->accounts()) {
const auto isUserIdWithPort = userId.split(QLatin1Char(':')).size() > 1;
const auto port = isUserIdWithPort ? account->account()->url().port() : -1;
const auto portString = (port > 0 && port != 80 && port != 443) ? QStringLiteral(":%1").arg(port) : QStringLiteral("");
const QString davUserId = QStringLiteral("%1@%2").arg(account->account()->davUser(), account->account()->url().host()) + portString;
if (davUserId == userId) {
return account;
}
}
return AccountStatePtr{};
}();
if (!accountFound) {
qCWarning(lcFolderMan) << "Could not find an account " << accountDisplayName << " to edit file " << relPath << " locally.";
showError(accountFound, tr("Could not find an account for local editing"), accountDisplayName);
qCWarning(lcFolderMan) << "Could not find an account " << userId << " to edit file " << relPath << " locally.";
showError(accountFound, tr("Could not find an account for local editing"), userId);
return;
}

2
src/gui/folderman.h
View file

@ -214,7 +214,7 @@ public:
void setDirtyNetworkLimits();
/** opens a file with default app, if the file is present **/
void editFileLocally(const QString &accountDisplayName, const QString &relPath, const QString &token);
void editFileLocally(const QString &userId, const QString &relPath, const QString &token);
signals:
/**