[MM-27274] Add permission to convert public channel to private (#15370)
* Add permission to convert public channel to private * Rename to PERMISSION_CONVERT_PUBLIC_CHANNEL_TO_PRIVATE * Fix tests * Update definitions for roles that have manage_team * Fix tests * Add convert private channel to public permission * Add to channel scoped perms * Update permission checks on channel privacy endpoint * Trigger CI
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
679a4447b4
Коммит
2baf95df1e
@@ -19,4 +19,5 @@ const (
|
||||
MIGRATION_KEY_ADD_USE_GROUP_MENTIONS_PERMISSION = "add_use_group_mentions_permission"
|
||||
MIGRATION_KEY_ADD_SYSTEM_CONSOLE_PERMISSIONS = "add_system_console_permissions"
|
||||
MIGRATION_KEY_SIDEBAR_CATEGORIES_PHASE_2 = "migration_sidebar_categories_phase_2"
|
||||
MIGRATION_KEY_ADD_CONVERT_CHANNEL_PERMISSIONS = "add_convert_channel_permissions"
|
||||
)
|
||||
|
||||
@@ -25,6 +25,8 @@ var PERMISSION_CREATE_PUBLIC_CHANNEL *Permission
|
||||
var PERMISSION_CREATE_PRIVATE_CHANNEL *Permission
|
||||
var PERMISSION_MANAGE_PUBLIC_CHANNEL_MEMBERS *Permission
|
||||
var PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS *Permission
|
||||
var PERMISSION_CONVERT_PUBLIC_CHANNEL_TO_PRIVATE *Permission
|
||||
var PERMISSION_CONVERT_PRIVATE_CHANNEL_TO_PUBLIC *Permission
|
||||
var PERMISSION_ASSIGN_SYSTEM_ADMIN_ROLE *Permission
|
||||
var PERMISSION_MANAGE_ROLES *Permission
|
||||
var PERMISSION_MANAGE_TEAM_ROLES *Permission
|
||||
@@ -209,6 +211,18 @@ func initializePermissions() {
|
||||
"authentication.permissions.manage_private_channel_members.description",
|
||||
PermissionScopeChannel,
|
||||
}
|
||||
PERMISSION_CONVERT_PUBLIC_CHANNEL_TO_PRIVATE = &Permission{
|
||||
"convert_public_channel_to_private",
|
||||
"authentication.permissions.convert_public_channel_to_private.name",
|
||||
"authentication.permissions.convert_public_channel_to_private.description",
|
||||
PermissionScopeChannel,
|
||||
}
|
||||
PERMISSION_CONVERT_PRIVATE_CHANNEL_TO_PUBLIC = &Permission{
|
||||
"convert_private_channel_to_public",
|
||||
"authentication.permissions.convert_private_channel_to_public.name",
|
||||
"authentication.permissions.convert_private_channel_to_public.description",
|
||||
PermissionScopeChannel,
|
||||
}
|
||||
PERMISSION_ASSIGN_SYSTEM_ADMIN_ROLE = &Permission{
|
||||
"assign_system_admin_role",
|
||||
"authentication.permissions.assign_system_admin_role.name",
|
||||
@@ -933,6 +947,8 @@ func initializePermissions() {
|
||||
PERMISSION_MANAGE_CHANNEL_ROLES,
|
||||
PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES,
|
||||
PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES,
|
||||
PERMISSION_CONVERT_PUBLIC_CHANNEL_TO_PRIVATE,
|
||||
PERMISSION_CONVERT_PRIVATE_CHANNEL_TO_PUBLIC,
|
||||
PERMISSION_DELETE_PUBLIC_CHANNEL,
|
||||
PERMISSION_DELETE_PRIVATE_CHANNEL,
|
||||
PERMISSION_READ_CHANNEL,
|
||||
|
||||
@@ -73,6 +73,8 @@ func init() {
|
||||
PERMISSION_DELETE_PRIVATE_CHANNEL,
|
||||
PERMISSION_DELETE_PUBLIC_CHANNEL,
|
||||
PERMISSION_MANAGE_CHANNEL_ROLES,
|
||||
PERMISSION_CONVERT_PUBLIC_CHANNEL_TO_PRIVATE,
|
||||
PERMISSION_CONVERT_PRIVATE_CHANNEL_TO_PUBLIC,
|
||||
},
|
||||
PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_TEAMS.Id: {
|
||||
PERMISSION_MANAGE_TEAM_ROLES,
|
||||
@@ -85,6 +87,8 @@ func init() {
|
||||
PERMISSION_MANAGE_TEAM,
|
||||
PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS,
|
||||
PERMISSION_MANAGE_PUBLIC_CHANNEL_MEMBERS,
|
||||
PERMISSION_CONVERT_PUBLIC_CHANNEL_TO_PRIVATE,
|
||||
PERMISSION_CONVERT_PRIVATE_CHANNEL_TO_PUBLIC,
|
||||
},
|
||||
PERMISSION_SYSCONSOLE_WRITE_ENVIRONMENT.Id: {
|
||||
PERMISSION_MANAGE_JOBS,
|
||||
@@ -576,6 +580,8 @@ func MakeDefaultRoles() map[string]*Role {
|
||||
PERMISSION_MANAGE_OTHERS_SLASH_COMMANDS.Id,
|
||||
PERMISSION_MANAGE_INCOMING_WEBHOOKS.Id,
|
||||
PERMISSION_MANAGE_OUTGOING_WEBHOOKS.Id,
|
||||
PERMISSION_CONVERT_PUBLIC_CHANNEL_TO_PRIVATE.Id,
|
||||
PERMISSION_CONVERT_PRIVATE_CHANNEL_TO_PUBLIC.Id,
|
||||
},
|
||||
SchemeManaged: true,
|
||||
BuiltIn: true,
|
||||
|
||||
Ссылка в новой задаче
Block a user