From d3e5d10e6bd5531becf036659714a66ba0a43491 Mon Sep 17 00:00:00 2001
From: barhen <barhen@outlook.com>
Date: Fri, 22 Dec 2023 13:00:47 -0500
Subject: [PATCH] Updated authentication

---
 .gitignore                               |  1 +
 Client/Elements/Headbar.razor            |  2 +-
 Server/Services/AuthenticationService.cs | 56 +++++++++++++-----------
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index e94d754..ad4d995 100644
--- a/.gitignore
+++ b/.gitignore
@@ -363,3 +363,4 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 /Server/.config/dotnet-tools.json
+/Server/.config/dotnet-tools.json
diff --git a/Client/Elements/Headbar.razor b/Client/Elements/Headbar.razor
index dbc4212..7b84759 100644
--- a/Client/Elements/Headbar.razor
+++ b/Client/Elements/Headbar.razor
@@ -28,7 +28,7 @@
             <div id="Profile" @onclick="@ToggleDropdown">
                 <i class="bx bxs-user fs-4 lh-0"></i>
 
-                <ul class=@m_dropDownClass style="width: 150px;">
+                <ul class=@m_dropDownClass style="width: 150px;right: 5px;">
                     <li><a href="#">Profile</a></li>
                     <li><a href="#">Account</a></li>
                     <li><a href="#">Settings</a></li>
diff --git a/Server/Services/AuthenticationService.cs b/Server/Services/AuthenticationService.cs
index c1ae403..2ea25fa 100644
--- a/Server/Services/AuthenticationService.cs
+++ b/Server/Services/AuthenticationService.cs
@@ -1,4 +1,5 @@
-using Biskilog_Accounting.Shared.ClientContractModels;
+using BCrypt.Net;
+using Biskilog_Accounting.Shared.ClientContractModels;
 using Biskilog_Accounting.Shared.Enums;
 using Biskilog_Accounting.Shared.Interfaces;
 using Microsoft.EntityFrameworkCore;
@@ -55,7 +56,7 @@ namespace Biskilog_Accounting.Server.Services
 
             List<int> businessIds = GetSiteaccesspermission(user.ClientId, user.UserId).Select(t => t.BusinessId).ToList();
             Contract? contract = GetContract(user.ClientId, businessIds);
-            List<string> businesses = GetClientbusiness(user.ClientId, user.UserId).Select(t=>t.BusinessExternalId).ToList();
+            List<string> businesses = GetClientbusiness(user.ClientId, user.UserId).Select(t => t.BusinessExternalId).ToList();
 
             if (contract == null)
                 return AuthEnums.Invalid.ToString();
@@ -98,9 +99,9 @@ namespace Biskilog_Accounting.Server.Services
         public List<Clientbusiness> GetClientbusiness(int a_clientId, int userId)
         {
             return (from b in m_context.Clientbusinesses
-                   join p in m_context.Siteaccesspermissions on new {b.ClientId, b.BusinessId} equals new {p.ClientId, p.BusinessId}
-                   where p.UserId == userId && p.ClientId == a_clientId
-                   select b).ToList();
+                    join p in m_context.Siteaccesspermissions on new { b.ClientId, b.BusinessId } equals new { p.ClientId, p.BusinessId }
+                    where p.UserId == userId && p.ClientId == a_clientId
+                    select b).ToList();
         }
 
         public Databasemap GetClientDB(int a_clientId)
@@ -118,28 +119,33 @@ namespace Biskilog_Accounting.Server.Services
             return m_context.Siteaccesspermissions.Where(t => t.ClientId == a_clientId && t.UserId == a_userId).ToList();
         }
 
-        private async Task<Userauth> GetUserAsync(string username, string password)
+        private async Task<Userauth?> GetUserAsync(string username, string password)
         {
             //Todo have complete implementation after means of creating user is done
-            //try
-            //{
-            //    string pa = await m_context.Userauths.Where(u => u.Username == username).Select(u => u.Password).FirstAsync();
-            //    bool verified = BCrypt.Net.BCrypt.Verify(password, pa);
-            //    if (verified)
-            //    {
-
-            //TODO have a complete implementation
-            return await m_context.Userauths.FirstAsync(u => u.Username == username && u.Passsword == password);
-            //    }
-            //    else
-            //    {
-            //        return null;
-            //    }
-            //}catch(Exception ex)
-            //{
-            //    //possible is user not found 
-            //    return null;
-            //}
+            try
+            {
+                string? pa = await m_context.Userauths.Where(u => u.Username == username || u.Email == username).Select(u => u.Passsword).FirstOrDefaultAsync();
+
+                if (String.IsNullOrEmpty(pa))
+                {
+                    return null;
+                }
+                bool verified = BCrypt.Net.BCrypt.Verify(password, pa);
+                if (verified)
+                {
+
+                    return await m_context.Userauths.FirstAsync(u => u.Username == username || u.Email == username);
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            catch (Exception ex)
+            {
+                //possible is user not found 
+                return null;
+            }
         }
     }
 }