From 28aa7cdbf2357bda51ba740fd4d7af48b36b96b4 Mon Sep 17 00:00:00 2001 From: Ruzette Tanyag Date: Tue, 14 Feb 2017 10:28:08 -0500 Subject: Implement GET channels endpoints for APIv4 (#5363) * implement get channels endpoints and updated drivers and unittests * removed channel deletion on tear down, removed manage permission on get channels endpoints, and updated utils to add constant channel length * added constants for user, team and channel length, updated context to use the model functions * make sure team name length should be less than the minimum length and revert underscore to team name validity * changed post test condition from notfound to unauthorized --- api4/params.go | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) (limited to 'api4/params.go') diff --git a/api4/params.go b/api4/params.go index 4de1da401..9b371e71a 100644 --- a/api4/params.go +++ b/api4/params.go @@ -17,18 +17,20 @@ const ( ) type ApiParams struct { - UserId string - TeamId string - ChannelId string - PostId string - FileId string - CommandId string - HookId string - EmojiId string - Email string - Username string - Page int - PerPage int + UserId string + TeamId string + ChannelId string + PostId string + FileId string + CommandId string + HookId string + EmojiId string + Email string + Username string + TeamName string + ChannelName string + Page int + PerPage int } func ApiParamsFromRequest(r *http.Request) *ApiParams { @@ -76,6 +78,14 @@ func ApiParamsFromRequest(r *http.Request) *ApiParams { params.Username = val } + if val, ok := props["team_name"]; ok { + params.TeamName = val + } + + if val, ok := props["channel_name"]; ok { + params.ChannelName = val + } + if val, err := strconv.Atoi(r.URL.Query().Get("page")); err != nil { params.Page = PAGE_DEFAULT } else { -- cgit v1.2.3-1-g7c22