summaryrefslogtreecommitdiffstats
path: root/api4/api.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-02-07 08:57:41 -0800
committerHarrison Healey <harrisonmhealey@gmail.com>2017-02-07 08:57:41 -0800
commitba18374bd1b2644e577247204fad17dd52913b9b (patch)
tree1399082cc810f0708497bc2fc95a6da49d793bd3 /api4/api.go
parentd91fea65188a51dd41976cad47f9c8ebacd75a04 (diff)
downloadchat-ba18374bd1b2644e577247204fad17dd52913b9b.tar.gz
chat-ba18374bd1b2644e577247204fad17dd52913b9b.tar.bz2
chat-ba18374bd1b2644e577247204fad17dd52913b9b.zip
Implement a few team endpoints for APIv4 (#5296)
* Implement GET /teams/{team_id} endpoint for APIv4 * Implement GET /users/{user_id}/teams endpoint for APIv4 * Implement GET /teams/{team_id}/members/{user_id} endpoint for APIv4
Diffstat (limited to 'api4/api.go')
-rw-r--r--api4/api.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/api4/api.go b/api4/api.go
index 2293cdec5..5ad410cb3 100644
--- a/api4/api.go
+++ b/api4/api.go
@@ -94,7 +94,7 @@ func InitApi(full bool) {
BaseRoutes.UserByEmail = BaseRoutes.Users.PathPrefix("/email/{email}").Subrouter()
BaseRoutes.Teams = BaseRoutes.ApiRoot.PathPrefix("/teams").Subrouter()
- BaseRoutes.TeamsForUser = BaseRoutes.Users.PathPrefix("/teams").Subrouter()
+ BaseRoutes.TeamsForUser = BaseRoutes.User.PathPrefix("/teams").Subrouter()
BaseRoutes.Team = BaseRoutes.Teams.PathPrefix("/{team_id:[A-Za-z0-9]+}").Subrouter()
BaseRoutes.TeamByName = BaseRoutes.Teams.PathPrefix("/name/{team_name:[A-Za-z0-9_-]+}").Subrouter()
BaseRoutes.TeamMembers = BaseRoutes.Team.PathPrefix("/members").Subrouter()
@@ -141,11 +141,10 @@ func InitApi(full bool) {
InitTeam()
InitChannel()
+ app.Srv.Router.Handle("/api/v4/{anything:.*}", http.HandlerFunc(Handle404))
+
// REMOVE CONDITION WHEN APIv3 REMOVED
if full {
- // 404 on any api route before web.go has a chance to serve it
- app.Srv.Router.Handle("/api/{anything:.*}", http.HandlerFunc(Handle404))
-
utils.InitHTML()
app.InitEmailBatching()