From 2b29be9882bee8a7061d5daa1f34bf4010efc58c Mon Sep 17 00:00:00 2001 From: Sean Date: Sun, 23 Feb 2025 12:28:49 -0500 Subject: [PATCH] Added UserExtensions --- App.config | 1 + MarketDataLib/Extensions/UserExtensions.cs | 17 +++++++++++++ MarketDataLib/MarketDataLib.csproj | 3 +++ Program.cs | 28 ++++++++++++++++++---- 4 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 MarketDataLib/Extensions/UserExtensions.cs diff --git a/App.config b/App.config index 9752663..2dc2ba4 100644 --- a/App.config +++ b/App.config @@ -3,6 +3,7 @@ + diff --git a/MarketDataLib/Extensions/UserExtensions.cs b/MarketDataLib/Extensions/UserExtensions.cs new file mode 100644 index 0000000..8dcd336 --- /dev/null +++ b/MarketDataLib/Extensions/UserExtensions.cs @@ -0,0 +1,17 @@ +using MarketData.MarketDataModel.User; +using MarketData.Security; + +namespace MarketData.Extensions +{ + public static class UserExtensions + { + public static bool Verify(this User user, string password) + { + if(null == user || null == user.Username || null == user.Salt || null==user.Hash) + { + return false; + } + return Encryption.VerifyPassword(password, user.Salt, user.Hash); + } +} +} diff --git a/MarketDataLib/MarketDataLib.csproj b/MarketDataLib/MarketDataLib.csproj index a7e7848..a6c19c4 100644 --- a/MarketDataLib/MarketDataLib.csproj +++ b/MarketDataLib/MarketDataLib.csproj @@ -111,6 +111,7 @@ + @@ -119,6 +120,7 @@ + @@ -264,6 +266,7 @@ + diff --git a/Program.cs b/Program.cs index 10789bb..8ea73e1 100644 --- a/Program.cs +++ b/Program.cs @@ -25,6 +25,8 @@ using System.Data; using MarketData.Generator.MovingAverage; using MarketData.Generator.MGSHMomentum; using MarketData.Security; +using MarketData.MarketDataModel.User; +using MarketData.Extensions; namespace MarketData { @@ -989,11 +991,27 @@ namespace MarketData Trace.Listeners.Add(new TextWriterTraceListener(strLogFile)); DateTime currentDate=DateTime.Now; - //String salt= default; - //String hash = default; - -// (String salt, String hash)= Encryption.HashPasswordWithSalt("MN5191306"); -// bool result = Encryption.VerifyPassword("MN5191306", salt, hash); + + //User user = UserDA.GetUser("sean"); + + //if(!user.Verify("MN5191306")) + //{ + // MDTrace.WriteLine(LogLevel.DEBUG,$"User {user.Username} was not verified"); + //} + //else + //{ + // MDTrace.WriteLine(LogLevel.DEBUG,$"User {user.Username} was verified"); + //} + + //(String salt, String hash) = Encryption.HashPasswordWithSalt("MN5191306"); + //bool result = Encryption.VerifyPassword("MN5191306", salt, hash); + + //User user = new User(); + //user.Username="Sean"; + //user.Salt=salt; + //user.Hash=hash; + + //UserDA.AddUser(user); DateTime maxHolidayDate =HolidayDA.GetMaxHolidayDate();