diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-03-22 11:13:44 -0400 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2017-03-22 08:13:44 -0700 |
| commit | 61b1237c20bc71334acc4f96606a077a6b8c262a (patch) | |
| tree | 57f451ee384bea695440ee92f54d8520af128609 /model | |
| parent | 0e98dfa445722d69bd553e5b657db7162d96cd5b (diff) | |
| download | chat-61b1237c20bc71334acc4f96606a077a6b8c262a.tar.gz chat-61b1237c20bc71334acc4f96606a077a6b8c262a.tar.bz2 chat-61b1237c20bc71334acc4f96606a077a6b8c262a.zip | |
Update channel permissions for v4 endpoints (#5829)
* Fix join channel permission for v4 endpoint
* Allow regular users to get public channels they are not in
* Fix unit test
Diffstat (limited to 'model')
| -rw-r--r-- | model/authorization.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/model/authorization.go b/model/authorization.go index a7a6f374d..eec0f79ee 100644 --- a/model/authorization.go +++ b/model/authorization.go @@ -39,6 +39,7 @@ var PERMISSION_DELETE_PUBLIC_CHANNEL *Permission var PERMISSION_DELETE_PRIVATE_CHANNEL *Permission var PERMISSION_EDIT_OTHER_USERS *Permission var PERMISSION_READ_CHANNEL *Permission +var PERMISSION_READ_PUBLIC_CHANNEL *Permission var PERMISSION_PERMANENT_DELETE_USER *Permission var PERMISSION_UPLOAD_FILE *Permission var PERMISSION_GET_PUBLIC_LINK *Permission @@ -195,6 +196,11 @@ func InitalizePermissions() { "authentication.permissions.read_channel.name", "authentication.permissions.read_channel.description", } + PERMISSION_READ_PUBLIC_CHANNEL = &Permission{ + "read_public_channel", + "authentication.permissions.read_public_channel.name", + "authentication.permissions.read_public_channel.description", + } PERMISSION_PERMANENT_DELETE_USER = &Permission{ "permanent_delete_user", "authentication.permissions.permanent_delete_user.name", @@ -326,6 +332,7 @@ func InitalizeRoles() { []string{ PERMISSION_LIST_TEAM_CHANNELS.Id, PERMISSION_JOIN_PUBLIC_CHANNELS.Id, + PERMISSION_READ_PUBLIC_CHANNEL.Id, PERMISSION_VIEW_TEAM.Id, }, } @@ -378,6 +385,8 @@ func InitalizeRoles() { PERMISSION_MANAGE_SYSTEM.Id, PERMISSION_MANAGE_ROLES.Id, PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES.Id, + PERMISSION_MANAGE_PUBLIC_CHANNEL_MEMBERS.Id, + PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS.Id, PERMISSION_DELETE_PUBLIC_CHANNEL.Id, PERMISSION_CREATE_PUBLIC_CHANNEL.Id, PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES.Id, |