From daca0d93f621bcb1daae149c178af0631bcd120a Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Tue, 28 Mar 2017 04:58:19 -0400
Subject: Move WebSocket API to it's own package and add websocket v4 endpoint
 (#5881)

---
 api/websocket_handler.go | 61 ------------------------------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 api/websocket_handler.go

(limited to 'api/websocket_handler.go')

diff --git a/api/websocket_handler.go b/api/websocket_handler.go
deleted file mode 100644
index 25cdf6458..000000000
--- a/api/websocket_handler.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-package api
-
-import (
-	l4g "github.com/alecthomas/log4go"
-
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
-)
-
-func ApiWebSocketHandler(wh func(*model.WebSocketRequest) (map[string]interface{}, *model.AppError)) webSocketHandler {
-	return webSocketHandler{wh}
-}
-
-type webSocketHandler struct {
-	handlerFunc func(*model.WebSocketRequest) (map[string]interface{}, *model.AppError)
-}
-
-func (wh webSocketHandler) ServeWebSocket(conn *app.WebConn, r *model.WebSocketRequest) {
-	l4g.Debug("/api/v3/users/websocket:%s", r.Action)
-
-	session, sessionErr := app.GetSession(conn.SessionToken)
-	if sessionErr != nil {
-		l4g.Error(utils.T("api.web_socket_handler.log.error"), "/api/v3/users/websocket", r.Action, r.Seq, conn.UserId, sessionErr.SystemMessage(utils.T), sessionErr.Error())
-		sessionErr.DetailedError = ""
-		errResp := model.NewWebSocketError(r.Seq, sessionErr)
-		errResp.DoPreComputeJson()
-
-		conn.Send <- errResp
-		return
-	}
-
-	r.Session = *session
-	r.T = conn.T
-	r.Locale = conn.Locale
-
-	var data map[string]interface{}
-	var err *model.AppError
-
-	if data, err = wh.handlerFunc(r); err != nil {
-		l4g.Error(utils.T("api.web_socket_handler.log.error"), "/api/v3/users/websocket", r.Action, r.Seq, r.Session.UserId, err.SystemMessage(utils.T), err.DetailedError)
-		err.DetailedError = ""
-		errResp := model.NewWebSocketError(r.Seq, err)
-		errResp.DoPreComputeJson()
-
-		conn.Send <- errResp
-		return
-	}
-
-	resp := model.NewWebSocketResponse(model.STATUS_OK, r.Seq, data)
-	resp.DoPreComputeJson()
-
-	conn.Send <- resp
-}
-
-func NewInvalidWebSocketParamError(action string, name string) *model.AppError {
-	return model.NewLocAppError("/api/v3/users/websocket:"+action, "api.websocket_handler.invalid_param.app_error", map[string]interface{}{"Name": name}, "")
-}
-- 
cgit v1.2.3-1-g7c22