infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Remove an owner

pull/1/head
yflory 2019-08-28 16:27:18 +02:00
parent f6762f7c01
commit 2a91643d59
5 changed files with 159 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,80 +112,156 @@ define([
cb(void 0, data);
});
};
var createOwnerModal = function (common, owners) {
var createOwnerModal = function (common, channel, owners) {
var friends = common.getFriends(true);
var sframeChan = common.getSframeChannel();
var priv = common.getMetadataMgr().getPrivateData();
var edPublic = priv.edPublic;
// Remove owner column
var _owners = {};
owners.forEach(function (edPublic) {
var f;
Object.keys(friends).some(function (c) {
if (friends[c].edPublic === edPublic) {
f = friends[c];
return true;
var drawRemove = function () {
var _owners = {};
owners.forEach(function (ed) {
var f;
Object.keys(friends).some(function (c) {
if (friends[c].edPublic === ed) {
f = friends[c];
return true;
}
});
_owners[ed] = f || {
displayName: 'Unknown user: '+ ed, // XXX
notifications: true,
edPublic: ed,
};
});
var removeCol = UIElements.getFriendsList('Remove an existing owner instantly', {
common: common,
friends: _owners,
noFilter: true
}, function () {
console.log(arguments);
});
var $div1 = $(removeCol.div);
var others1 = removeCol.others;
$div1.append(h('div.cp-share-grid', others1));
$div1.find('.cp-share-friend').click(function () {
var sel = $(this).hasClass('cp-selected');
if (!sel) {
$(this).addClass('cp-selected');
} else {
var order = $(this).attr('data-order');
order = order ? 'order:'+order : '';
$(this).removeClass('cp-selected').attr('style', order);
}
});
_owners[edPublic] = f || {
displayName: 'Unknown user: '+ edPublic, // XXX
notifications: true,
edPublic: edPublic,
};
});
var removeCol = UIElements.getFriendsList('Remove an existing owner instantly', {
common: common,
friends: _owners,
noFilter: true
}, function () {
// XXX onSelect...
//onSelect...
console.log(arguments);
});
var $div1 = $(removeCol.div);
var others1 = removeCol.others;
$div1.append(h('div.cp-share-grid', others1));
$div1.find('.cp-share-friend').click(function () {
var sel = $(this).hasClass('cp-selected');
if (!sel) {
$(this).addClass('cp-selected');
} else {
var order = $(this).attr('data-order');
order = order ? 'order:'+order : '';
$(this).removeClass('cp-selected').attr('style', order);
}
// XXX onSelect...
});
// When clicking on the remove button, we check the selected users.
// If you try to remove yourself, we'll display an additional warning message
var removeButton = h('button.no-margin', 'Remove owners'); // XXX
$(removeButton).click(function () {
// Check selection
var $sel = $div1.find('.cp-share-friend.cp-selected');
var sel = $sel.toArray();
var me = false;
var toRemove = sel.map(function (el) {
var ed = $(el).attr('data-ed');
if (!ed) { return; }
if (ed === edPublic) { me = true; }
return ed;
}).filter(function (x) { return x; });
// Send the command
var send = function () {
sframeChan.query('Q_SET_PAD_METADATA', {
channel: channel,
command: 'RM_OWNERS',
value: toRemove
}, function (err, res) {
err = err || (res && res.error);
if (err) { return void UI.warn('ERROR' + err); } // XXX
owners = res.owners;
drawRemove().insertBefore($div1);
$div1.remove();
UI.log('DONE'); // XXX
});
};
var msg = me ?
"Are you sure? You're going to give up on your rights, this can't be undone!" :
"Are you sure?"; // XXX
UI.confirm(msg, function (yes) {
if (!yes) { return; }
send();
});
});
$div1.append(h('p', removeButton));
return $div1;
};
// Add owners column
var addCol = UIElements.getFriendsList('Ask a friend to be an owner', {
common: common,
friends: friends
}, function () {
// XXX onSelect...
console.log(arguments);
});
var $div2 = $(addCol.div);
var others2 = addCol.others;
$div2.append(h('div.cp-share-grid', others2));
$div2.find('.cp-share-friend').click(function () {
var sel = $(this).hasClass('cp-selected');
if (!sel) {
$(this).addClass('cp-selected');
} else {
var order = $(this).attr('data-order');
order = order ? 'order:'+order : '';
$(this).removeClass('cp-selected').attr('style', order);
}
// XXX onSelect...
});
var drawAdd = function () {
var addCol = UIElements.getFriendsList('Ask a friend to be an owner.', {
common: common,
friends: friends
}, function () {
// XXX onSelect...
console.log(arguments);
});
var $div2 = $(addCol.div);
var others2 = addCol.others;
$div2.append(h('div.cp-share-grid', others2));
$div2.find('.cp-share-friend').click(function () {
var sel = $(this).hasClass('cp-selected');
if (!sel) {
$(this).addClass('cp-selected');
} else {
var order = $(this).attr('data-order');
order = order ? 'order:'+order : '';
$(this).removeClass('cp-selected').attr('style', order);
}
// XXX onSelect...
});
// When clicking on the add button, we get the selected users.
var addButton = h('button.no-margin', 'Add owners'); // XXX
$(addButton).click(function () {
// Check selection
var $sel = $div2.find('.cp-share-friend.cp-selected');
var sel = $sel.toArray();
var toAdd = sel.map(function (el) {
return $(el).attr('data-curve');
}).filter(function (x) { return x; });
// Send the command
var send = function () {
// XXX Pinning problem....
sframeChan.query('Q_SET_PAD_METADATA', {
channel: channel,
command: 'ADD_OWNERS',
value: toAdd
}, function (err, res) {
err = err || (res && res.error);
if (err) { return void UI.warn('ERROR' + err); } // XXX
owners = res.owners;
drawRemove().insertBefore($div2);
$div2.remove();
UI.log('DONE'); // XXX
});
};
var msg = "Are you sure?"; // XXX
UI.confirm(msg, function (yes) {
if (!yes) { return; }
send();
});
});
//$div2.append(h('p', addButton));
return $div2;
};
// Create modal
var link = h('div.cp-share-columns', [
removeCol.div,
addCol.div
drawRemove()[0],
drawAdd()[0]
]);
var linkButtons = [{
className: 'cancel',
name: Messages.ok,
name: 'CLOSE', // XXX existing key?
onClick: function () {},
keys: [27]
}];
@ -234,7 +310,7 @@ define([
if (owned) {
var manageOwners = h('button.no-margin', 'Manage owners'); // XXX
$(manageOwners).click(function () {
var modal = createOwnerModal(common, data.owners);
var modal = createOwnerModal(common, data.channel, data.owners);
UI.openCustomModal(modal, {
wide: true,
});
@ -437,8 +513,6 @@ define([
UIElements.getFriendsList = function (label, config, onSelect) {
var common = config.common;
var friends = config.friends;
var myName = common.getMetadataMgr().getUserData().name;
var order = [];
if (!friends) { return; }
var others = Object.keys(friends).map(function (curve, i) {
@ -538,12 +612,15 @@ define([
var common = config.common;
var title = config.title;
var friends = config.friends;
var myName = common.getMetadataMgr().getUserData().name;
if (!friends) { return; }
var order = [];
var smallCurves = Object.keys(friends).map(function (c) {
return friends[c].curvePublic.slice(0,8);
});
var $div;
// Replace "copy link" by "share with friends" if at least one friend is selected
// Also create the "share with friends" button if it doesn't exist
var refreshButtons = function () {
@ -606,7 +683,7 @@ define([
var friendsList = UIElements.getFriendsList(Messages.share_linkFriends, config, refreshButtons);
var div = friendsList.div;
var $div = $(div);
$div = $(div);
var others = friendsList.others;
common.getAttribute(['general', 'share-friends'], function (err, val) {

3
www/common/cryptpad-common.js
View File

@ -765,6 +765,9 @@ define([
postMessage("GIVE_PAD_ACCESS", data, cb);
};
common.setPadMetadata = function (data, cb) {
postMessage('SET_PAD_METADATA', data, cb);
};
common.getPadMetadata = function (data, cb) {
postMessage('GET_PAD_METADATA', data, cb);
};

9
www/common/outer/async-store.js
View File

@ -1395,6 +1395,15 @@ define([
}
cb(channel.data || {});
};
Store.setPadMetadata = function (clientId, data, cb) {
if (!data.channel) { return void cb({ error: 'ENOTFOUND'}); }
if (!data.command) { return void cb({ error: 'EINVAL' }); }
store.rpc.setMetadata(data, function (err, res) {
if (err) { return void cb({ error: err }); }
if (!Array.isArray(res) || !res.length) { return void cb({}); }
cb(res[0]);
});
};
// GET_FULL_HISTORY from sframe-common-outer
Store.getFullHistory = function (clientId, data, cb) {

1
www/common/outer/store-rpc.js
View File

@ -81,6 +81,7 @@ define([
REQUEST_PAD_ACCESS: Store.requestPadAccess,
GIVE_PAD_ACCESS: Store.givePadAccess,
GET_PAD_METADATA: Store.getPadMetadata,
SET_PAD_METADATA: Store.setPadMetadata,
// Drive
DRIVE_USEROBJECT: Store.userObjectCommand,
// Settings,

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

@ -1004,6 +1004,10 @@ define([
});
});
sframeChan.on('Q_SET_PAD_METADATA', function (data, cb) {
Cryptpad.setPadMetadata(data, cb);
});
if (cfg.messaging) {
Notifier.getPermission();