Skip to content

👥 Multiple sessions 👥 #5194

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
PVince81 merged 41 commits into from
Mar 9, 2021
Merged

👥 Multiple sessions 👥 #5194

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
6d9c838
Replace the former unique attendee key with a normal index
nickvergessen Feb 17, 2021
4031c18
Prepare selecting the correct session in case there are multiple
nickvergessen Feb 17, 2021
1caca56
Don't load session on getRoomsForUser when not needed
nickvergessen Feb 18, 2021
0e20ca5
Don't load the session by default on getParticipantsForRoom
nickvergessen Feb 18, 2021
c97f55e
Group multiple sessions of the same attendee
nickvergessen Feb 18, 2021
6ad31df
Fix selecting the session when there could be multiple
nickvergessen Feb 18, 2021
783fb00
Don't clear previous sessions when joining
nickvergessen Feb 25, 2021
723d47f
Fix session selection in signaling code
nickvergessen Feb 18, 2021
a545cff
Only load sessions on the room list for this PHP session
nickvergessen Feb 25, 2021
6184127
Make the UI handle the call state on it's interactions instead of the…
nickvergessen Feb 25, 2021
6902e57
Show a "Connecting …" screen until we finished joining
nickvergessen Feb 25, 2021
5bff56f
Move listed rooms to API v4
nickvergessen Mar 3, 2021
79d52e6
Move lobby and SIP to v4
nickvergessen Mar 3, 2021
7673f4f
Move conversation creation to v4
nickvergessen Mar 3, 2021
1b4b1c6
Move get rooms to API v4
nickvergessen Mar 3, 2021
174789f
Check users on correct endpoint
nickvergessen Mar 4, 2021
8eae2e8
Move get participants to API v4
nickvergessen Mar 4, 2021
5ba0871
Add API version to files/share integration tests
nickvergessen Mar 4, 2021
e331d29
Make joining a room API v4
nickvergessen Mar 4, 2021
6c0246b
Make leaving a room API v4
nickvergessen Mar 4, 2021
3a680dc
Move removing paricipants to v4
nickvergessen Mar 4, 2021
db7c09e
Move deleting and getting a room to v4
nickvergessen Mar 4, 2021
0aedba5
Move room modifications to API v4
nickvergessen Mar 4, 2021
4aee4e9
Move other participant handling to API v4
nickvergessen Mar 4, 2021
7eaafce
Move other room APIs to v4
nickvergessen Mar 4, 2021
3fed42b
Move call API to v4
nickvergessen Mar 4, 2021
64a28fa
Chat, Settings and Guests are v1 api only atm
nickvergessen Mar 4, 2021
7b1a8ee
Document return types as well
nickvergessen Mar 4, 2021
ba52825
Statuses are integers now
nickvergessen Mar 4, 2021
8136513
We have the full room data already
nickvergessen Mar 4, 2021
5ed91b8
Add conversation-v4 capability
nickvergessen Mar 4, 2021
a3cf504
Move to APIv4
nickvergessen Mar 4, 2021
84fa567
Remove old API version handlings
nickvergessen Mar 4, 2021
5f29407
Check the participants on the correct endpoint
nickvergessen Mar 4, 2021
1dd9297
Fix integration tests by saving the attendee id or loading it
nickvergessen Mar 5, 2021
928e047
Handle all getParticipants with multi sessions
nickvergessen Mar 5, 2021
baa1547
Trespassing only with session
nickvergessen Mar 5, 2021
1bb090a
No duplicate session warning per se
nickvergessen Mar 8, 2021
2183ffc
Leaving with a session as guest is now also not quiting anymore
nickvergessen Mar 8, 2021
12a48be
Fix HPB missing event when a session is terminated only
nickvergessen Mar 8, 2021
1e9c21e
Fix removing yourself and promoting a stranger
nickvergessen Mar 9, 2021
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
Prev Previous commit
Next Next commit
Move lobby and SIP to v4 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Mar 8, 2021
commit 79d52e679187a9bb26965855f153815e763666b0
10 changes: 4 additions & 6 deletions appinfo/routes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,21 +437,19 @@
],
[
'name' => 'Room#setLobby',
'url' => '/api/{apiVersion}/room/{token}/{webinar}/lobby',
'url' => '/api/{apiVersion}/room/{token}/webinar/lobby',
'verb' => 'PUT',
'requirements' => [
'apiVersion' => 'v(1|2|3)',
'webinar' => 'webinary?',
'apiVersion' => 'v(4)',
'token' => '^[a-z0-9]{4,30}$',
],
],
[
'name' => 'Room#setSIPEnabled',
'url' => '/api/{apiVersion}/room/{token}/{webinar}/sip',
'url' => '/api/{apiVersion}/room/{token}/webinar/sip',
'verb' => 'PUT',
'requirements' => [
'apiVersion' => 'v3',
'webinar' => 'webinary?',
'apiVersion' => 'v(4)',
'token' => '^[a-z0-9]{4,30}$',
],
],
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/features/bootstrap/FeatureContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,15 +833,15 @@ public function userSetsTheRoomPassword($user, $password, $identifier, $statusCo
}

/**
* @When /^user "([^"]*)" sets lobby state for room "([^"]*)" to "([^"]*)" with (\d+)(?: \((v(1|2|3))\))?$/
* @When /^user "([^"]*)" sets lobby state for room "([^"]*)" to "([^"]*)" with (\d+) \((v4)\)$/
*
* @param string $user
* @param string $identifier
* @param string $lobbyStateString
* @param string $statusCode
* @param int $statusCode
* @param string $apiVersion
*/
public function userSetsLobbyStateForRoomTo($user, $identifier, $lobbyStateString, $statusCode, $apiVersion = 'v1') {
public function userSetsLobbyStateForRoomTo(string $user, string $identifier, string $lobbyStateString, int $statusCode, string $apiVersion) {
if ($lobbyStateString === 'no lobby') {
$lobbyState = 0;
} elseif ($lobbyStateString === 'non moderators') {
Expand All @@ -859,15 +859,15 @@ public function userSetsLobbyStateForRoomTo($user, $identifier, $lobbyStateStrin
}

/**
* @When /^user "([^"]*)" sets SIP state for room "([^"]*)" to "([^"]*)" with (\d+)(?: \((v(1|2|3))\))?$/
* @When /^user "([^"]*)" sets SIP state for room "([^"]*)" to "([^"]*)" with (\d+) \((v4)\)$/
*
* @param string $user
* @param string $identifier
* @param string $SIPStateString
* @param string $statusCode
* @param int $statusCode
* @param string $apiVersion
*/
public function userSetsSIPStateForRoomTo($user, $identifier, $SIPStateString, $statusCode, $apiVersion = 'v1') {
public function userSetsSIPStateForRoomTo(string $user, string $identifier, string $SIPStateString, int $statusCode, string $apiVersion) {
if ($SIPStateString === 'disabled') {
$SIPState = 0;
} elseif ($SIPStateString === 'enabled') {
Expand Down
68 changes: 34 additions & 34 deletions tests/integration/features/conversation/lobby.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ Feature: conversation/lobby
And user "participant1" adds "participant2" to room "room" with 200
And user "participant1" promotes "participant2" in room "room" with 200
And user "participant1" adds "participant3" to room "room" with 200
When user "participant1" sets lobby state for room "room" to "non moderators" with 200
And user "participant1" sets lobby state for room "room" to "no lobby" with 200
And user "participant2" sets lobby state for room "room" to "non moderators" with 200
And user "participant2" sets lobby state for room "room" to "no lobby" with 200
And user "participant3" sets lobby state for room "room" to "non moderators" with 403
And user "participant3" sets lobby state for room "room" to "no lobby" with 403
When user "participant1" sets lobby state for room "room" to "non moderators" with 200 (v4)
And user "participant1" sets lobby state for room "room" to "no lobby" with 200 (v4)
And user "participant2" sets lobby state for room "room" to "non moderators" with 200 (v4)
And user "participant2" sets lobby state for room "room" to "no lobby" with 200 (v4)
And user "participant3" sets lobby state for room "room" to "non moderators" with 403 (v4)
And user "participant3" sets lobby state for room "room" to "no lobby" with 403 (v4)

Scenario: set lobby state in public room
Given user "participant1" creates room "room"
Expand All @@ -31,27 +31,27 @@ Feature: conversation/lobby
And user "guest" joins room "room" with 200
And user "participant1" promotes "guest" in room "room" with 200
And user "guest2" joins room "room" with 200
When user "participant1" sets lobby state for room "room" to "non moderators" with 200
And user "participant1" sets lobby state for room "room" to "no lobby" with 200
And user "participant2" sets lobby state for room "room" to "non moderators" with 200
And user "participant2" sets lobby state for room "room" to "no lobby" with 200
And user "participant3" sets lobby state for room "room" to "non moderators" with 403
And user "participant3" sets lobby state for room "room" to "no lobby" with 403
And user "participant4" sets lobby state for room "room" to "non moderators" with 403
And user "participant4" sets lobby state for room "room" to "no lobby" with 403
And user "guest" sets lobby state for room "room" to "non moderators" with 401
And user "guest" sets lobby state for room "room" to "no lobby" with 401
And user "guest2" sets lobby state for room "room" to "non moderators" with 401
And user "guest2" sets lobby state for room "room" to "no lobby" with 401
When user "participant1" sets lobby state for room "room" to "non moderators" with 200 (v4)
And user "participant1" sets lobby state for room "room" to "no lobby" with 200 (v4)
And user "participant2" sets lobby state for room "room" to "non moderators" with 200 (v4)
And user "participant2" sets lobby state for room "room" to "no lobby" with 200 (v4)
And user "participant3" sets lobby state for room "room" to "non moderators" with 403 (v4)
And user "participant3" sets lobby state for room "room" to "no lobby" with 403 (v4)
And user "participant4" sets lobby state for room "room" to "non moderators" with 403 (v4)
And user "participant4" sets lobby state for room "room" to "no lobby" with 403 (v4)
And user "guest" sets lobby state for room "room" to "non moderators" with 401 (v4)
And user "guest" sets lobby state for room "room" to "no lobby" with 401 (v4)
And user "guest2" sets lobby state for room "room" to "non moderators" with 401 (v4)
And user "guest2" sets lobby state for room "room" to "no lobby" with 401 (v4)

Scenario: set lobby state in one-to-one room
Given user "participant1" creates room "room"
| roomType | 1 |
| invite | participant2 |
When user "participant1" sets lobby state for room "room" to "non moderators" with 400
And user "participant1" sets lobby state for room "room" to "no lobby" with 400
And user "participant2" sets lobby state for room "room" to "non moderators" with 400
And user "participant2" sets lobby state for room "room" to "no lobby" with 400
When user "participant1" sets lobby state for room "room" to "non moderators" with 400 (v4)
And user "participant1" sets lobby state for room "room" to "no lobby" with 400 (v4)
And user "participant2" sets lobby state for room "room" to "non moderators" with 400 (v4)
And user "participant2" sets lobby state for room "room" to "no lobby" with 400 (v4)

Scenario: set lobby state in file room
Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
Expand All @@ -60,17 +60,17 @@ Feature: conversation/lobby
And user "participant2" gets the room for path "welcome (2).txt" with 200
And user "participant1" joins room "file welcome.txt room" with 200
And user "participant2" joins room "file welcome (2).txt room" with 200
When user "participant1" sets lobby state for room "file welcome.txt room" to "non moderators" with 403
And user "participant1" sets lobby state for room "file welcome.txt room" to "no lobby" with 403
And user "participant2" sets lobby state for room "file welcome (2).txt room" to "non moderators" with 403
And user "participant2" sets lobby state for room "file welcome (2).txt room" to "no lobby" with 403
When user "participant1" sets lobby state for room "file welcome.txt room" to "non moderators" with 403 (v4)
And user "participant1" sets lobby state for room "file welcome.txt room" to "no lobby" with 403 (v4)
And user "participant2" sets lobby state for room "file welcome (2).txt room" to "non moderators" with 403 (v4)
And user "participant2" sets lobby state for room "file welcome (2).txt room" to "no lobby" with 403 (v4)

Scenario: set lobby state of a room not joined to
Given user "participant1" creates room "room"
| roomType | 3 |
| roomName | room |
When user "participant2" sets lobby state for room "room" to "non moderators" with 404
And user "participant2" sets lobby state for room "room" to "no lobby" with 404
When user "participant2" sets lobby state for room "room" to "non moderators" with 404 (v4)
And user "participant2" sets lobby state for room "room" to "no lobby" with 404 (v4)



Expand All @@ -81,7 +81,7 @@ Feature: conversation/lobby
And user "participant1" adds "participant2" to room "room" with 200
And user "participant1" promotes "participant2" in room "room" with 200
And user "participant1" adds "participant3" to room "room" with 200
When user "participant1" sets lobby state for room "room" to "non moderators" with 200
When user "participant1" sets lobby state for room "room" to "non moderators" with 200 (v4)
Then user "participant1" joins room "room" with 200
And user "participant2" joins room "room" with 200
And user "participant3" joins room "room" with 200
Expand All @@ -98,7 +98,7 @@ Feature: conversation/lobby
And user "participant1" adds "participant2" to room "room" with 200
And user "participant1" promotes "participant2" in room "room" with 200
And user "participant1" adds "participant3" to room "room" with 200
When user "participant1" sets lobby state for room "room" to "non moderators" with 200
When user "participant1" sets lobby state for room "room" to "non moderators" with 200 (v4)
Then user "participant1" joins room "room" with 200
And user "participant2" joins room "room" with 200
And user "participant3" joins room "room" with 200
Expand All @@ -124,7 +124,7 @@ Feature: conversation/lobby
And user "guest" joins room "room" with 200
And user "participant1" promotes "guest" in room "room" with 200
And user "guest2" joins room "room" with 200
When user "participant1" sets lobby state for room "room" to "non moderators" with 200
When user "participant1" sets lobby state for room "room" to "non moderators" with 200 (v4)
Then user "participant1" sends message "Message 1" to room "room" with 201
And user "participant2" sends message "Message 2" to room "room" with 201
And user "participant3" sends message "Message 3" to room "room" with 412
Expand Down Expand Up @@ -164,7 +164,7 @@ Feature: conversation/lobby
And user "guest" joins room "room" with 200
And user "participant1" promotes "guest" in room "room" with 200
And user "guest2" joins room "room" with 200
When user "participant1" sets lobby state for room "room" to "non moderators" with 200
When user "participant1" sets lobby state for room "room" to "non moderators" with 200 (v4)
Then user "participant1" joins call "room" with 200
And user "participant2" joins call "room" with 200
And user "participant3" joins call "room" with 412
Expand Down Expand Up @@ -195,7 +195,7 @@ Feature: conversation/lobby
And user "guest" joins room "room" with 200
And user "participant1" promotes "guest" in room "room" with 200
And user "guest2" joins room "room" with 200
When user "participant1" sets lobby state for room "room" to "non moderators" with 200
When user "participant1" sets lobby state for room "room" to "non moderators" with 200 (v4)
Then user "participant1" leaves room "room" with 200
And user "participant2" leaves room "room" with 200
And user "participant3" leaves room "room" with 200
Expand Down Expand Up @@ -228,7 +228,7 @@ Feature: conversation/lobby
And user "guest" joins room "room" with 200
And user "participant1" promotes "guest" in room "room" with 200
And user "guest2" joins room "room" with 200
When user "participant1" sets lobby state for room "room" to "non moderators" with 200
When user "participant1" sets lobby state for room "room" to "non moderators" with 200 (v4)
And user "participant1" sends message "Message 1" to room "room" with 201
And user "participant1" sets description for room "room" to "the description" with 200
Then user "participant1" is participant of room "room" (v3)
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/features/conversation/sip-dialin.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Feature: public
And user "participant1" is participant of the following rooms (v3)
| id | type | participantType | sipEnabled | attendeePin |
| room | 3 | 1 | 0 | |
When user "participant1" sets SIP state for room "room" to "enabled" with 200 (v3)
When user "participant1" sets SIP state for room "room" to "enabled" with 200 (v4)
Then user "participant1" is participant of the following rooms (v3)
| id | type | participantType | sipEnabled | attendeePin |
| room | 3 | 1 | 1 | **PIN** |
Expand All @@ -33,15 +33,15 @@ Feature: public
| 1 | 0 | users | participant1 | **PIN** |
| 3 | 0 | users | participant2 | **PIN** |
| 3 | 0 | users | participant3 | **PIN** |
When user "participant2" sets SIP state for room "room" to "disabled" with 403 (v3)
When user "participant2" sets SIP state for room "room" to "disabled" with 403 (v4)
Then user "participant1" sees the following attendees in room "room" with 200 (v3)
| participantType | inCall | actorType | actorId | attendeePin |
| 4 | 0 | emails | [email protected] | **PIN** |
| 4 | 0 | guests | "guest" | |
| 1 | 0 | users | participant1 | **PIN** |
| 3 | 0 | users | participant2 | **PIN** |
| 3 | 0 | users | participant3 | **PIN** |
When user "participant1" sets SIP state for room "room" to "disabled" with 200 (v3)
When user "participant1" sets SIP state for room "room" to "disabled" with 200 (v4)
Then user "participant1" sees the following attendees in room "room" with 200 (v3)
| participantType | inCall | actorType | actorId | attendeePin |
| 4 | 0 | emails | [email protected] | |
Expand All @@ -61,7 +61,7 @@ Feature: public
And user "participant2" is participant of the following rooms (v3)
| id | type | participantType | sipEnabled | attendeePin |
| room | 3 | 1 | 0 | |
When user "participant2" sets SIP state for room "room" to "enabled" with 403 (v3)
When user "participant2" sets SIP state for room "room" to "enabled" with 403 (v4)
And user "participant2" is participant of the following rooms (v3)
| id | type | participantType | sipEnabled | attendeePin |
| room | 3 | 1 | 0 | |