Skip to content

Conversation

@ChristophWurst
Copy link
Member

@ChristophWurst ChristophWurst commented May 12, 2020

Requires #21143

When enabling Talk verification the server expects also a new password
to be set. As we always just update one property at a time this means
the Talk verification was impossible to activate. With this patch, we
send the talk option AND the new password. If there is no new password,
the Talk option is disabled. When we finally have descriptive text on
ActionCheckbox'es we should definitely add some explanatory text for the
user. Right now this is as good as it gets. We'll have to backport to
18.

@ChristophWurst
Copy link
Member Author

/backport to stable19

@ChristophWurst
Copy link
Member Author

/backport to stable18

Copy link
Member

@danxuliu danxuliu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Preventing to enable Video verification if no new password is set should be applied only to mail shares. In public link shares it should be possible to enable and disable the video verification without changing the password.

Similarly, in mail shares it should be possible to disable Video verification without having to change the password. Only enabling Video verification should be prevented if a new password is not set.

@ChristophWurst ChristophWurst force-pushed the fix/share-talk-verification branch from 8586545 to 32135f8 Compare May 20, 2020 13:16
@ChristophWurst ChristophWurst requested a review from danxuliu May 20, 2020 13:16
@nickvergessen
Copy link
Member

@danxuliu re-review, so we can backport it for 19.0.1 at least?

ChristophWurst and others added 2 commits June 1, 2020 17:21
When enabling or disabling Talk verification in mail shares the server
expects also a new password to be set. As we always just update one
property at a time this means the Talk verification was impossible to
activate or deactivate. With this patch, we send the talk option AND the
new password. If there is no new password, the Talk option is disabled
(in mail shares; in link shares it is possible to enable or disable the
video verification without changing the password).

When we finally have descriptive text on ActionCheckbox'es we should
definitely add some explanatory text for the user. Right now this is as
good as it gets.

We'll have to backport to 18.

Signed-off-by: Christoph Wurst <[email protected]>
When video verification can not be enabled or disabled the previous
state is set again in the JavaScript share object. This ensures that the
UI will not reflect a misleading state.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu danxuliu force-pushed the fix/share-talk-verification branch from 32135f8 to fdac2ff Compare June 1, 2020 17:09
@danxuliu
Copy link
Member

danxuliu commented Jun 1, 2020

Although the password was sent along with sendPasswordByTalk it was always the password already set, so enabling video verification in mail shares still failed (well, it does after rebasing on #21143; before it did not, but if was a bug in the server, it should have failed :-P ). To fix this now the new password is sent (provided a new one has been set; otherwise the existing one is still sent, although this only happens for link shares).

Also, in #21143 the backend was changed to require a new password also when video verification was disabled (because otherwise only the hashed version of the existing password was available, which made no sense when sent in the e-mail). This pull request was also updated to require a new password also when disabling video verification.

Copy link
Member

@danxuliu danxuliu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works 👍

Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐘

@ChristophWurst ChristophWurst merged commit 497350a into master Jun 3, 2020
@ChristophWurst ChristophWurst deleted the fix/share-talk-verification branch June 3, 2020 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants