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

Fix reset pin with teams

Browse Source
This commit is contained in:
yflory
2019-09-17 16:33:13 +02:00
parent 74d7c00134
commit 02cd15882b
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,6 +184,21 @@ define([
list = list.concat(mList); list = list.concat(mList);
} }
if (store.proxy.teams) {
Object.keys(store.proxy.teams).forEach(function (id) {
var team = store.proxy.teams[id];
if (!team.owner) { return; }
list.push(team.channel);
var chatChannel = Util.find(team, ['keys', 'chat', 'channel']);
var membersChannel = Util.find(team, ['keys', 'members', 'channel']);
var mailboxChannel = Util.find(team, ['keys', 'mailbox', 'channel']);
if (chatChannel) { list.push(chatChannel); }
if (membersChannel) { list.push(membersChannel); }
if (mailboxChannel) { list.push(mailboxChannel); }
// XXX team mailbox
});
}
list.push(userChannel); list.push(userChannel);
list.sort(); list.sort();

2
www/common/outer/team.js
View File

@@ -352,6 +352,8 @@ define([
} }
}; };
ctx.store.proxy.teams[id] = { ctx.store.proxy.teams[id] = {
owner: true,
channel: secret.channel,
hash: hash, hash: hash,
password: password, password: password,
keys: keys, keys: keys,