Skip to content

feat: implement IPartialShareProvider support #7501

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

Draft
salmart-dev wants to merge 2 commits into
base: main
Choose a base branch
from
+74 −2
Draft

feat: implement IPartialShareProvider support #7501

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
54518b2
feat: implement IPartialShareProvider support
salmart-dev Dec 30, 2025
51b3ff9
REMOVEME: test on top of IPartialMountProvider setup
salmart-dev Jan 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 .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
uses: actions/checkout@v4.2.2
with:
repository: nextcloud/server
ref: ${{ matrix.server-versions }}
ref: 'feature/54562/files-sharing-authoritative'
submodules: true

- name: Checkout app
Expand Down
74 changes: 73 additions & 1 deletion lib/Sharing/DeckShareProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
use OCP\Share\Exceptions\GenericShareException;
use OCP\Share\Exceptions\ShareNotFound;
use OCP\Share\IManager;
use OCP\Share\IPartialShareProvider;
use OCP\Share\IShare;

/** Taken from the talk shareapicontroller helper */
Expand All @@ -42,7 +43,7 @@
public function canAccessShare(IShare $share, string $user): bool;
}

class DeckShareProvider implements \OCP\Share\IShareProvider {
class DeckShareProvider implements \OCP\Share\IShareProvider, IPartialShareProvider {
public const DECK_FOLDER = '/Deck';
public const DECK_FOLDER_PLACEHOLDER = '/{DECK_PLACEHOLDER}';

Expand Down Expand Up @@ -419,7 +420,7 @@

$qb->executeStatement();

return $this->getShareById((int)$share->getId(), $recipient);

Check failure on line 423 in lib/Sharing/DeckShareProvider.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

InvalidArgument 

lib/Sharing/DeckShareProvider.php:423:30: InvalidArgument: Argument 1 of OCA\Deck\Sharing\DeckShareProvider::getShareById expects string, but int provided (see https://psalm.dev/004)
}

/**
Expand Down Expand Up @@ -772,6 +773,77 @@
return $shares;
}

/**
* @inheritDoc
*/
public function getSharedWithByPath(
string $userId,
int $shareType,
string $path,
bool $forChildren,
int $limit,
int $offset,
): iterable {
/** @var IShare[] $shares */
$shares = [];

$qb = $this->dbConnection->getQueryBuilder();
// s is the parent share, s2 the child
$qb->select('s.*', 's2.permissions AS s2_permissions', 's2.file_target AS s2_file_target',
'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
)
->selectAlias('st.id', 'storage_string_id')
->from('share', 's2')
->orderBy('s2.id')
->leftJoin('s2', 'share', 's', $qb->expr()->eq('s2.parent', 's.id'))
->leftJoin('s2', 'filecache', 'f', $qb->expr()->eq('s2.file_source', 'f.fileid'))
->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'))
->leftJoin('s2', 'deck_cards', 'dc', $qb->expr()->eq($qb->expr()
->castColumn('dc.id', IQueryBuilder::PARAM_STR), 's.share_with'));

if ($limit !== -1) {
$qb->setMaxResults($limit);
}

$qb->andWhere($qb->expr()->eq('s2.share_with', $qb->createNamedParameter($userId)))
->andWhere($qb->expr()->eq('s2.share_type',
$qb->createNamedParameter(IShare::TYPE_DECK_USER)))
->andWhere($qb->expr()->orX(
$qb->expr()->eq('s2.item_type', $qb->createNamedParameter('file')),
$qb->expr()->eq('s2.item_type', $qb->createNamedParameter('folder'))
));

if ($forChildren) {
$qb->andWhere($qb->expr()->like('s2.file_target', $qb->createNamedParameter($this->dbConnection->escapeLikeParameter($path) . '_%')));
} else {
$qb->andWhere($qb->expr()->eq('s2.file_target', $qb->createNamedParameter($path)));
}

$qb->andWhere($qb->expr()->eq('dc.deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));

$cursor = $qb->executeQuery();
while ($data = $cursor->fetch()) {
if (!$this->isAccessibleResult($data)) {
continue;
}

if ($offset > 0) {
$offset--;
continue;
}
$share = $this->createShareObject($data);
// patch the share with the user-specific information
$this->applyBoardPermission($share, (int)$data['s2_permissions'], $userId);
$share->setTarget($data['s2_file_target']);
$shares[] = $share;
}
$cursor->closeCursor();

return $shares;
}

/**
* Get shared with the card
*
Expand Down
Loading