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

Provide the secondaryKey to userObject

Browse Source
This commit is contained in:
yflory
2019-10-07 14:35:11 +02:00
parent dd2f0bd417
commit cf0d0e8e4b
11 changed files with 62 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
www/teams/inner.js
View File

@@ -52,13 +52,16 @@ define([
var oldIds = Object.keys(folders);
nThen(function (waitFor) {
Object.keys(drive.sharedFolders).forEach(function (fId) {
var sfData = drive.sharedFolders[id] || {};
var parsed = Hash.parsePadUrl(sfData.href);
var secret = Hash.getSecrets('drive', parsed.hash, sfData.password);
sframeChan.query('Q_DRIVE_GETOBJECT', {
sharedFolder: fId
}, waitFor(function (err, newObj) {
folders[fId] = folders[fId] || {};
copyObjectValue(folders[fId], newObj);
if (manager && oldIds.indexOf(fId) === -1) {
manager.addProxy(fId, folders[fId]);
manager.addProxy(fId, folders[fId], null, secret.keys.secondaryKey);
}
}));
});
@@ -260,13 +263,21 @@ define([
$limitContainer.attr('title', Messages.team_quota);
}, true);
driveAPP.team = id;
// Provide secondaryKey
var teamData = (proxy.teams || {})[id];
var secret;
if (teamData) {
secret = Hash.getSecrets('team', teamData.hash, teamData.password);
}
var drive = DriveUI.create(common, {
proxy: proxy,
folders: folders,
updateObject: updateObject,
updateSharedFolders: updateSharedFolders,
APP: driveAPP,
edPublic: APP.teamEdPublic
edPublic: APP.teamEdPublic,
editKey: secret && secret.keys.secondaryKey
});
APP.drive = drive;
driveAPP.refresh = drive.refresh;