implemented auth handshake for socket.io server v3

Author: doghappy

src/SocketIOClient.UnitTest/MessageTests/MessageWriteTest.cs

@@ -144,6 +144,36 @@ public void Eio3PollingWith2ParamConnected()
             Assert.AreEqual("40/razer?a=123&token=qwer,", text);
         }
 
+        [TestMethod]
+        public void Eio4_Auth_Query_Namespace_Should_Include_Auth_Namespace(){
+            var msg = new ConnectedMessage
+            {
+                Eio = 4,
+                Protocol = TransportProtocol.Polling,
+                Namespace = "/razer",
+                Query = new Dictionary<string, string>
+                {
+                    { "a", "123" },
+                    { "token", "qwer" }
+                },
+                AuthJsonStr = "{\"test\":\"vvs\"}"
+            };
+            string text = msg.Write();
+            Assert.AreEqual("40/razer,{\"test\":\"vvs\"}", text);
+        }
+
+        [TestMethod]
+        public void Eio4_Auth_Should_Include_Auth(){
+            var msg = new ConnectedMessage
+            {
+                Eio = 4,
+                Protocol = TransportProtocol.Polling,
+                AuthJsonStr = "{\"test\":\"vvs\"}"
+            };
+            string text = msg.Write();
+            Assert.AreEqual("40{\"test\":\"vvs\"}", text);
+        }
+
         [TestMethod]
         public void Disconnected()
         {

src/SocketIOClient.UnitTest/RouterTest.cs

@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using SocketIOClient.Transport;
 using RichardSzalay.MockHttp;
+using SocketIOClient.JsonSerializer;
 
 namespace SocketIOClient.UnitTest
 {
@@ -40,5 +41,22 @@ public async Task V2_Server_Support_Polling_And_WebSocket_ReturnsWebSocket()
             TransportProtocol protocol = await Router.GetProtocolAsync(httpClient, new Uri(uri));
             Assert.AreEqual(TransportProtocol.WebSocket, protocol);
         }
+
+        [TestMethod]
+        public void AuthObject_ReturnsJson()
+        {
+            var options = new SocketIOOptions
+            {
+                Auth = new
+                {
+                    user = "admin",
+                    pwd = "123"
+                }
+            };
+            var serializer = new SystemTextJsonSerializer();
+            var router = new WebSocketRouter(null, null, options, serializer);
+            string actual = router.GetAuthJson();
+            Assert.AreEqual("{\"user\":\"admin\",\"pwd\":\"123\"}", actual);
+        }
     }
 }

src/SocketIOClient/Messages/ConnectedMessage.cs

@@ -25,6 +25,7 @@ public class ConnectedMessage : IMessage
         public TransportProtocol Protocol { get; set; }
 
         public IEnumerable<KeyValuePair<string, string>> Query { get; set; }
+        public string AuthJsonStr { get; set; }
 
         public void Read(string msg)
         {
@@ -69,6 +70,7 @@ public string Eio4Write()
             {
                 builder.Append(Namespace).Append(',');
             }
+            builder.Append(AuthJsonStr);
             return builder.ToString();
         }
 

src/SocketIOClient/Routers/HttpRouter.cs

@@ -1,19 +1,21 @@
-using SocketIOClient.Messages;
+using SocketIOClient.JsonSerializer;
+using SocketIOClient.Messages;
 using SocketIOClient.Transport;
-using SocketIOClient.UriConverters;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Net.Http;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace SocketIOClient.Routers
 {
     public class HttpRouter : Router
     {
-        public HttpRouter(HttpClient httpClient, Func<IClientWebSocket> clientWebSocketProvider, SocketIOOptions options) : base(httpClient, clientWebSocketProvider, options)
+        public HttpRouter(HttpClient httpClient,
+            Func<IClientWebSocket> clientWebSocketProvider,
+            SocketIOOptions options,
+            IJsonSerializer jsonSerializer) : base(httpClient, clientWebSocketProvider, options, jsonSerializer)
         {
         }
 

src/SocketIOClient/Routers/Router.cs

@@ -1,4 +1,5 @@
-using SocketIOClient.Messages;
+using SocketIOClient.JsonSerializer;
+using SocketIOClient.Messages;
 using SocketIOClient.Transport;
 using SocketIOClient.UriConverters;
 using System;
@@ -12,20 +13,25 @@ namespace SocketIOClient.Routers
 {
     public abstract class Router : IDisposable
     {
-        public Router(HttpClient httpClient, Func<IClientWebSocket> clientWebSocketProvider, SocketIOOptions options)
+        public Router(
+            HttpClient httpClient,
+            Func<IClientWebSocket> clientWebSocketProvider,
+            SocketIOOptions options,
+            IJsonSerializer jsonSerializer)
         {
             HttpClient = httpClient;
             ClientWebSocketProvider = clientWebSocketProvider;
             UriConverter = new UriConverter();
             _messageQueue = new Queue<IMessage>();
             Options = options;
+            JsonSerializer = jsonSerializer;
         }
 
         protected HttpClient HttpClient { get; }
         readonly Queue<IMessage> _messageQueue;
         protected Func<IClientWebSocket> ClientWebSocketProvider { get; }
         protected SocketIOOptions Options { get; }
-
+        protected IJsonSerializer JsonSerializer { get; }
         protected OpenedMessage OpenedMessage { get; set; }
 
         CancellationTokenSource _pingTokenSource;
@@ -51,14 +57,20 @@ public virtual Task ConnectAsync()
             return Task.CompletedTask;
         }
 
+        public string GetAuthJson()
+        {
+            return JsonSerializer.Serialize(new[] { Options.Auth }).Json.TrimStart('[').TrimEnd(']');
+        }
+
         protected virtual async Task OpenAsync(OpenedMessage msg)
         {
             OpenedMessage = msg;
             var connectMsg = new ConnectedMessage
             {
                 Namespace = Namespace,
                 Eio = EIO,
-                Query = Options.Query
+                Query = Options.Query,
+                AuthJsonStr = GetAuthJson()
             };
 
             for (int i = 1; i <= 3; i++)

src/SocketIOClient/Routers/WebSocketRouter.cs

@@ -1,4 +1,5 @@
-using SocketIOClient.Messages;
+using SocketIOClient.JsonSerializer;
+using SocketIOClient.Messages;
 using SocketIOClient.Transport;
 using SocketIOClient.UriConverters;
 using System;
@@ -14,7 +15,10 @@ namespace SocketIOClient.Routers
 {
     public class WebSocketRouter : Router
     {
-        public WebSocketRouter(HttpClient httpClient, Func<IClientWebSocket> clientWebSocketProvider, SocketIOOptions options) : base(httpClient, clientWebSocketProvider, options)
+        public WebSocketRouter(HttpClient httpClient,
+            Func<IClientWebSocket> clientWebSocketProvider,
+            SocketIOOptions options,
+            IJsonSerializer jsonSerializer) : base(httpClient, clientWebSocketProvider, options, jsonSerializer)
         {
         }
 

src/SocketIOClient/SocketIO.cs

@@ -175,11 +175,11 @@ private async Task CreateRouterAsync()
                 }
                 if (Options.Transport == TransportProtocol.Polling)
                 {
-                    Router = new HttpRouter(HttpClient, ClientWebSocketProvider, Options);
+                    Router = new HttpRouter(HttpClient, ClientWebSocketProvider, Options, JsonSerializer);
                 }
                 else
                 {
-                    Router = new WebSocketRouter(HttpClient, ClientWebSocketProvider, Options);
+                    Router = new WebSocketRouter(HttpClient, ClientWebSocketProvider, Options, JsonSerializer);
                 }
                 Router.Namespace = Namespace;
                 Router.ServerUri = ServerUri;

src/SocketIOClient/SocketIOOptions.cs

@@ -59,5 +59,7 @@ public double RandomizationFactor
         public int EIO { get; set; }
 
         public bool AutoUpgrade { get; set; }
+
+        public object Auth { get; set; }
     }
 }