diff --git a/TIAM.Database.Test/UserDalTests.cs b/TIAM.Database.Test/UserDalTests.cs index d0356850..2cfa1b97 100644 --- a/TIAM.Database.Test/UserDalTests.cs +++ b/TIAM.Database.Test/UserDalTests.cs @@ -31,6 +31,21 @@ namespace TIAM.Database.Test //_userDal = new UserDal(_mockContext.Object); } + [TestMethod] + [DataRow("540271F6-C604-4C16-8160-D5A7CAFEDF00")] + public override void GetUserById_ReturnsUser_WhenUserExists(string userIdString) + => base.GetUserById_ReturnsUser_WhenUserExists(userIdString); + + [TestMethod] + [DataRow("test@tiam.hu")] + public override void GetUserByEmail_ReturnsUser_WhenUserExists(string email) + => base.GetUserByEmail_ReturnsUser_WhenUserExists(email); + + [TestMethod] + [DataRow("test@tiam.hu")] + public override Task GetUserByEmailAsync_ReturnsUser_WhenUserExists(string email) + => base.GetUserByEmailAsync_ReturnsUser_WhenUserExists(email); + //[TestMethod] //[DataRow("test@tiam.hu")] //public async Task GetUserByEmailAsync_ReturnsUser_WhenUserExists(string email) diff --git a/TIAM.Database/DataLayers/Admins/AdminDal.cs b/TIAM.Database/DataLayers/Admins/AdminDal.cs index 1fa52f4a..c568770a 100644 --- a/TIAM.Database/DataLayers/Admins/AdminDal.cs +++ b/TIAM.Database/DataLayers/Admins/AdminDal.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using TIAM.Database.DbContexts.Admins; using TIAM.Entities.Users; -namespace TIAM.Database.DataLayers.Users +namespace TIAM.Database.DataLayers.Admins { public class AdminDal : DalBase { diff --git a/TIAMSharedUI/Pages/Login.razor.cs b/TIAMSharedUI/Pages/Login.razor.cs index 6f6e6a36..fb32c431 100644 --- a/TIAMSharedUI/Pages/Login.razor.cs +++ b/TIAMSharedUI/Pages/Login.razor.cs @@ -12,6 +12,7 @@ using TIAMSharedUI.Resources; using System.Resources; using Microsoft.Extensions.Localization; using AyCode.Blazor.Components; +using AyCode.Core.Logger; using Azure.Core; namespace TIAMSharedUI.Pages @@ -56,14 +57,13 @@ namespace TIAMSharedUI.Pages private async void SubmitLogin() { - - currentStep = 1; logToBrowserConsole.LogToBC("Login started: " + "Email: " + loginModel.Email + ", Password: " + loginModel.Password); var response = await userDataService.AuthenticateUser(loginModel); //var response = await UserDataservice.TestUserApi(30); logToBrowserConsole.LogToBC("Login started"); logToBrowserConsole.LogToBC(response); + if (!string.IsNullOrEmpty(response)) { //get token and save to local storage diff --git a/TIAMWebApp/Client/Services/UserDataServiceWeb.cs b/TIAMWebApp/Client/Services/UserDataServiceWeb.cs index 825311b0..553a2316 100644 --- a/TIAMWebApp/Client/Services/UserDataServiceWeb.cs +++ b/TIAMWebApp/Client/Services/UserDataServiceWeb.cs @@ -11,6 +11,7 @@ using TIAMWebApp.Shared.Application.Models.ClientSide; using TIAMWebApp.Shared.Application.Models.PageModels; using TIAMWebApp.Shared.Application.Utility; using AyCode.Interfaces.StorageHandlers; +using AyCode.Core.Logger; namespace TIAMWebApp.Client.Services @@ -83,14 +84,20 @@ namespace TIAMWebApp.Client.Services public async Task AuthenticateUser(LoginModel loginModel) { - - - string result = string.Empty; var url = APIUrls.AuthenticateUser; var response = await http.PostAsJsonAsync(url, loginModel); + //try + //{ + // Logger.Detail("Login started: " + "Email: " + loginModel.Email + ", Password: " + loginModel.Password); + //} + //catch (Exception ex) + //{ + // Console.WriteLine(ex); + //} + if (response.IsSuccessStatusCode) { result = await response.Content.ReadAsStringAsync(); diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index 4f867f9e..06c98d36 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -5,6 +5,7 @@ using Newtonsoft.Json.Linq; using System.Reflection.Metadata; using System.Text.Json; using TIAM.Database.DataLayers; +using TIAM.Database.DataLayers.Admins; using TIAM.Database.DataLayers.TransferDestinations; using TIAM.Database.DataLayers.Users; using TIAM.Database.DbContexts; diff --git a/TIAMWebApp/Server/Controllers/UserAPIController.cs b/TIAMWebApp/Server/Controllers/UserAPIController.cs index 9b16cd78..530d747c 100644 --- a/TIAMWebApp/Server/Controllers/UserAPIController.cs +++ b/TIAMWebApp/Server/Controllers/UserAPIController.cs @@ -14,6 +14,7 @@ using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Models.PageModels; using TIAMWebApp.Server.Models; using System.Text; +using AyCode.Core.Logger; using Microsoft.AspNetCore.Hosting; using Microsoft.EntityFrameworkCore; using TIAM.Database.DataLayers.Users; @@ -340,7 +341,7 @@ namespace TIAMWebApp.Server.Controllers [Route("GetUserById")] public async Task GetUserById([FromBody] Guid id) { - Console.WriteLine($"GetUserById called with id: {id}"); + Logger.Info($"GetUserById called with id: {id}"); return await _userDal.GetUserByIdAsync(id); } diff --git a/TIAMWebApp/Server/Program.cs b/TIAMWebApp/Server/Program.cs index 657b5244..3cc816a3 100644 --- a/TIAMWebApp/Server/Program.cs +++ b/TIAMWebApp/Server/Program.cs @@ -14,6 +14,7 @@ using TIAMWebApp.Shared.Application.Models; using TIAM.Database.DataLayers.Users; using TIAM.Database.DataLayers.TransferDestinations; using AyCode.Interfaces.Messages; +using TIAM.Database.DataLayers.Admins; using TIAM.Database.DataLayers.Auctions; using TIAMWebApp.Server.Services; using TIAM.Database.DataLayers.ServiceProviders;