feat(emails): Allow banning email guests

Signed-off-by: Joas Schilling <[email protected]>

lib/Controller/BanController.php

@@ -37,7 +37,7 @@ public function __construct(
 	 *
 	 * Required capability: `ban-v1`
 	 *
-	 * @param 'users'|'guests'|'ip' $actorType Type of actor to ban, or `ip` when banning a clients remote address
+	 * @param 'users'|'guests'|'emails'|'ip' $actorType Type of actor to ban, or `ip` when banning a clients remote address
 	 * @param string $actorId Actor ID or the IP address or range in case of type `ip`
 	 * @param string $internalNote Optional internal note (max. 4000 characters)
 	 * @return DataResponse<Http::STATUS_OK, TalkBan, array{}>|DataResponse<Http::STATUS_BAD_REQUEST, array{error: 'bannedActor'|'internalNote'|'moderator'|'self'|'room'}, array{}>

lib/Service/BanService.php

@@ -49,7 +49,7 @@ public function createBan(Room $room, string $moderatorActorType, string $modera
 			throw new \InvalidArgumentException('room');
 		}
 
-		if (!in_array($bannedActorType, [Attendee::ACTOR_USERS, Attendee::ACTOR_GUESTS, 'ip'], true)) {
+		if (!in_array($bannedActorType, [Attendee::ACTOR_USERS, Attendee::ACTOR_GUESTS, Attendee::ACTOR_EMAILS, 'ip'], true)) {
 			throw new \InvalidArgumentException('bannedActor');
 		}
 
@@ -81,7 +81,7 @@ public function createBan(Room $room, string $moderatorActorType, string $modera
 
 		/** @var ?string $displayname */
 		$displayname = null;
-		if (in_array($bannedActorType, [Attendee::ACTOR_USERS, Attendee::ACTOR_GUESTS], true)) {
+		if (in_array($bannedActorType, [Attendee::ACTOR_USERS, Attendee::ACTOR_EMAILS, Attendee::ACTOR_GUESTS], true)) {
 			try {
 				$bannedParticipant = $this->participantService->getParticipantByActor($room, $bannedActorType, $bannedActorId);
 				$displayname = $bannedParticipant->getAttendee()->getDisplayName();
@@ -120,7 +120,7 @@ public function createBan(Room $room, string $moderatorActorType, string $modera
 				// No failure if the banned actor is not in the room yet/anymore
 			}
 		}
-		
+
 		return $this->banMapper->insert($ban);
 	}
 
@@ -156,26 +156,30 @@ public function throwIfActorIsBanned(Room $room, ?string $userId): void {
 			$actorType = Attendee::ACTOR_USERS;
 			$actorId = $userId;
 		} else {
-			$actorType = Attendee::ACTOR_GUESTS;
-			$actorId = $this->talkSession->getGuestActorIdForRoom($room->getToken());
+			$actorId = $this->talkSession->getAuthedEmailActorIdForRoom($room->getToken());
+			if ($actorId !== null) {
+				$actorType = Attendee::ACTOR_EMAILS;
+			} else {
+				$actorId = $this->talkSession->getGuestActorIdForRoom($room->getToken());
+				$actorType = Attendee::ACTOR_GUESTS;
+			}
 		}
 
 		if ($actorId !== null) {
 			try {
 				$ban = $this->banMapper->findForBannedActorAndRoom($actorType, $actorId, $room->getId());
-				if ($actorType === Attendee::ACTOR_GUESTS) {
+				if (in_array($actorType, [Attendee::ACTOR_GUESTS, Attendee::ACTOR_EMAILS], true)) {
 					$this->copyBanForRemoteAddress($ban, $this->request->getRemoteAddress());
 				}
 				throw new ForbiddenException('actor');
 			} catch (DoesNotExistException) {
 			}
 		}
 
-		if ($actorType !== Attendee::ACTOR_GUESTS) {
+		if (!in_array($actorType, [Attendee::ACTOR_GUESTS, Attendee::ACTOR_EMAILS], true)) {
 			return;
 		}
 
-
 		$ipBans = $this->banMapper->findByRoomId($room->getId(), 'ip');
 
 		if (empty($ipBans)) {