Try to load a room by accessToken

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

Author: nickvergessen

Diff for: lib/Controller/RoomController.php

@@ -325,18 +325,30 @@ public function getSingleRoom(string $token): DataResponse {
 		$includeLastMessage = !$isSIPBridgeRequest;
 
 		try {
-			$sessionId = $this->session->getSessionForRoom($token);
-			$room = $this->manager->getRoomForUserByToken($token, $this->userId, $sessionId, $includeLastMessage, $isSIPBridgeRequest);
-
 			$participant = null;
-			try {
-				$participant = $this->participantService->getParticipant($room, $this->userId, $sessionId);
-			} catch (ParticipantNotFoundException $e) {
+
+			$isTalkFederation = $this->request->getHeader('X-Nextcloud-Federation');
+
+			if (!$isTalkFederation) {
+				$sessionId = $this->session->getSessionForRoom($token);
+				$room = $this->manager->getRoomForUserByToken($token, $this->userId, $sessionId, $includeLastMessage, $isSIPBridgeRequest);
+
 				try {
-					$participant = $this->participantService->getParticipantBySession($room, $sessionId);
+					$participant = $this->participantService->getParticipant($room, $this->userId, $sessionId);
 				} catch (ParticipantNotFoundException $e) {
+					try {
+						$participant = $this->participantService->getParticipantBySession($room, $sessionId);
+					} catch (ParticipantNotFoundException $e) {
+					}
 				}
+			} else {
+				$cloudId = urldecode($this->request->server['PHP_AUTH_USER']);
+				$accessToken = $this->request->server['PHP_AUTH_PW'];
+				$room = $this->manager->getRoomByRemoteAccess($token, Attendee::ACTOR_FEDERATED_USERS, $cloudId, $accessToken);
+				// FIXME continue on this
+				$participant = $this->participantService->getParticipantByActor($room, Attendee::ACTOR_FEDERATED_USERS, $cloudId);
 			}
+
 			$statuses = [];
 			if ($this->userId !== null
 				&& $this->appManager->isEnabledForUser('user_status')) {

Diff for: lib/Manager.php

@@ -732,6 +732,57 @@ public function getRoomByActor(string $token, string $actorType, string $actorId
 		return $room;
 	}
 
+	/**
+	 * @param string $token
+	 * @param string $actorType
+	 * @param string $actorId
+	 * @param string $remoteAccess
+	 * @return Room
+	 * @throws RoomNotFoundException
+	 */
+	public function getRoomByRemoteAccess(string $token, string $actorType, string $actorId, string $remoteAccess): Room {
+		$query = $this->db->getQueryBuilder();
+		$helper = new SelectHelper();
+		$helper->selectRoomsTable($query);
+		$helper->selectAttendeesTable($query);
+		$query->from('talk_rooms', 'r')
+			->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
+				$query->expr()->eq('a.actor_type', $query->createNamedParameter($actorType)),
+				$query->expr()->eq('a.actor_id', $query->createNamedParameter($actorId)),
+				$query->expr()->eq('a.access_token', $query->createNamedParameter($remoteAccess)),
+				$query->expr()->eq('a.room_id', 'r.id')
+			))
+			->where($query->expr()->eq('r.token', $query->createNamedParameter($token)));
+
+//		if ($sessionId !== null) {
+//			$helper->selectSessionsTable($query);
+//			$query->leftJoin('a', 'talk_sessions', 's', $query->expr()->andX(
+//				$query->expr()->eq('s.session_id', $query->createNamedParameter($sessionId)),
+//				$query->expr()->eq('a.id', 's.attendee_id')
+//			));
+//		}
+
+		$result = $query->executeQuery();
+		$row = $result->fetch();
+		$result->closeCursor();
+
+		if ($row === false) {
+			throw new RoomNotFoundException();
+		}
+
+		if ($row['token'] === null) {
+			// FIXME Temporary solution for the Talk6 release
+			throw new RoomNotFoundException();
+		}
+
+		$room = $this->createRoomObject($row);
+		if ($actorType === Attendee::ACTOR_FEDERATED_USERS && isset($row['actor_id'])) {
+			$room->setParticipant($row['actor_id'], $this->createParticipantObject($room, $row));
+		}
+
+		return $room;
+	}
+
 	/**
 	 * @param string $token
 	 * @param string|null $preloadUserId Load this participant's information if possible

Diff for: lib/Room.php

@@ -467,6 +467,7 @@ public function isFederatedRemoteRoom(): bool {
 	}
 
 	public function setParticipant(?string $userId, Participant $participant): void {
+		// FIXME Also used with cloudId, need actorType checking?
 		$this->currentUser = $userId;
 		$this->participant = $participant;
 	}