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

Merge branch 'soon' into staging

This commit is contained in:
yflory 2021-04-21 17:21:11 +02:00
parent 95084fd9d1 12718d4bde
commit 71d5d05157
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1656,7 +1656,9 @@ define([
} else if (teams.some(function (teamId) {
// We're not allowed: check our teams
var ed = Util.find(store, ['proxy', 'teams', teamId, 'keys', 'drive', 'edPublic']);
var edPrivate = Util.find(store, ['proxy', 'teams', teamId, 'keys', 'drive', 'edPrivate']);
if (allowed.indexOf(ed) === -1) { return false; }
if (!edPrivate) { return false; } // XXX: Only editors can authenticate...
// This team is allowed: use its rpc
var t = teamModule.getTeam(teamId);
_store = t;

4
www/report/main.js
View File

@ -63,6 +63,7 @@ define([
network = _network;
}));
}).nThen(function (waitFor) {
addReport('BEGIN REPORT');
var secret = Hash.getSecrets('drive', hash);
addReport('Load drive. ID: ' + secret.channel);
checkCache(secret.channel, waitFor());
@ -82,7 +83,6 @@ define([
}
}), { network: network, onCacheReady: onCacheReady});
}).nThen(function (waitFor) {
console.log(proxy);
var drive = proxy.drive || {};
if (!proxy.drive) {
addReport('ERROR: no drive');
@ -184,7 +184,6 @@ define([
return;
}
addReport('Roster channel: ' + d.channel);
console.warn(rosterKeys);
checkCache(d.channel, function () {
var crypto = Crypto.Team.createEncryptor(rosterKeys);
var m = 0;
@ -233,7 +232,6 @@ define([
_obj.href = cryptor.decrypt(_obj.href);
}
var parsed = Hash.parsePadUrl(_obj.href || _obj.roHref);
console.log(parsed.hash, _obj);
Crypt.get(parsed.hash, function (err, val, errorObj) {
if (err) {
addReport('ERROR: ' + err);

2
www/settings/inner.js
View File

@ -84,7 +84,7 @@ define([
'cp-settings-pad-width',
'cp-settings-pad-spellcheck',
'cp-settings-pad-notif',
'cp-settings-pad-openlink',
//'cp-settings-pad-openlink', // XXX test, translate and re-enable
],
'code': [ // Msg.settings_cat_code
'cp-settings-code-indent-unit',