From ebb6d7ad8916b7741cbcf737af858d0416f744c9 Mon Sep 17 00:00:00 2001
From: Daniel Gyulai <gydani4@hotmail.hu>
Date: Thu, 12 Nov 2020 11:28:32 +0100
Subject: [PATCH] Fix type error in SessionHandler

---
 CoviDok/BLL/Session/RedisProvider.cs  |  4 ++--
 CoviDok/BLL/Session/SessionHandler.cs |  3 ++-
 CoviDok/data/User.cs                  | 30 ++++++++++++++++-----------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/CoviDok/BLL/Session/RedisProvider.cs b/CoviDok/BLL/Session/RedisProvider.cs
index 9a82f93..908d906 100644
--- a/CoviDok/BLL/Session/RedisProvider.cs
+++ b/CoviDok/BLL/Session/RedisProvider.cs
@@ -9,9 +9,9 @@ namespace CoviDok.BLL
     {
         // The Multiplexer is thread safe, connections are not
         private readonly ConnectionMultiplexer muxer;
-        public RedisProvider(string host)
+        public RedisProvider(string host, string port = "6379")
         {
-            muxer = ConnectionMultiplexer.Connect(host);
+            muxer = ConnectionMultiplexer.Connect(host+":"+port);
         }
         public void Del(string key)
         {
diff --git a/CoviDok/BLL/Session/SessionHandler.cs b/CoviDok/BLL/Session/SessionHandler.cs
index 3816db5..d7d83bf 100644
--- a/CoviDok/BLL/Session/SessionHandler.cs
+++ b/CoviDok/BLL/Session/SessionHandler.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Text.Json;
+using CoviDok.Api;
 using NCuid;
 
 namespace CoviDok.BLL
@@ -25,7 +26,7 @@ namespace CoviDok.BLL
             return session;
         }
 
-        public string CreateSession(string UserType, string UserID)
+        public string CreateSession(Role UserType, string UserID)
         {
             Session session = new Session
             {
diff --git a/CoviDok/data/User.cs b/CoviDok/data/User.cs
index 0399f19..44a07bd 100644
--- a/CoviDok/data/User.cs
+++ b/CoviDok/data/User.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Security.Cryptography;
 using System.Text;
 
 namespace CoviDokClientX.Models
@@ -9,29 +10,34 @@ namespace CoviDokClientX.Models
         public string Id { get; set; }
         public string FirstName { get; set; }
         public string LastName { get; set; }
-        public Gender Gender { get; set; }
         public Role Role { get; set; }
 
         public string Email { get; set; }
 
         public string Password { get; set; }
 
-        public string ConfirmPassword { get; set; }
-        public string Address { get; set; }
-        public string Phone { get; set; }
         public DateTime RegistrationDate { get; set; }
-        public int? PictureId { get; set; }
-        public string PictureName { get; set; }
+        public string PictureId { get; set; }
 
-        public string DisplayName
+        private static byte[] GetHash(string inputString)
         {
-            get
-            {
-                return $"{LastName} {FirstName}";
-            }
+            using (HashAlgorithm algorithm = SHA512.Create())
+                return algorithm.ComputeHash(Encoding.UTF8.GetBytes(inputString));
+        }
+        public static string GetHashString(string inputString)
+        {
+            StringBuilder sb = new StringBuilder();
+            foreach (byte b in GetHash(inputString))
+                sb.Append(b.ToString("X2"));
+
+            return sb.ToString();
+        }
+
+        public bool CheckPassword(string Candidate)
+        {
+            return GetHashString(Candidate) == Password;
         }
     }
 
     public enum Role { Doctor, Assistant, Parent, Child }
-    public enum Gender { Male, Female}
 }