Skip to content

Commit a9227d3

Browse files
committed
fix(dav): dav:remove-invalid-shares removing federated calendar shares
Signed-off-by: Richard Steinmetz <[email protected]>
1 parent 3aa0c23 commit a9227d3

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

apps/dav/lib/Command/RemoveInvalidShares.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
namespace OCA\DAV\Command;
1212

1313
use OCA\DAV\Connector\Sabre\Principal;
14+
use OCA\DAV\DAV\RemoteUserPrincipalBackend;
1415
use OCP\IDBConnection;
1516
use Symfony\Component\Console\Command\Command;
1617
use Symfony\Component\Console\Input\InputInterface;
@@ -24,6 +25,7 @@ class RemoveInvalidShares extends Command {
2425
public function __construct(
2526
private IDBConnection $connection,
2627
private Principal $principalBackend,
28+
private RemoteUserPrincipalBackend $remoteUserPrincipalBackend,
2729
) {
2830
parent::__construct();
2931
}
@@ -42,7 +44,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
4244

4345
while ($row = $result->fetch()) {
4446
$principaluri = $row['principaluri'];
45-
$p = $this->principalBackend->getPrincipalByPath($principaluri);
47+
$p = $this->principalBackend->getPrincipalByPath($principaluri)
48+
?? $this->remoteUserPrincipalBackend->getPrincipalByPath($principaluri);
4649
if ($p === null) {
4750
$this->deleteSharesForPrincipal($principaluri);
4851
}

0 commit comments

Comments
 (0)