web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blob password change UI

Browse Source
This commit is contained in:
yflory 2019-10-31 12:12:45 +01:00
parent 96cf6971ce
commit b4c9c7700f
2 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
www/common/common-ui-elements.js
View File

@ -553,13 +553,15 @@ define([
if (!data.noEditPassword && owned && parsed.type !== "sheet") { // FIXME SHEET fix password change for sheets if (!data.noEditPassword && owned && parsed.type !== "sheet") { // FIXME SHEET fix password change for sheets
var sframeChan = common.getSframeChannel(); var sframeChan = common.getSframeChannel();
var changePwTitle = Messages.properties_changePassword;
var changePwConfirm = Messages.properties_confirmChange;
var isSharedFolder = parsed.type === 'drive';
var isFile = parsed.hashData.type === 'file'; var isFile = parsed.hashData.type === 'file';
var isSharedFolder = parsed.type === 'drive';
var changePwTitle = Messages.properties_changePassword;
var changePwConfirm = isFile ? Messages.properties_confirmChangeFile : Messages.properties_confirmChange;
if (!hasPassword) { if (!hasPassword) {
changePwTitle = Messages.properties_addPassword; changePwTitle = Messages.properties_addPassword;
changePwConfirm = Messages.properties_confirmNew; changePwConfirm = isFile ? Messages.properties_confirmNewFile : Messages.properties_confirmNew;
} }
$('<label>', {'for': 'cp-app-prop-change-password'}) $('<label>', {'for': 'cp-app-prop-change-password'})
.text(changePwTitle).appendTo($d); .text(changePwTitle).appendTo($d);
@ -585,20 +587,44 @@ define([
if (!yes) { pLocked = false; return; } if (!yes) { pLocked = false; return; }
$(passwordOk).html('').append(h('span.fa.fa-spinner.fa-spin', {style: 'margin-left: 0'})); $(passwordOk).html('').append(h('span.fa.fa-spinner.fa-spin', {style: 'margin-left: 0'}));
var q = isFile ? 'Q_BLOB_PASSWORD_CHANGE' : 'Q_PAD_PASSWORD_CHANGE'; var q = isFile ? 'Q_BLOB_PASSWORD_CHANGE' : 'Q_PAD_PASSWORD_CHANGE';
// If this is a file password change, register to the upload events:
// * if there is a pending upload, ask if we shoudl interrupt
// * display upload progress
var onPending;
var onProgress;
if (isFile) {
onPending = sframeChan.on('Q_BLOB_PASSWORD_CHANGE_PENDING', function (data, cb) {
onPending.stop();
UI.confirm(Messages.upload_uploadPending, function (yes) {
cb({cancel: yes});
});
});
onProgress = sframeChan.on('EV_BLOB_PASSWORD_CHANGE_PROGRESS', function (data) {
if (typeof (data) !== "number") { return; }
var p = Math.round(data);
$(passwordOk).text(p + '%');
});
}
sframeChan.query(q, { sframeChan.query(q, {
teamId: typeof(owned) !== "boolean" ? owned : undefined, teamId: typeof(owned) !== "boolean" ? owned : undefined,
href: data.href || data.roHref, href: data.href || data.roHref,
password: newPass password: newPass
}, function (err, data) { }, function (err, data) {
$(passwordOk).text(Messages.properties_changePasswordButton);
pLocked = false;
if (err || data.error) { if (err || data.error) {
console.error(err || data.error); console.error(err || data.error);
pLocked = false;
$(passwordOk).text(Messages.properties_changePasswordButton);
return void UI.alert(Messages.properties_passwordError); return void UI.alert(Messages.properties_passwordError);
} }
UI.findOKButton().click(); UI.findOKButton().click();
if (isFile) { if (isFile) {
return void UI.alert(Messages.properties_passwordSuccess); onProgress.stop();
$(passwordOk).text(Messages.properties_changePasswordButton);
var alertMsg = data.warning ? Messages.properties_passwordWarningFile
: Messages.properties_passwordSuccessFile;
return void UI.alert(alertMsg, undefined, {force: true});
} }
// If we didn't have a password, we have to add the /p/ // If we didn't have a password, we have to add the /p/
// If we had a password and we changed it to a new one, we just have to reload // If we had a password and we changed it to a new one, we just have to reload

9
www/common/sframe-common-outer.js
View File

@ -993,12 +993,13 @@ define([
sframeChan.on('Q_BLOB_PASSWORD_CHANGE', function (data, cb) { sframeChan.on('Q_BLOB_PASSWORD_CHANGE', function (data, cb) {
data.href = data.href || window.location.href; data.href = data.href || window.location.href;
var onPending = function () { var onPending = function (cb) {
// XXX sframeChan.query('Q_BLOB_PASSWORD_CHANGE_PENDING', null, function (err, obj) {
if (obj && obj.cancel) { cb(); }
});
}; };
var updateProgress = function (p) { var updateProgress = function (p) {
// XXX sframeChan.event('EV_BLOB_PASSWORD_CHANGE_PROGRESS', p);
console.log(p);
}; };
Cryptpad.changeBlobPassword(data, { Cryptpad.changeBlobPassword(data, {
onPending: onPending, onPending: onPending,