fix(dav): also allow unsharing of circle shares

miaulalala · miaulalala · commit 17ef20c5f393 · 2024-09-05T21:34:20.000+02:00
Signed-off-by: Anna Larch &lt;anna@nextcloud.com&gt;
diff --git a/apps/dav/lib/DAV/Sharing/Backend.php b/apps/dav/lib/DAV/Sharing/Backend.php
@@ -138,7 +138,7 @@ public function getShares(int $resourceId): array {
 				'status' => 1,
 				'readOnly' => (int)$row['access'] === Backend::ACCESS_READ,
 				'{http://owncloud.org/ns}principal' => (string)$row['principaluri'],
-				'{http://owncloud.org/ns}group-share' => isset($p['uri']) && str_starts_with($p['uri'], 'principals/groups')
+				'{http://owncloud.org/ns}group-share' => isset($p['uri']) && (str_starts_with($p['uri'], 'principals/groups') || str_starts_with($p['uri'], 'principals/circles'))
 			];
 		}
 		$this->shareCache->set((string)$resourceId, $shares);

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public function getShares(int $resourceId): array {`
`138`	`138`	`'status' => 1,`
`139`	`139`	`'readOnly' => (int)$row['access'] === Backend::ACCESS_READ,`
`140`	`140`	`'{http://owncloud.org/ns}principal' => (string)$row['principaluri'],`
`141`		`- '{http://owncloud.org/ns}group-share' => isset($p['uri']) && str_starts_with($p['uri'], 'principals/groups')`
	`141`	`+ '{http://owncloud.org/ns}group-share' => isset($p['uri']) && (str_starts_with($p['uri'], 'principals/groups') \|\| str_starts_with($p['uri'], 'principals/circles'))`
`142`	`142`	`];`
`143`	`143`	`}`
`144`	`144`	`$this->shareCache->set((string)$resourceId, $shares);`