From 037d7732f75f669bd0e59c2438d3fd8c754f8afb Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Wed, 14 Oct 2020 14:55:31 +0200 Subject: [PATCH] changed name from hasher to util --- ClientApp/Utils/Client.cs | 2 +- DoctorApp/Utils/Client.cs | 6 +++--- Hashing/Hasher.cs | 2 +- Hashing/{Hashing.shproj => Util.shproj} | 0 ProftaakRH/ProftaakRH.sln | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename Hashing/{Hashing.shproj => Util.shproj} (100%) diff --git a/ClientApp/Utils/Client.cs b/ClientApp/Utils/Client.cs index d3f015c..5b869fa 100644 --- a/ClientApp/Utils/Client.cs +++ b/ClientApp/Utils/Client.cs @@ -266,7 +266,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)); diff --git a/DoctorApp/Utils/Client.cs b/DoctorApp/Utils/Client.cs index 5ab73e3..79c2fba 100644 --- a/DoctorApp/Utils/Client.cs +++ b/DoctorApp/Utils/Client.cs @@ -233,10 +233,10 @@ namespace DoctorApp.Utils /// 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.LoginAsDoctor(hashUser, hashPassword)); + byte[] message = DataParser.getJsonMessage(DataParser.LoginAsDoctor(username, hashPassword)); this.stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null); diff --git a/Hashing/Hasher.cs b/Hashing/Hasher.cs index 270faa3..b26eb24 100644 --- a/Hashing/Hasher.cs +++ b/Hashing/Hasher.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Security.Cryptography; using System.Text; -namespace Hashing +namespace Util { class Hasher { diff --git a/Hashing/Hashing.shproj b/Hashing/Util.shproj similarity index 100% rename from Hashing/Hashing.shproj rename to Hashing/Util.shproj diff --git a/ProftaakRH/ProftaakRH.sln b/ProftaakRH/ProftaakRH.sln index ce4248e..4d66ee3 100644 --- a/ProftaakRH/ProftaakRH.sln +++ b/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