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 /api4/apitestlib.go | |
| 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 'api4/apitestlib.go')
| -rw-r--r-- | api4/apitestlib.go | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/api4/apitestlib.go b/api4/apitestlib.go index b3007ebfe..6d1822ae9 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -25,14 +25,15 @@ import ( ) type TestHelper struct { - Client *model.Client4 - BasicUser *model.User - BasicUser2 *model.User - TeamAdminUser *model.User - BasicTeam *model.Team - BasicChannel *model.Channel - BasicChannel2 *model.Channel - BasicPost *model.Post + Client *model.Client4 + BasicUser *model.User + BasicUser2 *model.User + TeamAdminUser *model.User + BasicTeam *model.Team + BasicChannel *model.Channel + BasicPrivateChannel *model.Channel + BasicChannel2 *model.Channel + BasicPost *model.Post SystemAdminClient *model.Client4 SystemAdminUser *model.User @@ -135,6 +136,7 @@ func (me *TestHelper) InitBasic() *TestHelper { me.LoginTeamAdmin() me.BasicTeam = me.CreateTeam() me.BasicChannel = me.CreatePublicChannel() + me.BasicPrivateChannel = me.CreatePrivateChannel() me.BasicChannel2 = me.CreatePublicChannel() me.BasicPost = me.CreatePost() me.BasicUser = me.CreateUser() @@ -145,6 +147,8 @@ func (me *TestHelper) InitBasic() *TestHelper { app.AddUserToChannel(me.BasicUser2, me.BasicChannel) app.AddUserToChannel(me.BasicUser, me.BasicChannel2) app.AddUserToChannel(me.BasicUser2, me.BasicChannel2) + app.AddUserToChannel(me.BasicUser, me.BasicPrivateChannel) + app.AddUserToChannel(me.BasicUser2, me.BasicPrivateChannel) app.UpdateUserRoles(me.BasicUser.Id, model.ROLE_SYSTEM_USER.Id) me.LoginBasic() |