Fix user management in password request rooms #4656
Merged
Conversation
This file contains 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
|
/backport to stable20 |
|
/backport to stable19 |
|
/backport to stable18 |
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 <danxuliu@gmail.com>
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This fixes a regression introduced in 4afa2d7. The active guests are only those who are currently in a call, and not those who are currently in the conversation. Therefore other guests or users were not prevented from joining a password request conversation if a guest was in the conversation but not in the call. Fortunately in practice this was not a problem, as the Web UI starts a call immediately after joining the conversation, which made the guest immediately active and thus prevented others from joining. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Only the owner and another participant will be allowed to join a password request room, so there is no point in being able to add more participants to those rooms. Although throwing the exception in the listener is enough to prevent adding the participants unhandled exceptions in the endpoint are returned as error 404, but the expected error would be 400. To minimize conflicts with other pull requests and backports it is explicitly checked if the room is a password request room instead of refactoring the code to handle the exception. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
danxuliu
force-pushed
the
fix-user-management-in-password-request-rooms
branch
from
83c138e to
44f3732
Compare
|
Sharing integration test failures are unrelated, see nextcloud/server#23820 (comment) |
7 tasks
nickvergessen
approved these changes
Nov 27, 2020
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
Tests pass locally: |
nickvergessen
deleted the
fix-user-management-in-password-request-rooms
branch
|
The backport to stable20 failed. Please do this backport manually. |
|
The backport to stable19 failed. Please do this backport manually. |
|
The backport to stable18 failed. Please do this backport manually. |
|
@danxuliu what about the backports |
This was referenced Dec 18, 2020
|
Done. |
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.
This fixes a regression introduced in 4afa2d7, as well as an UI fix that I thought that was a regression but seems to have been missing since the beginning 🤦.
The active guests are only those who are currently in a call, and not those who are currently in the conversation. Therefore other guests or users were not prevented from joining a password request conversation if a guest was in the conversation but not in the call.
Fortunately in practice this was not a problem, as the Web UI starts a call immediately after joining the conversation, which made the guest immediately active and thus prevented others from joining.
Besides that it adds integration tests for password request conversations.
Pending: