dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix joinTeam undefined data

This commit is contained in:
yflory 2019-12-18 12:09:37 +01:00
parent b58901e229
commit fc8ee58cfb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1474,6 +1474,7 @@ define([
var acceptLinkInvitation = function (ctx, data, cId, cb) {
var inviteContent;
nThen(function (waitFor) {
// Get team keys and ephemeral keys
getInviteContent(ctx, data, cId, waitFor(function (obj) {
if (obj && obj.error) {
waitFor.abort();
@ -1482,6 +1483,7 @@ define([
inviteContent = obj;
}));
}).nThen(function (waitFor) {
// Accept the roster invitation: relplace our ephemeral keys with our user keys
var rosterData = Util.find(inviteContent, ['teamData', 'keys', 'roster']);
var myKeys = inviteContent.ephemeral;
var rosterKeys = Crypto.Team.deriveMemberKeys(rosterData.edit, myKeys);
@ -1508,7 +1510,10 @@ define([
}));
}));
}).nThen(function () {
joinTeam(ctx, inviteContent.teamData, cId, cb);
// Add the team to our list and join...
joinTeam(ctx, {
team: inviteContent.teamData
}, cId, cb);
});
};