casraf/cospend-nc
1
0
Fork 0
mirror of https://github.com/chenasraf/cospend-nc.git synced 2026-05-17 17:38:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix federated unshare msg handling

Browse Source 
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
This commit is contained in:
Julien Veyssier
2024-09-08 22:46:11 +02:00
parent b17f54274d
commit eaadd37ca0
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Federation/CloudFederationProviderCospend.php
View File

@@ -195,31 +195,14 @@ class CloudFederationProviderCospend implements ICloudFederationProvider {
/**
* @throws ActionNotSupportedException
* @throws ShareNotFound
* @throws AuthenticationFailedException
* @throws DBException
* @throws MultipleObjectsReturnedException
* @throws ShareNotFound
*/
private function shareUnshared(string $providerId, array $notification): array {
$invite = $this->getInviteByRemoteProjectIdAndValidate($notification['remoteServerUrl'], $providerId, $notification['sharedSecret']);
try {
$room = $this->manager->getRoomById($invite->getLocalRoomId());
} catch (RoomNotFoundException) {
throw new ShareNotFound(FederationManager::OCM_RESOURCE_NOT_FOUND);
}
// Sanity check to make sure the room is a remote room
if (!$room->isFederatedConversation()) {
throw new ShareNotFound(FederationManager::OCM_RESOURCE_NOT_FOUND);
}
$this->invitationMapper->delete($invite);
try {
$participant = $this->participantService->getParticipantByActor($room, Attendee::ACTOR_USERS, $invite->getUserId());
$this->participantService->removeAttendee($room, $participant, AAttendeeRemovedEvent::REASON_REMOVED);
} catch (ParticipantNotFoundException) {
// Never accepted the invite
}
return [];
}
@@ -275,7 +258,7 @@ class CloudFederationProviderCospend implements ICloudFederationProvider {
$remoteServerUrl = preg_replace('/^https?:\/\//i', '', $remoteServerUrl);
try {
return $this->invitationMapper->getByRemoteAndToken($remoteServerUrl, $remoteProjectId, $sharedSecret);
return $this->invitationMapper->getByRemoteAndToken($remoteProjectId, $remoteServerUrl, $sharedSecret);
} catch (DoesNotExistException) {
throw new ShareNotFound(FederationManager::OCM_RESOURCE_NOT_FOUND);
}