toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MM-26436: Allows others' posts to be delete with just 'delete_others_posts' permission. (#4660) (#4694)

Browse source 
(cherry picked from commit 7f7e7e7554)

Co-authored-by: Martin Kraft <martinkraft@gmail.com>
This commit is contained in:
Mattermost Build 2020-08-18 09:43:09 -04:00 committed by GitHub
parent 122676ef5d
commit 49bd5a13ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/mm-redux/utils/post_utils.ts
View file

@ -62,11 +62,18 @@ export function canDeletePost(state: GlobalState, config: any, license: any, tea
const isOwner = isPostOwner(userId, post);
if (hasNewPermissions(state)) {
const canDelete = haveIChannelPermission(state, {team: teamId, channel: channelId, permission: Permissions.DELETE_POST});
if (!isOwner) {
return canDelete && haveIChannelPermission(state, {team: teamId, channel: channelId, permission: Permissions.DELETE_OTHERS_POSTS});
let permissions = [];
if (isOwner) {
permissions = [Permissions.DELETE_POST];
} else {
const {serverVersion} = state.entities.general;
// prior to v5.27, the server used to require delete_own_posts and
// delete_others_posts permissions to be able to delete a post by a
// different author.
permissions = isMinimumServerVersion(serverVersion, 5, 27) ? [Permissions.DELETE_OTHERS_POSTS] : [Permissions.DELETE_POST, Permissions.DELETE_OTHERS_POSTS];
}
return canDelete;
return permissions.every((permission) => haveIChannelPermission(state, {team: teamId, channel: channelId, permission, default: false}));
}
// Backwards compatibility with pre-advanced permissions config settings.
@ -87,11 +94,12 @@ export function canEditPost(state: GlobalState, config: any, license: any, teamI
let canEdit = true;
if (hasNewPermissions(state)) {
const {serverVersion} = state.entities.general;
let permissions = [];
if (isOwner) {
permissions = [Permissions.EDIT_POST];
} else {
const {serverVersion} = state.entities.general;
// prior to v5.26, the server used to require edit_own_posts and
// edit_others_posts permissions to be able to edit a post by a
// different author.