Optionally return 409 when trying to join a second time

Signed-off-by: Joas Schilling <coding@schilljs.com>

1 files changed, 13 insertions, 1 deletions

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index ae071a028..4698dfa25 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1159,15 +1159,27 @@ class RoomController extends AEnvironmentAwareController {
 	 *
 	 * @param string $token
 	 * @param string $password
+	 * @param bool $force
 	 * @return DataResponse
 	 */
-	public function joinRoom(string $token, string $password = ''): DataResponse {
+	public function joinRoom(string $token, string $password = '', bool $force = true): DataResponse {
 		try {
 			$room = $this->manager->getRoomForParticipantByToken($token, $this->userId);
 		} catch (RoomNotFoundException $e) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
+		if ($force === false && $this->userId !== null) {
+			try {
+				$participant = $room->getParticipant($this->userId);
+				if ($participant->getSessionId() !== '0') {
+					return new DataResponse([], Http::STATUS_CONFLICT);
+				}
+			} catch (ParticipantNotFoundException $e) {
+				// All fine, carry on
+			}
+		}
+
 		$user = $this->userManager->get($this->userId);
 		try {
 			$result = $room->verifyPassword((string) $this->session->getPasswordForRoom($token));