From d6383643cb9f60e0429d09c1d363b7781da15e47 Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Tue, 5 Sep 2017 07:58:47 -0700 Subject: PLT-6226 fixing race in IsAuth (#7296) * Fixing race in isAuth function * PLT-6226 fixing race in IsAuth * Moving int64 to top so it's aligned * Adding comment and fixing asymmetric call --- app/websocket_router.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/websocket_router.go') diff --git a/app/websocket_router.go b/app/websocket_router.go index e8957e6b5..a3c56454f 100644 --- a/app/websocket_router.go +++ b/app/websocket_router.go @@ -43,7 +43,7 @@ func (wr *WebSocketRouter) ServeWebSocket(conn *WebConn, r *model.WebSocketReque } if r.Action == model.WEBSOCKET_AUTHENTICATION_CHALLENGE { - if conn.SessionToken != "" { + if conn.GetSessionToken() != "" { return } @@ -63,7 +63,8 @@ func (wr *WebSocketRouter) ServeWebSocket(conn *WebConn, r *model.WebSocketReque UpdateLastActivityAtIfNeeded(*session) }() - conn.SessionToken = session.Token + conn.SetSession(session) + conn.SetSessionToken(session.Token) conn.UserId = session.UserId HubRegister(conn) -- cgit v1.2.3-1-g7c22