Skip to content
Merged
Show file tree
Hide file tree
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
ignore empty string when adding member
Signed-off-by: Maxence Lange <[email protected]>
  • Loading branch information
ArtificialOwl authored and backportbot[bot] committed Mar 25, 2025
commit 02f1746c77fbe8f926470d9c0a137e6893bc131e
12 changes: 8 additions & 4 deletions lib/Controller/LocalController.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
use OCA\Circles\Exceptions\FederatedUserNotFoundException;
use OCA\Circles\Exceptions\FrontendException;
use OCA\Circles\Exceptions\InvalidIdException;
use OCA\Circles\Exceptions\MemberNotFoundException;
use OCA\Circles\Exceptions\RequestBuilderException;
use OCA\Circles\Exceptions\SingleCircleNotFoundException;
use OCA\Circles\Model\FederatedUser;
Expand Down Expand Up @@ -273,10 +274,13 @@ public function membersAdd(string $circleId, array $members): DataResponse {
$federatedUsers = [];
foreach ($members as $member) {
// TODO: generate Multiple FederatedUsers using a single SQL request
$federatedUsers[] = $this->federatedUserService->generateFederatedUser(
$this->get('id', $member),
$this->getInt('type', $member)
);
try {
$federatedUsers[] = $this->federatedUserService->generateFederatedUser(
$this->get('id', $member),
$this->getInt('type', $member)
);
} catch (MemberNotFoundException) {
}
}

$result = $this->memberService->addMembers($circleId, $federatedUsers);
Expand Down
4 changes: 4 additions & 0 deletions lib/Service/FederatedUserService.php
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,10 @@ public function getFederatedUser(string $federatedId, int $type = Member::TYPE_S
* @return FederatedUser
*/
public function generateFederatedUser(string $federatedId, int $type = 0): FederatedUser {
if ($federatedId === '') {
throw new MemberNotFoundException('empty user id');
}

if ($type === Member::TYPE_MAIL) {
$federatedId = strtolower($federatedId);
}
Expand Down
Loading