diff options
author | Jesse Hallam <jesse.hallam@gmail.com> | 2018-10-18 13:49:10 -0400 |
---|---|---|
committer | Elias Nahum <nahumhbl@gmail.com> | 2018-10-18 14:49:10 -0300 |
commit | d1805733feb8c48a7286eb1affc1f98ed1a044a8 (patch) | |
tree | 9c141e10210e68686173a9f093a383d26792f276 /api4 | |
parent | a708c33520e327487fd2dc05eaab3563c8161fb7 (diff) | |
download | chat-d1805733feb8c48a7286eb1affc1f98ed1a044a8.tar.gz chat-d1805733feb8c48a7286eb1affc1f98ed1a044a8.tar.bz2 chat-d1805733feb8c48a7286eb1affc1f98ed1a044a8.zip |
MM-12505: remove all things WebRTC (#9700)
Diffstat (limited to 'api4')
-rw-r--r-- | api4/api.go | 5 | ||||
-rw-r--r-- | api4/webrtc.go | 23 | ||||
-rw-r--r-- | api4/webrtc_test.go | 33 |
3 files changed, 0 insertions, 61 deletions
diff --git a/api4/api.go b/api4/api.go index b324959e9..f824c5cc0 100644 --- a/api4/api.go +++ b/api4/api.go @@ -106,8 +106,6 @@ type Routes struct { ReactionByNameForPostForUser *mux.Router // 'api/v4/users/{user_id:[A-Za-z0-9]+}/posts/{post_id:[A-Za-z0-9]+}/reactions/{emoji_name:[A-Za-z0-9_-+]+}' - Webrtc *mux.Router // 'api/v4/webrtc' - TermsOfService *mux.Router // 'api/v4/terms_of_service } @@ -196,8 +194,6 @@ func Init(a *app.App, root *mux.Router) *API { api.BaseRoutes.ReactionByNameForPostForUser = api.BaseRoutes.PostForUser.PathPrefix("/reactions/{emoji_name:[A-Za-z0-9\\_\\-\\+]+}").Subrouter() - api.BaseRoutes.Webrtc = api.BaseRoutes.ApiRoot.PathPrefix("/webrtc").Subrouter() - api.BaseRoutes.OpenGraph = api.BaseRoutes.ApiRoot.PathPrefix("/opengraph").Subrouter() api.BaseRoutes.Roles = api.BaseRoutes.ApiRoot.PathPrefix("/roles").Subrouter() @@ -229,7 +225,6 @@ func Init(a *app.App, root *mux.Router) *API { api.InitEmoji() api.InitOAuth() api.InitReaction() - api.InitWebrtc() api.InitOpenGraph() api.InitPlugin() api.InitRole() diff --git a/api4/webrtc.go b/api4/webrtc.go deleted file mode 100644 index 978342393..000000000 --- a/api4/webrtc.go +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. - -package api4 - -import ( - "net/http" -) - -func (api *API) InitWebrtc() { - api.BaseRoutes.Webrtc.Handle("/token", api.ApiSessionRequired(webrtcToken)).Methods("GET") -} - -func webrtcToken(c *Context, w http.ResponseWriter, r *http.Request) { - result, err := c.App.GetWebrtcInfoForSession(c.Session.Id) - - if err != nil { - c.Err = err - return - } - - w.Write([]byte(result.ToJson())) -} diff --git a/api4/webrtc_test.go b/api4/webrtc_test.go deleted file mode 100644 index 4ad20175e..000000000 --- a/api4/webrtc_test.go +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. - -package api4 - -import ( - "testing" - - "github.com/mattermost/mattermost-server/model" -) - -func TestGetWebrtcToken(t *testing.T) { - if testing.Short() { - t.SkipNow() - } - - th := Setup().InitBasic().InitSystemAdmin() - defer th.TearDown() - Client := th.Client - - enableWebrtc := *th.App.Config().WebrtcSettings.Enable - defer func() { - th.App.UpdateConfig(func(cfg *model.Config) { *cfg.WebrtcSettings.Enable = enableWebrtc }) - }() - th.App.UpdateConfig(func(cfg *model.Config) { *cfg.WebrtcSettings.Enable = false }) - - _, resp := Client.GetWebrtcToken() - CheckNotImplementedStatus(t, resp) - - Client.Logout() - _, resp = Client.GetWebrtcToken() - CheckUnauthorizedStatus(t, resp) -} |