Skip to content

[stable-33.0] fix(shares): Only acquire shares for target path #10729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
claucambra merged 2 commits into from
Sep 3, 2026
+31 −4
Merged

[stable-33.0] fix(shares): Only acquire shares for target path #10729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b8178f
fix(shares): Only acquire shares for target path
claucambra Sep 2, 2026
b5b6d12
fix(shares): Test that shares fetch happens only for a target path
claucambra Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/gui/sharemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ void ShareManager::createShare(const QString &path,
connect(job, &OcsJob::ocsError, this, &ShareManager::slotOcsError);
job->createShare(path, shareType, shareWith, validPermissions, password);
});
job->getSharedWithMe();
job->getSharedWithMe(path);
}

void ShareManager::createE2EeShareJob(const QString &fullRemotePath,
Expand Down
15 changes: 15 additions & 0 deletions test/sharetestutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,13 @@
const auto urlQuery = QUrlQuery(req.url());
const auto pathParam = urlQuery.queryItemValue(QStringLiteral("path"));
const auto resharesParam = urlQuery.queryItemValue(QStringLiteral("reshares"));
const auto sharedWithMeParam = urlQuery.queryItemValue(QStringLiteral("shared_with_me"));
const auto formatParam = urlQuery.queryItemValue(QStringLiteral("format"));

if (sharedWithMeParam == QStringLiteral("true")) {
_sharedWithMeRequestUrls.append(req.url());
}

if (formatParam != QStringLiteral("json") || (!pathParam.isEmpty() && !pathParam.endsWith(QString(testFileName)))) {
reply = new FakeErrorReply(op, req, this, 400, _fake400Response);
} else if (reqPath.contains(QStringLiteral("ocs/v2.php/apps/files_sharing/api/v1/shares"))) {
Expand Down Expand Up @@ -419,6 +424,16 @@
return _sharesReplyData.count();
}

const QList<QUrl> &ShareTestHelper::sharedWithMeRequestUrls() const

Check warning on line 427 in test/sharetestutils.cpp

View workflow job for this annotation

GitHub Actions / build

test/sharetestutils.cpp:427:37 [modernize-use-trailing-return-type] 

use a trailing return type for this function
{
return _sharedWithMeRequestUrls;
}

void ShareTestHelper::resetSharedWithMeRequestUrls()
{
_sharedWithMeRequestUrls.clear();
}

void ShareTestHelper::appendShareReplyData(const FakeShareDefinition &definition)
{
_sharesReplyData.append(definition.toShareJsonObject());
Expand Down
3 changes: 3 additions & 0 deletions test/sharetestutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#pragma once

#include <QObject>

Check failure on line 8 in test/sharetestutils.h

View workflow job for this annotation

GitHub Actions / build

test/sharetestutils.h:8:10 [clang-diagnostic-error] 

'QObject' file not found
#include <QJsonArray>
#include <QJsonObject>
#include <QJsonDocument>
Expand Down Expand Up @@ -96,6 +96,8 @@

const QByteArray createNewShare(const Share::ShareType shareType, const QString &shareWith, const QString &password);
[[nodiscard]] int shareCount() const;
[[nodiscard]] const QList<QUrl> &sharedWithMeRequestUrls() const;
void resetSharedWithMeRequestUrls();

signals:
void setupSucceeded();
Expand All @@ -122,6 +124,7 @@
QByteArray _fake200JsonResponse = R"({"ocs":{"data":[],"meta":{"message":"OK","status":"ok","statuscode":200}}})";

QJsonArray _sharesReplyData;
QList<QUrl> _sharedWithMeRequestUrls;
QVariantMap _fakeCapabilities;
QSet<int> _liveShareIds;
};
15 changes: 12 additions & 3 deletions test/testsharemodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/

#include "gui/filedetails/sharemodel.h"

Check failure on line 6 in test/testsharemodel.cpp

View workflow job for this annotation

GitHub Actions / build

test/testsharemodel.cpp:6:10 [clang-diagnostic-error] 

'gui/filedetails/sharemodel.h' file not found

#include <QTest>
#include <QAbstractItemModelTester>
#include <QSignalSpy>
#include <QDateTime>
#include <QFileInfo>
#include <QFlags>
#include <QDateTime>
#include <QSignalSpy>
#include <QTest>
#include <QTimeZone>
#include <QUrlQuery>

#include "sharetestutils.h"
#include "libsync/theme.h"
Expand Down Expand Up @@ -388,6 +389,7 @@
QVERIFY(sharesChanged.wait(5000));
QCOMPARE(helper.shareCount(), 1); // Check our test is working!
QCOMPARE(model.rowCount(), helper.shareCount() + 1); // Internal link share!
helper.resetSharedWithMeRequestUrls();

// Test if it gets added
model.createNewLinkShare();
Expand All @@ -406,6 +408,13 @@
QCOMPARE(helper.shareCount(), 3); // Check our test is working!
QCOMPARE(model.rowCount(), helper.shareCount() + 1); // Internal link share!

QVERIFY(!helper.sharedWithMeRequestUrls().isEmpty());
for (const auto &requestUrl : helper.sharedWithMeRequestUrls()) {
const auto requestedPath = QUrlQuery(requestUrl).queryItemValue(QStringLiteral("path"));
QVERIFY2(!requestedPath.isEmpty(), qPrintable(requestUrl.toString()));
QVERIFY2(requestedPath.endsWith(QString::fromLatin1(ShareTestHelper::testFileName)), qPrintable(requestUrl.toString()));
}

// Test if it's the type we wanted
const auto newUserGroupShareIndex = model.index(model.rowCount() - 1, 0, {});
QCOMPARE(newUserGroupShareIndex.data(ShareModel::ShareTypeRole).toInt(), Share::TypeEmail);
Expand Down
Loading