WebSocket Authentication, Code rework
Merge websocket-auth