Add user to file room when joining it instead of when getting its token #2084
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The integration tests check that a user can join a file room again after leaving it, but the user is removed from the room when leaving it due to how the tests are written; in "the real world" leaving the room does not remove the user. The reason is that in the tests the room token is got by one user but the room is joined by a different user. Currently the user is added to the room as a permanent participant when getting the token instead of when joining the room, so in the tests the user that joins the room is a self-joined user that is removed once she leaves the room; in "the real world" the user would have needed to get the token of the file room, which would add her to the room and thus she would not be removed after leaving, only after explicitly removing herself. Due to all this the tests were changed to test joining the file room again after the user removes herself instead of after she leaves the room. Signed-off-by: Daniel Calviño Sánchez <[email protected]>
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
Member
Author
|
/backport to stable16 |
danxuliu
force-pushed
the
add-user-to-file-room-when-joining-it-instead-of-when-getting-its-token
branch
from
aa9b0a9 to
98ae590
Compare
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
This fixes the code so it behaves as stated in the documentation. In practice currently this should make no difference, as in the Files app the user joins the room immediately after getting its token; however, this makes possible to get the token without joining the room, which will be needed in the future to improve the UX of the Files app. Signed-off-by: Daniel Calviño Sánchez <[email protected]>
danxuliu
force-pushed
the
add-user-to-file-room-when-joining-it-instead-of-when-getting-its-token
branch
from
98ae590 to
878962d
Compare
delete-merged-branch
bot
deleted the
add-user-to-file-room-when-joining-it-instead-of-when-getting-its-token
branch
|
The backport to stable16 failed. Please do this backport manually. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow up to #1344
This fixes the code so it behaves as stated in the documentation.
In practice currently this should make no difference, as in the Files app the user joins the room immediately after getting its token; however, this makes possible to get the token without joining the room, which will be needed in the future to improve the UX of the Files app.
Besides the fix itself the integration tests were adjusted and extended.