Skip to content

[stable17] Fix password changes in link and mail shares #21158

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 10 commits into from
Jun 8, 2020
Merged

[stable17] Fix password changes in link and mail shares #21158

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b47bad2
Extend mail shares unit tests to check the password and mail template
danxuliu May 28, 2020
a7d833c
Fix creating a mail share with a password
danxuliu May 28, 2020
d040002
Fix enabling send password by Talk with empty password in link shares
danxuliu May 28, 2020
4e31174
Fix enabling send password by Talk with same password in mail shares
danxuliu May 28, 2020
f6bcabb
Fix disabling send password by Talk without new password in mail shares
danxuliu May 28, 2020
091da66
Remove unused variables
danxuliu May 28, 2020
0e2c92d
Generalize integration test steps to download last share
danxuliu May 28, 2020
146e43b
Add integration tests for creating and updating a mail share
danxuliu May 28, 2020
5f53688
Add integration tests for video verification
danxuliu May 28, 2020
eb1b893
Do not disable send password by Talk without setting new password in UI
danxuliu Jun 1, 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
Prev Previous commit
Do not disable send password by Talk without setting new password in UI 
Before it was possible to disable "send password by Talk" without
setting a new password, so the UI allowed that. Now that the server
prevents it the UI had to be adjusted to not update the share until a
new password is set when "send password by Talk" is disabled.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Jun 1, 2020
commit eb1b893fe5e8c7968c85be4817e4a8d7bc4124c3
2 changes: 1 addition & 1 deletion core/js/dist/share_backend.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/share_backend.js.map
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 6 additions & 12 deletions core/js/sharedialogshareelistview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,7 @@
shareNote: shareNote,
hasNote: shareNote !== '',
expireDate: moment(this.model.getExpireDate(shareIndex), 'YYYY-MM-DD').format('DD-MM-YYYY'),
// The password placeholder does not take into account if
// sending the password by Talk is enabled or not; when
// switching from sending the password by Talk to sending the
// password by email the password is reused and the share
// updated, so the placeholder already shows the password in the
// brief time between disabling sending the password by email
// and receiving the updated share.
passwordPlaceholder: hasPassword ? PASSWORD_PLACEHOLDER : PASSWORD_PLACEHOLDER_MESSAGE,
passwordPlaceholder: (hasPassword && !sendPasswordByTalk) ? PASSWORD_PLACEHOLDER : PASSWORD_PLACEHOLDER_MESSAGE,
passwordByTalkPlaceholder: (hasPassword && sendPasswordByTalk)? PASSWORD_PLACEHOLDER : PASSWORD_PLACEHOLDER_MESSAGE,
});
},
Expand Down Expand Up @@ -575,10 +568,11 @@
passwordContainer.toggleClass('hidden', !state);
} else if (state) {
if (passwordByTalkState) {
// Switching from sending the password by Talk to sending
// the password by mail can be done keeping the previous
// password sent by Talk.
this.model.updateShare(shareId, {sendPasswordByTalk: false});
// Disabling sending the password by Talk requires a new
// password to be given (the already set password is hashed,
// so it is not possible to send it by mail), so the share
// is not updated until the user explicitly gives the new
// password.

var passwordByTalkContainerClass = '.passwordByTalkMenu-' + this.cid + '-' + shareId;
var passwordByTalkContainer = $(passwordByTalkContainerClass);
Expand Down