From 3fb0cc38ecc8cd1918cbacd52182648b7f1f21f8 Mon Sep 17 00:00:00 2001 From: yflory Date: Fri, 27 Sep 2019 18:04:48 +0200 Subject: [PATCH] Delete team --- www/common/outer/team.js | 86 +++++++++++++++++++++++++++++++++++-- www/common/proxy-manager.js | 2 +- www/teams/inner.js | 38 +++++++++++++++- 3 files changed, 120 insertions(+), 6 deletions(-) diff --git a/www/common/outer/team.js b/www/common/outer/team.js index 810e0b3c0..d382a7609 100644 --- a/www/common/outer/team.js +++ b/www/common/outer/team.js @@ -15,10 +15,11 @@ define([ '/bower_components/chainpad-netflux/chainpad-netflux.js', '/bower_components/chainpad/chainpad.dist.js', '/bower_components/nthen/index.js', + '/bower_components/saferphore/index.js', '/bower_components/tweetnacl/nacl-fast.min.js', ], function (Util, Hash, Constants, Realtime, ProxyManager, UserObject, SF, Roster, Messaging, - Listmap, Crypto, CpNetflux, ChainPad, nThen) { + Listmap, Crypto, CpNetflux, ChainPad, nThen, Saferphore) { var Team = {}; var Nacl = window.nacl; @@ -73,8 +74,8 @@ define([ var closeTeam = function (ctx, teamId) { var team = ctx.teams[teamId]; if (!team) { return; } - team.listmap.stop(); - team.roster.stop(); + try { team.listmap.stop(); } catch (e) {} + try { team.roster.stop(); } catch (e) {} team.proxy = {}; delete ctx.teams[teamId]; delete ctx.store.proxy.teams[teamId]; @@ -509,6 +510,82 @@ define([ }); }; + var deleteTeam = function (ctx, data, cId, cb) { + var teamId = data.teamId; + if (!teamId) { return void cb({error: 'EINVAL'}); } + var team = ctx.teams[teamId]; + var teamData = Util.find(ctx, ['store', 'proxy', 'teams', teamId]); + if (!team || !teamData) { return void cb ({error: 'ENOENT'}); } + var state = team.roster.getState(); + var curvePublic = Util.find(ctx, ['store', 'proxy', 'curvePublic']); + var me = state.members[curvePublic]; + if (!me || me.role !== "OWNER") { return cb({ error: "EFORBIDDEN"}); } + + var edPublic = Util.find(ctx, ['store', 'proxy', 'edPublic']); + + nThen(function (waitFor) { + ctx.Store.anonRpcMsg(null, { + msg: 'GET_METADATA', + data: teamData.channel + }, waitFor(function (obj) { + // If we can't get owners, abort + if (obj && obj.error) { + waitFor.abort(); + return cb({ error: obj.error}); + } + // Check if we're an owner of the team drive + var metadata = obj[0]; + if (metadata && Array.isArray(metadata.owners) && + metadata.owners.indexOf(edPublic) !== -1) { return; } + // If w'e're not an owner, abort + waitFor.abort(); + cb({error: 'EFORBIDDEN'}); + })); + }).nThen(function (waitFor) { + team.proxy.delete = true; + // Delete the owned pads + var ownedPads = team.manager.getChannelsList('owned'); + var sem = Saferphore.create(10); + ownedPads.forEach(function (c) { + var w = waitFor(); + sem.take(function (give) { + team.rpc.removeOwnedChannel(c, give(function (err) { + if (err) { console.error(err); } + w(); + })); + }); + }); + }).nThen(function (waitFor) { + // Delete the pins log + team.rpc.removePins(waitFor(function (err) { + if (err) { console.error(err); } + console.error(err); + })); + // Delete the roster + var rosterChan = Util.find(teamData, ['keys', 'roster', 'channel']); + ctx.store.rpc.removeOwnedChannel(rosterChan, waitFor(function (err) { + if (err) { console.error(err); } + console.error(err); + })); + // Delete the chat + var chatChan = Util.find(teamData, ['keys', 'chat', 'channel']); + /* + ctx.store.rpc.removeOwnedChannel(chatChan, waitFor(function (err) { + if (err) { console.error(err); } + console.error(err); + })); + */ // XXX + // Delete the team drive + ctx.store.rpc.removeOwnedChannel(teamData.channel, waitFor(function (err) { + if (err) { console.error(err); } + console.error(err); + })); + }).nThen(function () { + cb(); + closeTeam(ctx, teamId); + }); + }; + var joinTeam = function (ctx, data, cId, cb) { var team = data.team; if (!team.hash || !team.channel || !team.password @@ -840,6 +917,9 @@ define([ if (cmd === 'REMOVE_USER') { return void removeUser(ctx, data, clientId, cb); } + if (cmd === 'DELETE_TEAM') { + return void deleteTeam(ctx, data, clientId, cb); + } if (cmd === 'CREATE_TEAM') { return void createTeam(ctx, data, clientId, cb); } diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js index ca914b57a..3908727c2 100644 --- a/www/common/proxy-manager.js +++ b/www/common/proxy-manager.js @@ -827,7 +827,7 @@ define([ // Don't push duplicates if (result.indexOf(data.channel) !== -1) { return; } // Return owned pads - if (_ownedByMe(Env, data.owners)) { + if (_ownedByMe(Env, data.owners) && data.owners.length === 1) { result.push(data.channel); } }; diff --git a/www/teams/inner.js b/www/teams/inner.js index e943dbf94..f7c319bc7 100644 --- a/www/teams/inner.js +++ b/www/teams/inner.js @@ -115,7 +115,8 @@ define([ ], 'admin': [ 'cp-team-name', - 'cp-team-avatar' + 'cp-team-avatar', + 'cp-team-delete', ], }; @@ -332,7 +333,7 @@ define([ var isOwner = Object.keys(privateData.teams || {}).some(function (id) { return privateData.teams[id].owner; - }); + }) && !privateData.devMode; // XXX if (Object.keys(privateData.teams || {}).length >= 3 || isOwner) { content.push(h('div.alert.alert-warning', { role:'alert' @@ -718,6 +719,39 @@ define([ }); }, true); + makeBlock('delete', function (common, cb) { // XXX makeBlock keys + var deleteTeam = h('button.btn.btn-danger', Messages.team_delete || "DELETE"); // XXX + var $ok = $('', {'class': 'fa fa-check', title: Messages.saved}).hide(); + var $spinner = $('', {'class': 'fa fa-spinner fa-pulse'}).hide(); + + var deleting = false; + $(deleteTeam).click(function () { + if (deleting) { return; } + UI.confirm("Are you sure", function (yes) { // XXX + if (deleting) { return; } + deleting = true; + $spinner.show(); + APP.module.execCommand("DELETE_TEAM", { + teamId: APP.team + }, function (obj) { + $spinner.hide(); + deleting = false + if (obj && obj.error) { + return void UI.warn(obj.error); + } + $ok.show(); + UI.log('DELETED'); // XXX + }); + }); + }); + + cb([ + deleteTeam, + $ok[0], + $spinner[0] + ]); + }, true); + var main = function () { var common; var readOnly;