diff options
| author | George Goldberg <george@gberg.me> | 2018-02-19 10:16:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-19 10:16:45 +0000 |
| commit | 0e718a632a616bcfec4378f512182245b68f4fd8 (patch) | |
| tree | 5c1d2cd50566d4eebfe2974e255eb6355fe48668 /utils | |
| parent | 642d78173af8cf600cdf81a341d87e75e7854172 (diff) | |
| download | chat-0e718a632a616bcfec4378f512182245b68f4fd8.tar.gz chat-0e718a632a616bcfec4378f512182245b68f4fd8.tar.bz2 chat-0e718a632a616bcfec4378f512182245b68f4fd8.zip | |
MM-9618: Don't change default role permissions for policy. (#8303)
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/authorization.go | 32 | ||||
| -rw-r--r-- | utils/policies-roles-mapping.json | 34 |
2 files changed, 33 insertions, 33 deletions
diff --git a/utils/authorization.go b/utils/authorization.go index bc71404ef..16f33bc1a 100644 --- a/utils/authorization.go +++ b/utils/authorization.go @@ -31,8 +31,8 @@ func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Confi if isLicensed { switch *cfg.TeamSettings.RestrictPublicChannelManagement { case model.PERMISSIONS_ALL: - roles[model.CHANNEL_USER_ROLE_ID].Permissions = append( - roles[model.CHANNEL_USER_ROLE_ID].Permissions, + roles[model.TEAM_USER_ROLE_ID].Permissions = append( + roles[model.TEAM_USER_ROLE_ID].Permissions, model.PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES.Id, ) case model.PERMISSIONS_CHANNEL_ADMIN: @@ -51,8 +51,8 @@ func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Confi ) } } else { - roles[model.CHANNEL_USER_ROLE_ID].Permissions = append( - roles[model.CHANNEL_USER_ROLE_ID].Permissions, + roles[model.TEAM_USER_ROLE_ID].Permissions = append( + roles[model.TEAM_USER_ROLE_ID].Permissions, model.PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES.Id, ) } @@ -60,8 +60,8 @@ func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Confi if isLicensed { switch *cfg.TeamSettings.RestrictPublicChannelDeletion { case model.PERMISSIONS_ALL: - roles[model.CHANNEL_USER_ROLE_ID].Permissions = append( - roles[model.CHANNEL_USER_ROLE_ID].Permissions, + roles[model.TEAM_USER_ROLE_ID].Permissions = append( + roles[model.TEAM_USER_ROLE_ID].Permissions, model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, ) case model.PERMISSIONS_CHANNEL_ADMIN: @@ -80,8 +80,8 @@ func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Confi ) } } else { - roles[model.CHANNEL_USER_ROLE_ID].Permissions = append( - roles[model.CHANNEL_USER_ROLE_ID].Permissions, + roles[model.TEAM_USER_ROLE_ID].Permissions = append( + roles[model.TEAM_USER_ROLE_ID].Permissions, model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, ) } @@ -109,8 +109,8 @@ func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Confi if isLicensed { switch *cfg.TeamSettings.RestrictPrivateChannelManagement { case model.PERMISSIONS_ALL: - roles[model.CHANNEL_USER_ROLE_ID].Permissions = append( - roles[model.CHANNEL_USER_ROLE_ID].Permissions, + roles[model.TEAM_USER_ROLE_ID].Permissions = append( + roles[model.TEAM_USER_ROLE_ID].Permissions, model.PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES.Id, ) case model.PERMISSIONS_CHANNEL_ADMIN: @@ -129,8 +129,8 @@ func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Confi ) } } else { - roles[model.CHANNEL_USER_ROLE_ID].Permissions = append( - roles[model.CHANNEL_USER_ROLE_ID].Permissions, + roles[model.TEAM_USER_ROLE_ID].Permissions = append( + roles[model.TEAM_USER_ROLE_ID].Permissions, model.PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES.Id, ) } @@ -138,8 +138,8 @@ func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Confi if isLicensed { switch *cfg.TeamSettings.RestrictPrivateChannelDeletion { case model.PERMISSIONS_ALL: - roles[model.CHANNEL_USER_ROLE_ID].Permissions = append( - roles[model.CHANNEL_USER_ROLE_ID].Permissions, + roles[model.TEAM_USER_ROLE_ID].Permissions = append( + roles[model.TEAM_USER_ROLE_ID].Permissions, model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, ) case model.PERMISSIONS_CHANNEL_ADMIN: @@ -158,8 +158,8 @@ func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Confi ) } } else { - roles[model.CHANNEL_USER_ROLE_ID].Permissions = append( - roles[model.CHANNEL_USER_ROLE_ID].Permissions, + roles[model.TEAM_USER_ROLE_ID].Permissions = append( + roles[model.TEAM_USER_ROLE_ID].Permissions, model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, ) } diff --git a/utils/policies-roles-mapping.json b/utils/policies-roles-mapping.json index 1b2acdfcb..6b09c6c72 100644 --- a/utils/policies-roles-mapping.json +++ b/utils/policies-roles-mapping.json @@ -101,14 +101,14 @@ "restrictPublicChannelManagement": { "all": [ { - "roleName": "channel_user", + "roleName": "team_user", "permission": "manage_public_channel_properties", "shouldHave": true } ], "channel_admin": [ { - "roleName": "channel_user", + "roleName": "team_user", "permission": "manage_public_channel_properties", "shouldHave": false }, @@ -125,7 +125,7 @@ ], "team_admin": [ { - "roleName": "channel_user", + "roleName": "team_user", "permission": "manage_public_channel_properties", "shouldHave": false }, @@ -142,7 +142,7 @@ ], "system_admin": [ { - "roleName": "channel_user", + "roleName": "team_user", "permission": "manage_public_channel_properties", "shouldHave": false }, @@ -161,14 +161,14 @@ "restrictPublicChannelDeletion": { "all": [ { - "roleName": "channel_user", + "roleName": "team_user", "permission": "delete_public_channel", "shouldHave": true } ], "channel_admin": [ { - "roleName": "channel_user", + "roleName": "team_user", "permission": "delete_public_channel", "shouldHave": false }, @@ -185,7 +185,7 @@ ], "team_admin": [ { - "roleName": "channel_user", + "roleName": "team_user", "permission": "delete_public_channel", "shouldHave": false }, @@ -202,7 +202,7 @@ ], "system_admin": [ { - "roleName": "channel_user", + "roleName": "team_user", "permission": "delete_public_channel", "shouldHave": false }, @@ -221,14 +221,14 @@ "restrictPrivateChannelManagement": { "all": [ { - "roleName": "channel_user", + "roleName": "team_user", "permission": "manage_private_channel_properties", "shouldHave": true } ], "channel_admin": [ { - "roleName": "channel_user", + "roleName": "team_user", "permission": "manage_private_channel_properties", "shouldHave": false }, @@ -245,7 +245,7 @@ ], "team_admin": [ { - "roleName": "channel_user", + "roleName": "team_user", "permission": "manage_private_channel_properties", "shouldHave": false }, @@ -262,7 +262,7 @@ ], "system_admin": [ { - "roleName": "channel_user", + "roleName": "team_user", "permission": "manage_private_channel_properties", "shouldHave": false }, @@ -341,14 +341,14 @@ "restrictPrivateChannelDeletion": { "all": [ { - "roleName": "channel_user", + "roleName": "team_user", "permission": "delete_private_channel", "shouldHave": true } ], "channel_admin": [ { - "roleName": "channel_user", + "roleName": "team_user", "permission": "delete_private_channel", "shouldHave": false }, @@ -365,7 +365,7 @@ ], "team_admin": [ { - "roleName": "channel_user", + "roleName": "team_user", "permission": "delete_private_channel", "shouldHave": false }, @@ -382,7 +382,7 @@ ], "system_admin": [ { - "roleName": "channel_user", + "roleName": "team_user", "permission": "delete_private_channel", "shouldHave": false }, @@ -529,4 +529,4 @@ } ] } -}
\ No newline at end of file +} |