* Add argument for enabling same origin check for websocket connections * Remove else clause and outdent return * Add unit test for websocket origin check