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

Update rights in inner

Browse Source
This commit is contained in:
yflory
2019-10-14 12:01:44 +02:00
parent d443c93893
commit a3d273ec47
8 changed files with 141 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/outer/mailbox-handlers.js
View File

@@ -431,7 +431,7 @@ define([
var team;
Object.keys(myTeams).some(function (k) {
var _team = myTeams[k];
if (_team.channel === content.teamChannel) {
if (_team.channel === content.teamData.channel) {
teamId = k;
team = _team;
return true;

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

@@ -990,6 +990,7 @@ define([
uo.setReadOnly(!secret.keys.secondaryKey, secret.keys.secondaryKey);
}
});
ctx.updateMetadata();
ctx.emit('ROSTER_CHANGE_RIGHTS', teamId, team.clients);
};
@@ -1006,10 +1007,14 @@ define([
teamData.hash = data.hash;
teamData.keys.drive.edPrivate = data.keys.drive.edPrivate;
teamData.keys.chat.edit = data.keys.chat.edit;
var secret = Hash.getSecrets('team', data.hash, teamData.password);
team.secondaryKey = secret && secret.keys.secondaryKey;
} else {
delete teamData.hash;
delete teamData.keys.drive.edPrivate;
delete teamData.keys.chat.edit;
delete team.secondaryKey;
}
updateMyRights(ctx, teamId, data.hash);
@@ -1055,14 +1060,14 @@ define([
// Viewer to editor
if (user.role === "VIEWER" && data.data.role !== "VIEWER") {
return void changeEditRights(ctx, teamId, user, true, function (err) {
changeEditRights(ctx, teamId, user, true, function (err) {
return void cb({error: err});
});
}
// Editor to viewer
if (user.role !== "VIEWER" && data.data.role === "VIEWER") {
return void changeEditRights(ctx, teamId, user, false, function (err) {
changeEditRights(ctx, teamId, user, false, function (err) {
return void cb({error: err});
});
}