From 8ca7e11150723f8ad4bbcb7f5f9e447939152dee Mon Sep 17 00:00:00 2001 From: yflory Date: Thu, 10 Oct 2019 13:59:10 +0200 Subject: [PATCH] Add support for viewers in roster --- www/common/outer/roster.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/www/common/outer/roster.js b/www/common/outer/roster.js index f2de26da7..be50c6e2c 100644 --- a/www/common/outer/roster.js +++ b/www/common/outer/roster.js @@ -14,7 +14,7 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) { user0CurveKey: { notifications: "", // required displayName: "", // required - role: "OWNER|ADMIN|MEMBER", // MEMBER if not specified + role: "OWNER|ADMIN|MEMBER|VIEWER", // VIEWER if not specified profile: "", title: "" }, @@ -53,7 +53,7 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) { }; var isValidRole = function (role) { - return ['OWNER', 'ADMIN', 'MEMBER'].indexOf(role) !== -1; + return ['OWNER', 'ADMIN', 'MEMBER', 'VIEWER'].indexOf(role) !== -1; }; var canAddRole = function (author, role, members) { @@ -65,8 +65,8 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) { // owners can add any valid role they want if (authorRole === 'OWNER') { return true; } - // admins can add other admins or members - if (authorRole === "ADMIN") { return ['ADMIN', 'MEMBER'].indexOf(role) !== -1; } + // admins can add other admins or members or viewers + if (authorRole === "ADMIN") { return ['ADMIN', 'MEMBER', 'VIEWER'].indexOf(role) !== -1; } // (MEMBER, other) can't add anyone of any role return false; }; @@ -105,7 +105,7 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) { // owners can remove anyone they want if (authorRole === 'OWNER') { return true; } // admins can remove other admins or members - if (authorRole === "ADMIN") { return ["ADMIN", "MEMBER"].indexOf(role) !== -1; } + if (authorRole === "ADMIN") { return ["ADMIN", "MEMBER", "VIEWER"].indexOf(role) !== -1; } // MEMBERS and non-members cannot remove anyone of any role return false; }; @@ -168,8 +168,8 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) { if (members[curve]) { throw new Error("ALREADY_PRESENT"); } var data = args[curve]; - // if no role was provided, assume MEMBER - if (typeof(data.role) !== 'string') { data.role = 'MEMBER'; } + // if no role was provided, assume VIEWER + if (typeof(data.role) !== 'string') { data.role = 'VIEWER'; } if (!canAddRole(author, data.role, members)) { throw new Error("INSUFFICIENT_PERMISSIONS");