Start with integration tests for invites

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

Author: nickvergessen

Diff for: lib/Controller/RoomController.php

@@ -67,6 +67,7 @@
 use OCP\User\Events\UserLiveStatusEvent;
 use OCP\UserStatus\IManager as IUserStatusManager;
 use OCP\UserStatus\IUserStatus;
+use Psr\Log\LoggerInterface;
 
 class RoomController extends AEnvironmentAwareController {
 	public const EVENT_BEFORE_ROOMS_GET = self::class . '::preGetRooms';
@@ -111,6 +112,8 @@ class RoomController extends AEnvironmentAwareController {
 	protected $talkConfig;
 	/** @var FederationManager */
 	protected $federationManager;
+	/** @var LoggerInterface */
+	protected $logger;
 
 	/** @var array */
 	protected $commonReadMessages = [];
@@ -135,7 +138,9 @@ public function __construct(string $appName,
 								IL10N $l10n,
 								IConfig $config,
 								Config $talkConfig,
-								ICloudIdManager $cloudIdManager) {
+								ICloudIdManager $cloudIdManager,
+								FederationManager $federationManager,
+								LoggerInterface $logger) {
 		parent::__construct($appName, $request);
 		$this->session = $session;
 		$this->appManager = $appManager;
@@ -156,6 +161,8 @@ public function __construct(string $appName,
 		$this->config = $config;
 		$this->talkConfig = $talkConfig;
 		$this->cloudIdManager = $cloudIdManager;
+		$this->federationManager = $federationManager;
+		$this->logger = $logger;
 	}
 
 	protected function getTalkHashHeader(): array {
@@ -1129,13 +1136,16 @@ public function addParticipantToRoom(string $newParticipant, string $source = 'u
 			$this->guestManager->sendEmailInvitation($this->room, $participant);
 
 			return new DataResponse($data);
-		} elseif ($source === 'remote') {
+		} elseif ($source === 'remotes') {
 			if (!$this->federationManager->isEnabled()) {
-				return new DataResponse([], Http::STATUS_BAD_REQUEST);
+				return new DataResponse([], Http::STATUS_NOT_IMPLEMENTED);
 			}
 			try {
 				$newUser = $this->cloudIdManager->resolveCloudId($newParticipant);
 			} catch (\InvalidArgumentException $e) {
+				$this->logger->error($e->getMessage(), [
+					'exception' => $e,
+				]);
 				return new DataResponse([], Http::STATUS_BAD_REQUEST);
 			}
 
@@ -1145,6 +1155,7 @@ public function addParticipantToRoom(string $newParticipant, string $source = 'u
 				'displayName' => $newUser->getDisplayId(),
 			];
 		} else {
+			$this->logger->error('Trying to add participant from unsupported source ' . $source);
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
 

Diff for: lib/Federation/FederationManager.php

@@ -88,7 +88,7 @@ public function __construct(
 	 */
 	public function isEnabled(): bool {
 		// TODO: Set to default true once implementation is complete
-		return $this->config->getAppValue(Application::APP_ID, 'federation_enabled', 'false') === 'true';
+		return $this->config->getAppValue(Application::APP_ID, 'federation_enabled', 'no') === 'yes';
 	}
 
 	/**

Diff for: tests/integration/features/bootstrap/FeatureContext.php

@@ -1069,7 +1069,7 @@ public function userChangesListableScopeOfTheRoom(string $user, string $identifi
 	}
 
 	/**
-	 * @Then /^user "([^"]*)" adds (user|group|email|circle) "([^"]*)" to room "([^"]*)" with (\d+) \((v4)\)$/
+	 * @Then /^user "([^"]*)" adds (user|group|email|circle|remote) "([^"]*)" to room "([^"]*)" with (\d+) \((v4)\)$/
 	 *
 	 * @param string $user
 	 * @param string $newType
@@ -1080,6 +1080,11 @@ public function userChangesListableScopeOfTheRoom(string $user, string $identifi
 	 */
 	public function userAddAttendeeToRoom(string $user, string $newType, string $newId, string $identifier, int $statusCode, string $apiVersion): void {
 		$this->setCurrentUser($user);
+
+		if ($newType === 'remote') {
+			$newId .= '@' . $this->baseUrl;
+		}
+
 		$this->sendRequest(
 			'POST', '/apps/spreed/api/' . $apiVersion . '/room/' . self::$identifierToToken[$identifier] . '/participants',
 			new TableNode([
@@ -2108,6 +2113,8 @@ public function sendRequest($verb, $url, $body = null, array $headers = []) {
 			$this->response = $client->{$verb}($fullUrl, $options);
 		} catch (ClientException $ex) {
 			$this->response = $ex->getResponse();
+		} catch (\GuzzleHttp\Exception\ServerException $ex) {
+			$this->response = $ex->getResponse();
 		}
 	}
 

Diff for: tests/integration/features/federation/invite.feature

@@ -0,0 +1,21 @@
+Feature: federation/invite
+  Background:
+    Given user "participant1" exists
+    Given user "participant2" exists
+
+  Scenario: federation is disabled
+    Given the following app config is set
+      | federation_enabled | no |
+    Given user "participant1" creates room "room" (v4)
+      | roomType | 3 |
+      | roomName | room |
+    And user "participant1" adds remote "participant2" to room "room" with 501 (v4)
+
+
+  Scenario: federation is enabled
+    Given the following app config is set
+      | federation_enabled | yes |
+    Given user "participant1" creates room "room" (v4)
+      | roomType | 3 |
+      | roomName | room |
+    And user "participant1" adds remote "participant2" to room "room" with 200 (v4)