Merge branch 'auth'

Author: loktionov129

WebSocketServer.Tests/ServerTest.cs

@@ -19,7 +19,7 @@ public interface IServer
         /// <summary>
         /// Gets or sets the connected sockets.
         /// </summary>
-        System.Collections.Generic.Dictionary<IWebSocketConnection, string> ConnectedSockets { get; set; }
+        System.Collections.Generic.Dictionary<IWebSocketConnection, Models.UserModel> ConnectedSockets { get; set; }
 
         /// <summary>
         /// The listen messages.

WebSocketServer/IServer.cs

@@ -9,6 +9,10 @@
 
 namespace WebSocketServer.Messages.Handlers
 {
+    using System.Linq;
+
+    using WebSocketServer.Models;
+
     using IWebSocketConnection = Fleck2.Interfaces.IWebSocketConnection;
 
     /// <inheritdoc />
@@ -47,13 +51,32 @@ private void Authorize(IWebSocketConnection socket, string webSocketMessage, ISe
             {
                 var data =
                     Newtonsoft.Json.JsonConvert.DeserializeObject<WebSocketMessage<Payloads.Client.AuthMessage>>(webSocketMessage);
-                if (server.ConnectedSockets.ContainsValue(data.Payload.UserName))
+
+                var tokenData = AppContext.Instance.UsersTokens.FirstOrDefault(userToken => data.Payload.AuthToken == userToken.Token);
+                
+                if (tokenData != null)
                 {
-                    DisconnectSocket(socket, data, server);
+                    var userData = AppContext.Instance.Users.FirstOrDefault(user => user.Id == tokenData.UserId);
+                    if (userData != null && !server.ConnectedSockets.ContainsValue(userData))
+                    {
+                        ConnectSocket(socket, userData, server);
+                    }
+                    else
+                    {
+                        var authMessage = new Payloads.Server.AuthMessage()
+                                              {
+                                                  Message =
+                                                      "Error: you already connected to server!",
+                                                  Status = Payloads.Server.AuthMessage
+                                                      .StatusCode.Error
+                                              };
+                        socket.Send(Helper.BuildMessage(authMessage));
+                        DisconnectSocket(socket, server);
+                    }
                 }
                 else
                 {
-                    ConnectSocket(socket, data, server);
+                    DisconnectSocket(socket, server);
                 }
             }
             catch (System.Exception e)
@@ -68,26 +91,25 @@ private void Authorize(IWebSocketConnection socket, string webSocketMessage, ISe
         /// <param name="socket">
         /// The socket.
         /// </param>
-        /// <param name="data">
-        /// The data.
+        /// <param name="userData">
+        /// The userData.
         /// </param>
         /// <param name="server">
         /// The server.
         /// </param>
-        private void ConnectSocket(IWebSocketConnection socket, WebSocketMessage<Payloads.Client.AuthMessage> data, IServer server)
+        private void ConnectSocket(IWebSocketConnection socket, UserModel userData, IServer server)
         {
-            server.ConnectedSockets.Add(socket, data.Payload.UserName);
+            server.ConnectedSockets.Add(socket, userData);
 
             var authMessage = new Payloads.Server.AuthMessage()
                                   {
-                                      UserName = data.Payload.UserName,
                                       Status = Payloads.Server.AuthMessage.StatusCode.Success
                                   };
             socket.Send(Helper.BuildMessage(authMessage));
 
             var chatMessage = new Payloads.Server.ChatMessage()
                                   {
-                                      UserName = data.Payload.UserName,
+                                      UserName = server.ConnectedSockets[socket].Login,
                                       Message = "has joined the chat!"
                                   };
             Successor.ChatHandler.SendToAll(chatMessage, server);
@@ -99,22 +121,11 @@ private void ConnectSocket(IWebSocketConnection socket, WebSocketMessage<Payload
         /// <param name="socket">
         /// The socket.
         /// </param>
-        /// <param name="data">
-        /// The data.
-        /// </param>
         /// <param name="server">
         /// The server.
         /// </param>
-        private void DisconnectSocket(IWebSocketConnection socket, WebSocketMessage<Payloads.Client.AuthMessage> data, IServer server)
+        private void DisconnectSocket(IWebSocketConnection socket, IServer server)
         {
-            var authMessage = new Payloads.Server.AuthMessage()
-                                  {
-                                      UserName = data.Payload.UserName,
-                                      Message = "Error: the user name <" + data.Payload.UserName + "> is already in use!",
-                                      Status = Payloads.Server.AuthMessage.StatusCode.Error
-                                  };
-            socket.Send(Helper.BuildMessage(authMessage));
-
             socket.Close();
             if (server.ConnectedSockets.ContainsKey(socket))
             {

WebSocketServer/Messages/Handlers/AuthHandler.cs

@@ -26,7 +26,7 @@ public override void Handle(IWebSocketConnection socket, string webSocketMessage
                     Newtonsoft.Json.JsonConvert.DeserializeObject<WebSocketMessage<Payloads.Client.ChatMessage>>(webSocketMessage);
                 var chatMessage = new Payloads.Server.ChatMessage()
                 {
-                    UserName = server.ConnectedSockets[socket],
+                    UserName = server.ConnectedSockets[socket].Login,
                     Message = data.Payload.Message
                 };
                 SendToAll(chatMessage, server);

WebSocketServer/Messages/Handlers/ChatHandler.cs

@@ -23,7 +23,7 @@ public override void Handle(IWebSocketConnection socket, string webSocketMessage
         {
             var usersListMessage = new Payloads.Server.UsersListMessage()
             {
-                UsersList = server.ConnectedSockets.Values.ToArray()
+                UsersList = server.ConnectedSockets.Values.Select(user => user.Login).ToArray()
             };
             socket.Send(Helper.BuildMessage(usersListMessage));
         }

WebSocketServer/Messages/Handlers/UsersListHandler.cs

@@ -13,9 +13,9 @@ namespace WebSocketServer.Messages.Payloads.Client
     public class AuthMessage : BaseMessage
     {
         /// <summary>
-        /// Gets or sets the user name.
+        /// Gets or sets the auth token.
         /// </summary>
-        public string UserName { get; set; }
+        public string AuthToken { get; set; }
 
         /// <inheritdoc />
         protected override string MessageType => Types.AuthMessage;

WebSocketServer/Messages/Payloads/Client/AuthMessage.cs

@@ -22,11 +22,6 @@ public partial class AuthMessage : BaseMessage
         /// </summary>
         public StatusCode Status { get; set; }
 
-        /// <summary>
-        /// Gets or sets the user name.
-        /// </summary>
-        public string UserName { get; set; }
-
         /// <inheritdoc />
         protected override string MessageType => Types.AuthMessage;
     }

WebSocketServer/Messages/Payloads/Server/AuthMessage.cs

@@ -57,6 +57,11 @@ public static AppContext Instance
         /// </summary>
         public DbSet<UserModel> Users { get; set; }
 
+        /// <summary>
+        /// Gets or sets the users tokens.
+        /// </summary>
+        public DbSet<UserTokenModel> UsersTokens { get; set; }
+
         /// <inheritdoc />
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {