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

Fix RPC data

pull/1/head
yflory 2019-12-18 10:52:20 +01:00
parent 906b315487
commit 3d1b3b5d18
3 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1735,14 +1735,14 @@ define([
hash: hash,
teamId: config.teamId,
seeds: seeds,
}, waitFor(function (error) {
if (error) {
}, waitFor(function (obj) {
if (obj && obj.error) {
waitFor.abort();
$(linkSpin).hide();
$(linkForm).show(); // XXX DB: check this is the right place to put things back
$nav.find('button.cp-teams-invite-create').show();
$nav.find('button.cp-teams-invite-copy').hide();
return void $(linkError).text(Messages.team_inviteLinkError+error).show(); // XXX
return void $(linkError).text(Messages.team_inviteLinkError+obj.error).show(); // XXX
}
// Display result here
$(linkSpin).hide();

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

@ -1285,7 +1285,7 @@ define([
try {
teamName = roster.getState().metadata.name;
} catch (err) {
return void cb("TEAM_NAME_ERR");
return void cb({ error: "TEAM_NAME_ERR" });
}
var message = data.message;
@ -1342,7 +1342,7 @@ define([
if (err) {
console.error("CRYPTPUT_ERR", err);
w.abort();
return void cb("SET_PREVIEW_CONTENT");
return void cb({ error: "SET_PREVIEW_CONTENT" });
}
}), putOpts);
}());
@ -1378,7 +1378,7 @@ define([
if (err) {
console.error("CRYPTPUT_ERR", err);
w.abort();
return void cb("SET_PREVIEW_CONTENT");
return void cb({ error: "SET_PREVIEW_CONTENT" });
}
}), putOpts);
}());
@ -1419,7 +1419,7 @@ define([
try {
previewKeys = Invite.derivePreviewKeys(seeds.preview);
} catch (err) {
return void cb("INVALID_SEEDS");
return void cb({ error: "INVALID_SEEDS" });
}
Crypt.get({ // secrets
channel: previewKeys.channel,
@ -1429,13 +1429,13 @@ define([
cryptKey: previewKeys.cryptKey,
},
}, function (err, val) {
if (err) { return void cb(err); }
if (!val) { return void cb('DELETED'); }
if (err) { return void cb({ error: err }); }
if (!val) { return void cb({ error: 'DELETED' }); }
var json = Util.tryParse(val);
if (!json) { return void cb("parseError"); }
if (!json) { return void cb({ error: "parseError" }); }
console.error("JSON", json);
cb(void 0, json);
cb(json);
}, { // cryptget opts
network: ctx.store.network,
initialState: '{}',
@ -1448,7 +1448,7 @@ define([
try {
previewKeys = Invite.deriveInviteKeys(bytes64);
} catch (err) {
return void cb("INVALID_SEEDS");
return void cb({ error: "INVALID_SEEDS" });
}
Crypt.get({ // secrets
channel: previewKeys.channel,
@ -1458,12 +1458,12 @@ define([
cryptKey: previewKeys.cryptKey,
},
}, function (err, val) {
if (err) { return void cb(err); }
if (!val) { return void cb('DELETED'); }
if (err) { return void cb({error: err}); }
if (!val) { return void cb({error: 'DELETED'}); }
var json = Util.tryParse(val);
if (!json) { return void cb("parseError"); }
cb(void 0, json);
if (!json) { return void cb({error: "parseError"}); }
cb(json);
}, { // cryptget opts
network: ctx.store.network,
initialState: '{}',

25
www/teams/inner.js
View File

@ -1079,11 +1079,15 @@ define([
var bytes64;
var spinnerText;
var $spinner;
var inviteContent;
nThen(function (waitFor) {
$inviteDiv.append(h('div', [
h('i.fa.fa-spin.fa-spinner'),
h('span', 'Scrypt...') // XXX
spinnerText = h('span', 'Scrypt...') // XXX
]));
$spinner = $(spinnerText);
setTimeout(waitFor(), 150);
}).nThen(function (waitFor) {
var salt = InviteInner.deriveSalt(pw, AppConfig.loginSalt);
@ -1091,26 +1095,35 @@ define([
bytes64 = bytes;
}));
}).nThen(function (waitFor) {
$spinner.text('get team data'); // XXX
APP.module.execCommand('GET_INVITE_CONTENT', {
bytes64: bytes64,
hash: hash,
password: pw,
}, waitFor(function () {
$div.empty();
}, waitFor(function (obj) {
if (obj && obj.error) {
// Wrong password or other error...
// XXX if DELETED, password prompt again?
console.error(obj.error);
waitFor.abort();
return;
}
inviteContent = obj;
// TODO
// Accept/decline/decide later UI
}));
}).nThen(function (waitFor) {
});
};
nThen(function (waitFor) {
APP.module.execCommand("GET_PREVIEW_CONTENT", {
seeds: seeds,
}, waitFor(function (err, json) {
if (err) { // XXX this is failing with "team is disabled"
}, waitFor(function (json) {
if (json && jsoN.error) { // XXX this is failing with "team is disabled"
// XXX APP.module is not ready yet?
// err === DELETED: different message?
$(errorBlock).text('ERROR'+err).show(); // XXX
$(errorBlock).text('ERROR'+json.error).show(); // XXX
waitFor.abort();
$div.empty();
return;