Move WebSocket API to it's own package and add websocket v4 endpoint (#5881)

1 files changed, 61 insertions, 0 deletions

diff --git a/wsapi/websocket_handler.go b/wsapi/websocket_handler.go
new file mode 100644
index 000000000..193539242
--- /dev/null
+++ b/wsapi/websocket_handler.go
@@ -0,0 +1,61 @@
+// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package wsapi
+
+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}, "")
+}