Merge branch 'develop' into newDoctor

ClientApp/Models/Info.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Util;
 
 namespace ClientApp.Models
 {

ClientApp/Utils/Client.cs

@@ -5,6 +5,7 @@ using System.Net.Sockets;
 using System.Text;
 using ClientApp.ViewModels;
 using ProftaakRH;
+using Util;
 
 namespace ClientApp.Utils
 {
@@ -266,7 +267,7 @@ namespace ClientApp.Utils
         public void tryLogin(string username, string password)
         {
             
-            string hashPassword = Hashing.Hasher.HashString(password);
+            string hashPassword = Util.Hasher.HashString(password);
 
             byte[] message = DataParser.getJsonMessage(DataParser.GetLoginJson(username, hashPassword));
 

ClientApp/Utils/DataParser.cs

@@ -1,226 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using System.Text;
-
-namespace ClientApp.Utils
-{
-    public class DataParser
-    {
-        public const string LOGIN = "LOGIN";
-        public const string LOGIN_RESPONSE = "LOGIN RESPONSE";
-        public const string START_SESSION = "START SESSION";
-        public const string STOP_SESSION = "STOP SESSION";
-        public const string SET_RESISTANCE = "SET RESISTANCE";
-        public const string NEW_CONNECTION = "NEW CONNECTION";
-        public const string DISCONNECT = "DISCONNECT";
-        /// <summary>
-        /// makes the json object with LOGIN identifier and username and password
-        /// </summary>
-        /// <param name="mUsername">username</param>
-        /// <param name="mPassword">password</param>
-        /// <returns>json object to ASCII to bytes</returns>
-        public static byte[] GetLoginJson(string mUsername, string mPassword)
-        {
-            dynamic json = new
-            {
-                identifier = LOGIN,
-                data = new
-                {
-                    username = mUsername,
-                    password = mPassword,
-                }
-            };
-
-            return Encoding.ASCII.GetBytes(JsonConvert.SerializeObject(json));
-        }
-
-        public static bool GetUsernamePassword(byte[] jsonbytes, out string username, out string password)
-        {
-            dynamic json = JsonConvert.DeserializeObject(Encoding.ASCII.GetString(jsonbytes));
-            try
-            {
-                username = json.data.username;
-                password = json.data.password;
-                return true;
-            }
-            catch
-            {
-                username = null;
-                password = null;
-                return false;
-            }
-        }
-
-        private static byte[] getJsonMessage(string mIdentifier, dynamic data)
-        {
-            dynamic json = new
-            {
-                identifier = mIdentifier,
-                data
-            };
-            return getMessage(Encoding.ASCII.GetBytes(JsonConvert.SerializeObject(json)), 0x01);
-        }
-
-        private static byte[] getJsonMessage(string mIdentifier)
-        {
-            dynamic json = new
-            {
-                identifier = mIdentifier,
-            };
-            return getMessage(Encoding.ASCII.GetBytes(JsonConvert.SerializeObject(json)), 0x01);
-        }
-
-        public static byte[] getLoginResponse(string mStatus)
-        {
-            return getJsonMessage(LOGIN_RESPONSE, new { status = mStatus });
-        }
-
-        public static string getResponseStatus(byte[] json)
-        {
-            return ((dynamic)JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json))).data.status;
-        }
-
-        /// <summary>
-        /// get the identifier from json
-        /// </summary>
-        /// <param name="bytes">json in ASCII</param>
-        /// <param name="identifier">gets the identifier</param>
-        /// <returns>if it sucseeded</returns>
-        public static bool getJsonIdentifier(byte[] bytes, out string identifier)
-        {
-            if (bytes.Length <= 5)
-            {
-                throw new ArgumentException("bytes to short");
-            }
-            byte messageId = bytes[4];
-
-            if (messageId == 0x01)
-            {
-                dynamic json = JsonConvert.DeserializeObject(Encoding.ASCII.GetString(bytes.Skip(5).ToArray()));
-                identifier = json.identifier;
-                return true;
-            }
-            else
-            {
-                identifier = "";
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// checks if the de message is raw data according to the protocol
-        /// </summary>
-        /// <param name="bytes">message</param>
-        /// <returns>if message contains raw data</returns>
-        public static bool isRawData(byte[] bytes)
-        {
-            if (bytes.Length <= 5)
-            {
-                throw new ArgumentException("bytes to short");
-            }
-            return bytes[4] == 0x02;
-        }
-
-        /// <summary>
-        /// constructs a message with the payload, messageId and clientId
-        /// </summary>
-        /// <param name="payload"></param>
-        /// <param name="messageId"></param>
-        /// <param name="clientId"></param>
-        /// <returns>the message ready for sending</returns>
-        private static byte[] getMessage(byte[] payload, byte messageId)
-        {
-            byte[] res = new byte[payload.Length + 5];
-
-            Array.Copy(BitConverter.GetBytes(payload.Length + 5), 0, res, 0, 4);
-            res[4] = messageId;
-            Array.Copy(payload, 0, res, 5, payload.Length);
-
-            return res;
-        }
-
-        /// <summary>
-        /// constructs a message with the payload and clientId and assumes the payload is raw data
-        /// </summary>
-        /// <param name="payload"></param>
-        /// <param name="clientId"></param>
-        /// <returns>the message ready for sending</returns>
-        public static byte[] GetRawDataMessage(byte[] payload)
-        {
-            return getMessage(payload, 0x02);
-        }
-
-        /// <summary>
-        /// constructs a message with the payload and clientId and assumes the payload is json
-        /// </summary>
-        /// <param name="payload"></param>
-        /// <param name="clientId"></param>
-        /// <returns>the message ready for sending</returns>
-        public static byte[] getJsonMessage(byte[] payload)
-        {
-            return getMessage(payload, 0x01);
-        }
-
-        public static byte[] getStartSessionJson()
-        {
-            return getJsonMessage(START_SESSION);
-        }
-
-        public static byte[] getStopSessionJson()
-        {
-            return getJsonMessage(STOP_SESSION);
-        }
-
-        public static byte[] getSetResistanceJson(float mResistance)
-        {
-            dynamic data = new
-            {
-                resistance = mResistance
-            };
-            return getJsonMessage(SET_RESISTANCE, data);
-        }
-
-        public static byte[] getSetResistanceResponseJson(bool mWorked)
-        {
-            dynamic data = new
-            {
-                worked = mWorked
-            };
-            return getJsonMessage(SET_RESISTANCE, data);
-        }
-
-        public static float getResistanceFromJson(byte[] json)
-        {
-            return ((dynamic)JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json))).data.resistance;
-        }
-
-        public static bool getResistanceFromResponseJson(byte[] json)
-        {
-            return ((dynamic)JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json))).data.worked;
-        }
-
-        public static byte[] getNewConnectionJson(string user)
-        {
-            dynamic data = new
-            {
-                username = user
-            };
-            return getJsonMessage(NEW_CONNECTION, data);
-        }
-
-        public static byte[] getDisconnectJson(string user)
-        {
-            dynamic data = new
-            {
-                username = user
-            };
-            return getJsonMessage(DISCONNECT, data);
-        }
-
-
-    }
-}

ClientApp/ViewModels/LoginViewModel.cs

@@ -7,6 +7,7 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using ClientApp.Utils;
 using GalaSoft.MvvmLight.Command;
+using Util;
 
 namespace ClientApp.ViewModels
 {

ClientApp/ViewModels/MainViewModel.cs

@@ -3,6 +3,7 @@ using ClientApp.Utils;
 using GalaSoft.MvvmLight.Command;
 using System.Diagnostics;
 using System.Windows.Input;
+using Util;
 
 namespace ClientApp.ViewModels
 {

ClientApp/ViewModels/MainWindowViewModel.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
+using Util;
 
 namespace ClientApp.ViewModels
 {

DoctorApp/Models/Info.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Util;
 
 namespace DoctorApp.Models
 {

DoctorApp/Utils/Client.cs

@@ -5,6 +5,7 @@ using System.Net.Sockets;
 using System.Text;
 using DoctorApp.ViewModels;
 using ProftaakRH;
+using Util;
 
 namespace DoctorApp.Utils
 {
@@ -233,10 +234,10 @@ namespace DoctorApp.Utils
         /// </summary>
         public void tryLogin(string username, string password)
         {
-            string hashUser = Hashing.Hasher.HashString(username);
+            
-            string hashPassword = Hashing.Hasher.HashString(password);
+            string hashPassword = Util.Hasher.HashString(password);
 
-            byte[] message = DataParser.getJsonMessage(DataParser.GetLoginJson(hashUser, hashPassword));
+            byte[] message = DataParser.getJsonMessage(DataParser.LoginAsDoctor(username, hashPassword));
 
 
             this.stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null);

DoctorApp/Utils/ObservableObject.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
-
-namespace DoctorApp.Utils
-{
-    public abstract class ObservableObject : INotifyPropertyChanged
-    {
-        public event PropertyChangedEventHandler PropertyChanged;
-    }
-}

DoctorApp/ViewModels/LoginViewModel.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Windows.Controls;
 using System.Windows.Input;
+using Util;
 
 namespace DoctorApp.ViewModels
 {

DoctorApp/ViewModels/MainViewModel.cs

@@ -5,6 +5,7 @@ using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Text;
 using System.Windows.Controls;
+using Util;
 
 namespace DoctorApp.ViewModels
 {

DoctorApp/ViewModels/MainWindowViewModel.cs

@@ -3,6 +3,7 @@ using DoctorApp.Utils;
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Util;
 
 namespace DoctorApp.ViewModels
 {

Hashing/DataParser.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Text;
 
-namespace DoctorApp.Utils
+namespace Util
 {
     public class DataParser
     {
@@ -17,6 +17,8 @@ namespace DoctorApp.Utils
         public const string SET_RESISTANCE = "SET RESISTANCE";
         public const string NEW_CONNECTION = "NEW CONNECTION";
         public const string DISCONNECT = "DISCONNECT";
+        public const string LOGIN_DOCTOR = "LOGIN DOCTOR";
+        public const string MESSAGE = "MESSAGE";
         /// <summary>
         /// makes the json object with LOGIN identifier and username and password
         /// </summary>
@@ -38,6 +40,21 @@ namespace DoctorApp.Utils
             return Encoding.ASCII.GetBytes(JsonConvert.SerializeObject(json));
         }
 
+        public static byte[] LoginAsDoctor(string mUsername, string mPassword)
+        {
+            dynamic json = new
+            {
+                identifier = LOGIN_DOCTOR,
+                data = new
+                {
+                    username = mUsername,
+                    password = mPassword,
+                }
+            };
+
+            return Encoding.ASCII.GetBytes(JsonConvert.SerializeObject(json));
+        }
+
         public static bool GetUsernamePassword(byte[] jsonbytes, out string username, out string password)
         {
             dynamic json = JsonConvert.DeserializeObject(Encoding.ASCII.GetString(jsonbytes));

Hashing/Hasher.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace Hashing
+namespace Util
 {
     class Hasher
     {

Hashing/Hashing.projitems

@@ -9,6 +9,8 @@
     <Import_RootNamespace>Hashing</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)DataParser.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Hasher.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ObservableObject.cs" />
   </ItemGroup>
 </Project>

Hashing/ObservableObject.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
 
-namespace ClientApp.Utils
+namespace Util
 {
     public abstract class ObservableObject : INotifyPropertyChanged
     {

ProftaakRH/ProftaakRH.sln

@@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.30413.136
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientApp", "..\ClientApp\ClientApp.csproj", "{7EF854C1-73EB-4099-A7D7-057CCEEE6F8F}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Hashing", "..\Hashing\Hashing.shproj", "{70277749-D423-4871-B692-2EFC5A6ED932}"
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Util", "..\Hashing\Util.shproj", "{70277749-D423-4871-B692-2EFC5A6ED932}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProftaakRH", "ProftaakRH.csproj", "{C1A3CCE4-5FBB-4655-BFE1-7AF2B7D58CA3}"
 EndProject

Server/Client.cs

@@ -4,6 +4,8 @@ using System.Net.Sockets;
 using System.Text;
 using Newtonsoft.Json;
 using ClientApp.Utils;
+using System.Diagnostics;
+using Util;
 
 namespace Server
 {
@@ -93,28 +95,12 @@ namespace Server
                 switch (identifier)
                 {
                     case DataParser.LOGIN:
-                        string username;
+                        handleLogin(payloadbytes);
-                        string password;
+                        break;
-                        bool worked = DataParser.GetUsernamePassword(payloadbytes, out username, out password);
+                    case DataParser.LOGIN_DOCTOR:
-                        if (worked)
+                        handleLogin(payloadbytes);
-                        {
+                        communication.doctor = this;
-                            if (verifyLogin(username, password))
+                        Console.WriteLine("Set doctor to " + communication.doctor + " , this is " + this);
-                            {
-                                Console.WriteLine("Log in");
-                                this.username = username;
-                                sendMessage(DataParser.getLoginResponse("OK"));
-                                sendMessage(DataParser.getStartSessionJson());
-                                communication.NewLogin(this);
-                            }
-                            else
-                            {
-                                sendMessage(DataParser.getLoginResponse("wrong username or password"));
-                            }
-                        }
-                        else
-                        {
-                            sendMessage(DataParser.getLoginResponse("invalid json"));
-                        }
                         break;
                     case DataParser.START_SESSION:
                         this.saveData = new SaveData(Directory.GetCurrentDirectory() + "/" + this.username + "/" + sessionStart.ToString("yyyy-MM-dd HH-mm-ss"));
@@ -123,7 +109,7 @@ namespace Server
                         this.saveData = null;
                         break;
                     case DataParser.SET_RESISTANCE:
-                        worked = DataParser.getResistanceFromResponseJson(payloadbytes);
+                        bool worked = DataParser.getResistanceFromResponseJson(payloadbytes);
                         Console.WriteLine($"set resistance worked is " + worked);
                         //set resistance on doctor GUI
                         break;
@@ -162,6 +148,32 @@ namespace Server
 
         }
 
+        private void handleLogin(byte[] payloadbytes)
+        {
+            string username;
+            string password;
+            bool worked = DataParser.GetUsernamePassword(payloadbytes, out username, out password);
+            if (worked)
+            {
+                if (verifyLogin(username, password))
+                {
+                    Console.WriteLine("Log in");
+                    this.username = username;
+                    sendMessage(DataParser.getLoginResponse("OK"));
+                    sendMessage(DataParser.getStartSessionJson());
+                    communication.NewLogin(this);
+                }
+                else
+                {
+                    sendMessage(DataParser.getLoginResponse("wrong username or password"));
+                }
+            }
+            else
+            {
+                sendMessage(DataParser.getLoginResponse("invalid json"));
+            }
+        }
+
         public void sendMessage(byte[] message)
         {
             stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null);

Server/Communication.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Net.Sockets;
 using System.Text;
 using DoctorApp.Utils;
+using Util;
 
 namespace Server
 {
@@ -12,7 +13,7 @@ namespace Server
     {
         private TcpListener listener;
         private List<Client> clients;
-        private Client doctor;
+        public Client doctor;
         public Communication(TcpListener listener)
         {
             this.listener = listener;