Skip to content

[stable30] refactor(ShareApiController): Add more error handling #55487

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

Closed
backportbot wants to merge 1 commit into from
Closed

[stable30] refactor(ShareApiController): Add more error handling #55487

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
refactor(ShareApiController): Streamline share providers & add error … 
…logging

1. Consolidated the repetitive provider code into a clean loop

2. Added exception handling to log unexpected errors

Signed-off-by: nfebe <[email protected]>

[skip ci]
  • Loading branch information
@nfebe @backportbot
nfebe authored and backportbot[bot] committed Oct 1, 2025
commit 6f30a936aa0f455944d3bbd353f896e51f9ee2a4
11 changes: 8 additions & 3 deletions apps/files_sharing/lib/Controller/ShareAPIController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1685,7 +1685,14 @@ private function parseDate(string $expireDate): \DateTime {
* @throws ShareNotFound
*/
private function getShareById(string $id): IShare {
$share = null;
$providers = [
'ocinternal' => null, // No type check needed
'ocCircleShare' => IShare::TYPE_CIRCLE,
'ocMailShare' => IShare::TYPE_EMAIL,
'ocRoomShare' => null,
'deck' => IShare::TYPE_DECK,
'sciencemesh' => IShare::TYPE_SCIENCEMESH,
];

// First check if it is an internal share.
try {
Expand All @@ -1701,8 +1708,6 @@ private function getShareById(string $id): IShare {
$share = $this->shareManager->getShareById('ocCircleShare:' . $id, $this->currentUser);
return $share;
}
} catch (ShareNotFound $e) {
// Do nothing, just try the other share type
}

try {
Expand Down