Skip to content
Draft
Changes from all commits
Commits
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
53 changes: 52 additions & 1 deletion lib/Sharing/DeckShareProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
use OCP\IL10N;
use OCP\Share\Exceptions\GenericShareException;
use OCP\Share\Exceptions\ShareNotFound;
use OCP\Share\IAttributes;
use OCP\Share\IManager;
use OCP\Share\IShare;

Expand Down Expand Up @@ -133,6 +134,11 @@ public function create(IShare $share) {
)
);*/

// set share attributes
$shareAttributes = $this->formatShareAttributes(
$share->getAttributes()
);

$shareId = $this->addShareToDB(
$share->getSharedWith(),
$share->getSharedBy(),
Expand All @@ -142,7 +148,8 @@ public function create(IShare $share) {
$share->getTarget(),
$share->getPermissions(),
$share->getToken() ?? '',
$share->getExpirationDate()
$share->getExpirationDate(),
$shareAttributes
);
$data = $this->getRawShare($shareId);

Expand All @@ -163,6 +170,7 @@ public function create(IShare $share) {
* @param int $permissions
* @param string $token
* @param \DateTime|null $expirationDate
* @param string|null $attributes
* @return int
*/
private function addShareToDB(
Expand Down Expand Up @@ -194,6 +202,10 @@ private function addShareToDB(
$qb->setValue('expiration', $qb->createNamedParameter($expirationDate, 'datetime'));
}

if ($attributes !== null) {
$qb->setValue('attributes', $qb->createNamedParameter($attributes));
}

$qb->executeStatement();

return $qb->getLastInsertId();
Expand Down Expand Up @@ -264,6 +276,9 @@ private function createShareObject(array $data): IShare {
$entryData['parent'] = $entryData['f_parent'];
$share->setNodeCacheEntry(Cache::cacheEntryFromData($entryData, $this->mimeTypeLoader));
}

$share = $this->updateShareAttributes($share, $data['attributes'] ?? null);

return $share;
}

Expand Down Expand Up @@ -1046,6 +1061,42 @@ public function getAllShares(): iterable {
$cursor->closeCursor();
}

protected function updateShareAttributes(IShare $share, ?string $data): IShare {
if ($data === null || $data === '') {
return $share;
}
$attributes = $share->getAttributes() ?? $share->newAttributes();
$compressedAttributes = \json_decode($data, true);
if ($compressedAttributes === false || $compressedAttributes === null) {
return $share;
}
foreach ($compressedAttributes as $compressedAttribute) {
$attributes->setAttribute(
$compressedAttribute[0],
$compressedAttribute[1],
$compressedAttribute[2]
);
}
$share->setAttributes($attributes);
return $share;
}

protected function formatShareAttributes(?IAttributes $attributes): ?string {
if ($attributes === null || empty($attributes->toArray())) {
return null;
}

$compressedAttributes = [];
foreach ($attributes->toArray() as $attribute) {
$compressedAttributes[] = [
0 => $attribute['scope'],
1 => $attribute['key'],
2 => $attribute['value']
];
}
return \json_encode($compressedAttributes) ?: null;
}

public function getOrphanedAttachmentShares(): array {
$allCardIds = $this->cardMapper->getAllCardIds();
$qb = $this->dbConnection->getQueryBuilder();
Expand Down