Skip to content

[stable20.1] Fix user management in password request rooms #4801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 7 commits into from
Dec 18, 2020
Merged

[stable20.1] Fix user management in password request rooms #4801

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
62559fc
Make possible to verify room data also for single rooms
danxuliu Nov 12, 2020
e0cb583
Add integration tests for password request rooms
danxuliu Nov 20, 2020
0b5bfe3
Fix additional participants being able to join a password request room
danxuliu Nov 20, 2020
08ab340
Fix owner being able to add more users to a password request room
danxuliu Nov 24, 2020
d144d1c
Inform the user if an error occurred when adding participants
danxuliu Nov 24, 2020
4bee184
Do not show the search box in password request rooms
danxuliu Nov 24, 2020
cf896b5
No participants means everything is okay
nickvergessen Nov 27, 2020
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
Next Next commit
Make possible to verify room data also for single rooms 
Until now it was possible to verify the room data when getting the full
room list with the "user is participant of the following rooms" step.
Now the same can be optionally done when using "user is participant of
room XXX" too.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Dec 18, 2020
commit 62559fc5bfee24a5774a23469d6881101f9ed512
31 changes: 28 additions & 3 deletions tests/integration/features/bootstrap/FeatureContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,14 @@ public function userIsParticipantOfRooms($user, TableNode $formData = null) {
return;
}

$this->assertRooms($rooms, $formData);
}

/**
* @param array $rooms
* @param TableNode $formData
*/
private function assertRooms($rooms, TableNode $formData) {
Assert::assertCount(count($formData->getHash()), $rooms, 'Room count does not match');
Assert::assertEquals($formData->getHash(), array_map(function ($room, $expectedRoom) {
$participantNames = array_map(function ($participant) {
Expand Down Expand Up @@ -204,10 +212,11 @@ public function userIsParticipantOfRooms($user, TableNode $formData = null) {
* @param string $user
* @param string $isOrNotParticipant
* @param string $identifier
* @param TableNode|null $formData
*/
public function userIsParticipantOfRoom($user, $isOrNotParticipant, $identifier) {
public function userIsParticipantOfRoom($user, $isOrNotParticipant, $identifier, TableNode $formData = null) {
if (strpos($user, 'guest') === 0) {
$this->guestIsParticipantOfRoom($user, $isOrNotParticipant, $identifier);
$this->guestIsParticipantOfRoom($user, $isOrNotParticipant, $identifier, $formData);

return;
}
Expand All @@ -231,6 +240,15 @@ public function userIsParticipantOfRoom($user, $isOrNotParticipant, $identifier)
foreach ($rooms as $room) {
if (self::$tokenToIdentifier[$room['token']] === $identifier) {
Assert::assertEquals($isParticipant, true, 'Room ' . $identifier . ' found in user´s room list');

if ($formData) {
$this->sendRequest('GET', '/apps/spreed/api/v1/room/' . self::$identifierToToken[$identifier]);

$rooms = [$this->getDataFromResponse($this->response)];

$this->assertRooms($rooms, $formData);
}

return;
}
}
Expand All @@ -242,15 +260,22 @@ public function userIsParticipantOfRoom($user, $isOrNotParticipant, $identifier)
* @param string $guest
* @param string $isOrNotParticipant
* @param string $identifier
* @param TableNode|null $formData
*/
private function guestIsParticipantOfRoom($guest, $isOrNotParticipant, $identifier) {
private function guestIsParticipantOfRoom($guest, $isOrNotParticipant, $identifier, TableNode $formData = null) {
$this->setCurrentUser($guest);
$this->sendRequest('GET', '/apps/spreed/api/v1/room/' . self::$identifierToToken[$identifier]);

$response = $this->getDataFromResponse($this->response);

$isParticipant = $isOrNotParticipant === 'is';

if ($formData) {
$rooms = [$response];

$this->assertRooms($rooms, $formData);
}

if ($isParticipant) {
$this->assertStatusCode($this->response, 200);
Assert::assertEquals(self::$userToSessionId[$guest], $response['sessionId']);
Expand Down