From 7096c9063721b3621a97d6949e2289d42d0685bf Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 25 Nov 2023 03:17:41 +0100 Subject: [PATCH] AdminDal (?), Registration and login almost finished (works from db already), login approvements, new api endpoints --- TIAM.Database/DataLayers/Admins/AdminDal.cs | 47 +++++ .../TransferDestinationDal.cs | 9 + TIAM.Database/DataLayers/Users/UserDal.cs | 17 ++ TIAM.Database/DbContexts/AdminDbContext.cs | 39 +++++ TIAM.Database/DbContexts/UserDbContext.cs | 3 + .../TransferDestination.cs | 46 ++--- TIAM.Entities/Users/User.cs | 5 + .../Services/SecureStorageHandler.cs | 11 ++ TIAMMobileApp/Services/UserDataService.cs | 19 ++- TIAMSharedUI/Pages/Components/AppLaunch.razor | 24 ++- TIAMSharedUI/Pages/Index.razor | 2 +- TIAMSharedUI/Pages/Login2.razor | 6 +- TIAMSharedUI/Shared/MainLayout.razor | 10 +- TIAMSharedUI/Shared/NavMenu.razor | 16 +- TIAMSharedUI/Shared/Users/AdminNavMenu.razor | 16 +- .../Client/Services/SecureStorageHandler.cs | 12 ++ TIAMWebApp/Client/Services/UserDataService.cs | 20 ++- .../Controllers/GoogleAPIController .cs | 2 +- .../Controllers/TransferDataAPIController.cs | 78 ++++++++- .../Server/Controllers/UserAPIController.cs | 161 ++++++++++++------ .../WeatherForecastAPIController.cs | 2 +- TIAMWebApp/Server/Program.cs | 2 +- TIAMWebApp/Server/TIAMWebApp.Server.csproj | 3 + .../Interfaces/ISecureStorageHandler.cs | 3 + TIAMWebApp/Shared/Models/APIUrls.cs | 5 +- .../Shared/Models/ClientSide/Setting.cs | 1 + .../Shared/Utility/LogToBrowserConsole.cs | 7 +- TIAMWebApp/Shared/Utility/PasswordHasher.cs | 48 ------ 28 files changed, 438 insertions(+), 176 deletions(-) create mode 100644 TIAM.Database/DataLayers/Admins/AdminDal.cs create mode 100644 TIAM.Database/DbContexts/AdminDbContext.cs delete mode 100644 TIAMWebApp/Shared/Utility/PasswordHasher.cs diff --git a/TIAM.Database/DataLayers/Admins/AdminDal.cs b/TIAM.Database/DataLayers/Admins/AdminDal.cs new file mode 100644 index 00000000..68cc0bf6 --- /dev/null +++ b/TIAM.Database/DataLayers/Admins/AdminDal.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; +using TIAM.Database.DbContexts; +using TIAM.Entities.Users; + +namespace TIAM.Database.DataLayers.Users +{ + public class AdminDal : TiamDalBase + { + + public AdminDal() : base() + { + } + + public Task> GetUsersAsync() + { + return Ctx.Users.ToListAsync(); + } + + public Task GetUserByEmailAsync(string email) + { + Console.WriteLine($"Getting user from db {email}"); + var emailLower = email.ToLower(); + return Ctx.Users.SingleOrDefaultAsync(x=>x.Email.ToLower() == emailLower); + } + + public Task CreateUserAsync(User user) + { + user.Created = DateTime.UtcNow; + user.Modified = DateTime.UtcNow; + Ctx.Users.Add(user); + Console.WriteLine($"Saving user to db {user.Id}, {user.Email}, {user.PhoneNumber}, {user.Password}"); + return Ctx.SaveChangesAsync().ContinueWith(x=>x.Result > 0); + } + + public Task UpdateUserAsync(User user) + { + user.Modified = DateTime.UtcNow; + Ctx.Users.Update(user); + return Ctx.SaveChangesAsync().ContinueWith(x=>x.Result > 0); + } + } +} diff --git a/TIAM.Database/DataLayers/TransferDestinations/TransferDestinationDal.cs b/TIAM.Database/DataLayers/TransferDestinations/TransferDestinationDal.cs index 62b2be75..effc716e 100644 --- a/TIAM.Database/DataLayers/TransferDestinations/TransferDestinationDal.cs +++ b/TIAM.Database/DataLayers/TransferDestinations/TransferDestinationDal.cs @@ -7,6 +7,7 @@ using AyCode.Database; using Microsoft.Identity.Client; using TIAM.Database.DbContexts; using TIAM.Entities.TransferDestinations; +using TIAM.Entities.Users; namespace TIAM.Database.DataLayers.TransferDestinations; @@ -15,4 +16,12 @@ public class TransferDestinationDal : TiamDalBase public TransferDestinationDal() : base() { } + + public Task CreateTransferDestinationAsync(TransferDestination transferDestination) + { + transferDestination.Created = DateTime.UtcNow; + transferDestination.Modified = DateTime.UtcNow; + Ctx.TransferDestinations.Add(transferDestination); + return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0); + } } \ No newline at end of file diff --git a/TIAM.Database/DataLayers/Users/UserDal.cs b/TIAM.Database/DataLayers/Users/UserDal.cs index 483b2d26..aebe62e5 100644 --- a/TIAM.Database/DataLayers/Users/UserDal.cs +++ b/TIAM.Database/DataLayers/Users/UserDal.cs @@ -23,8 +23,25 @@ namespace TIAM.Database.DataLayers.Users public Task GetUserByEmailAsync(string email) { + Console.WriteLine($"Getting user from db {email}"); var emailLower = email.ToLower(); return Ctx.Users.SingleOrDefaultAsync(x=>x.Email.ToLower() == emailLower); } + + public Task CreateUserAsync(User user) + { + user.Created = DateTime.UtcNow; + user.Modified = DateTime.UtcNow; + Ctx.Users.Add(user); + Console.WriteLine($"Saving user to db {user.Id}, {user.Email}, {user.PhoneNumber}, {user.Password}"); + return Ctx.SaveChangesAsync().ContinueWith(x=>x.Result > 0); + } + + public Task UpdateUserAsync(User user) + { + user.Modified = DateTime.UtcNow; + Ctx.Users.Update(user); + return Ctx.SaveChangesAsync().ContinueWith(x=>x.Result > 0); + } } } diff --git a/TIAM.Database/DbContexts/AdminDbContext.cs b/TIAM.Database/DbContexts/AdminDbContext.cs new file mode 100644 index 00000000..5629f9db --- /dev/null +++ b/TIAM.Database/DbContexts/AdminDbContext.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using AyCode.Database.DbContexts; +using Microsoft.EntityFrameworkCore; +using TIAM.Entities.TransferDestinations; +using TIAM.Entities.Users; + +namespace TIAM.Database.DbContexts +{ + public class AdminDbContext : TiamDbContextBase + { + public DbSet Users { get; set; } + public DbSet TransferDestinations { get; set; } + + public AdminDbContext() //: this(string.Empty) + { + + } + + public AdminDbContext(string name) : base(name) + { + } + + public AdminDbContext(DbContextOptions options, string name) : base(options, name) + { + } + + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + optionsBuilder.EnableDetailedErrors(true); + base.OnConfiguring(optionsBuilder); + } + + + } +} diff --git a/TIAM.Database/DbContexts/UserDbContext.cs b/TIAM.Database/DbContexts/UserDbContext.cs index 7ea71de0..23ee41de 100644 --- a/TIAM.Database/DbContexts/UserDbContext.cs +++ b/TIAM.Database/DbContexts/UserDbContext.cs @@ -29,7 +29,10 @@ namespace TIAM.Database.DbContexts protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { + optionsBuilder.EnableDetailedErrors(true); base.OnConfiguring(optionsBuilder); } + + } } diff --git a/TIAM.Entities/TransferDestinations/TransferDestination.cs b/TIAM.Entities/TransferDestinations/TransferDestination.cs index 39b3dc9a..50d2fbc0 100644 --- a/TIAM.Entities/TransferDestinations/TransferDestination.cs +++ b/TIAM.Entities/TransferDestinations/TransferDestination.cs @@ -1,44 +1,30 @@ using System.ComponentModel.DataAnnotations.Schema; using AyCode.Entities.Interfaces; +using AyCode.Entities.Locations; using AyCode.Interfaces.TimeStampInfo; namespace TIAM.Entities.TransferDestinations { [Table("TransferDestination")] - public class TransferDestination : IEntityGuid, ITimeStampInfo + public class TransferDestination : LocationBase, ITimeStampInfo { - [DatabaseGenerated(DatabaseGeneratedOption.None)] - public Guid Id - { - get; - set; - } - public string Name - { - get; - set; - } - - public string Description - { - get; - set; - } - - public decimal Longitude - { - get; - set; - } - - public decimal Latitude - { - get; - set; - } + public Guid Id { get; set; } + public double Longitude { get; set; } + public double Latitude { get; set; } + public string? Address { get; set; } + public string? Name { get; set; } public DateTime Created { get; set; } public DateTime Modified { get; set; } + + public TransferDestination() { } + + public TransferDestination(double longitude, double latitude, string address) : this(Guid.NewGuid(), longitude, latitude, address) { } + + public TransferDestination(Guid id, double longitude, double latitude, string address) : base(Guid.NewGuid(), longitude, latitude, address) { } + + + public TransferDestination(Guid id, string name, double longitude, double latitude, string address) : base(id, longitude, latitude, address) { } } } diff --git a/TIAM.Entities/Users/User.cs b/TIAM.Entities/Users/User.cs index 71bdac29..10a6ebbc 100644 --- a/TIAM.Entities/Users/User.cs +++ b/TIAM.Entities/Users/User.cs @@ -13,5 +13,10 @@ namespace TIAM.Entities.Users public User(string email, string password) : this(Guid.NewGuid(), email, password) { } public User(Guid id, string email, string password) : base(id, email, password) { } + public User(Guid id, string email, string phoneNumber, string password) : base(id, email, phoneNumber, password) + { } + public User(Guid id, string email, string phoneNumber, string password, string refreshToken) : base(id, email, phoneNumber, password, refreshToken) + { } + } } diff --git a/TIAMMobileApp/Services/SecureStorageHandler.cs b/TIAMMobileApp/Services/SecureStorageHandler.cs index ae3afd53..abd615cc 100644 --- a/TIAMMobileApp/Services/SecureStorageHandler.cs +++ b/TIAMMobileApp/Services/SecureStorageHandler.cs @@ -21,5 +21,16 @@ namespace TIAMMobileApp.Services { return await SecureStorage.GetAsync(key); } + + public async Task DeleteFromSecureStorageAsync(string key) + { + SecureStorage.Remove(key); + } + + public async Task ClearAllSecureStorageAsync() + { + SecureStorage.RemoveAll(); + } + } } diff --git a/TIAMMobileApp/Services/UserDataService.cs b/TIAMMobileApp/Services/UserDataService.cs index d2d11669..5c24c362 100644 --- a/TIAMMobileApp/Services/UserDataService.cs +++ b/TIAMMobileApp/Services/UserDataService.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.JSInterop; using Newtonsoft.Json; using System.Net.Http.Json; using System.Text; @@ -7,21 +8,23 @@ using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Models.ClientSide; using TIAMWebApp.Shared.Application.Models.PageModels; - +using TIAMWebApp.Shared.Application.Utility; namespace TIAMMobilApp.Services { public class UserDataService : IUserDataService { private readonly HttpClient http; - private readonly ISecureStorageHandler secureStorageHandler; + private readonly ISecureStorageHandler secureStorageHandler; + + public UserModel? User { get; set; } = new UserModel("", "", ""); public Dictionary userRoleTypes { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } public UserDataService(HttpClient http, ISecureStorageHandler secureStorageHandler) { this.http = http; - this.secureStorageHandler = secureStorageHandler; + this.secureStorageHandler = secureStorageHandler; } @@ -127,18 +130,18 @@ namespace TIAMMobilApp.Services return (isSuccess, result); } - public Task> GetUsersAsync() + public async Task?> GetUsersAsync() { - throw new NotImplementedException(); + return await http.GetFromJsonAsync>(APIUrls.GetUsers); } - public Task GetUserByEmailAsync(string email) + public async Task GetUserByEmailAsync(string email) { - throw new NotImplementedException(); + return await http.GetFromJsonAsync(APIUrls.GetUserByEmail); } public async Task RefreshToken() - { + { bool isTokenRefreshed = false; using (var client = new HttpClient()) { diff --git a/TIAMSharedUI/Pages/Components/AppLaunch.razor b/TIAMSharedUI/Pages/Components/AppLaunch.razor index ec1d3b5d..8c9b90db 100644 --- a/TIAMSharedUI/Pages/Components/AppLaunch.razor +++ b/TIAMSharedUI/Pages/Components/AppLaunch.razor @@ -1,4 +1,4 @@ -@page "/"; +@page "/admin"; @using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Models @using TIAMWebApp.Shared.Application.Utility @@ -6,18 +6,25 @@ @using System.IdentityModel.Tokens.Jwt @using TIAMWebApp.Shared.Application.Models.ClientSide @inject NavigationManager NavManager +@inject IJSRuntime JSRuntime @inject LogToBrowserConsole logToBrowserConsole @inject IUserDataService UserDataService @inject ISecureStorageHandler SecureStorageHandler +@inject HttpClient http;

AppLaunch

Loading.... @code { - + protected async override Task OnInitializedAsync() { + + logToBrowserConsole = new LogToBrowserConsole(JSRuntime); + //wait for 5 seconds + await Task.Delay(5000); + string userDetailsStr = await SecureStorageHandler.GetFromSecureStorageAsync(nameof(Setting.UserBasicDetails)); logToBrowserConsole.LogToBC(userDetailsStr); if (!string.IsNullOrWhiteSpace(userDetailsStr)) @@ -25,30 +32,37 @@ Loading.... var userBasicDetail = JsonConvert.DeserializeObject(userDetailsStr); var handler = new JwtSecurityTokenHandler(); - var jsontoken = handler.ReadToken(userBasicDetail.AccessToken) as JwtSecurityToken; - Setting.UserBasicDetails = userBasicDetail; + var jsontoken = handler.ReadToken(userBasicDetail?.AccessToken) as JwtSecurityToken; + + if(userBasicDetail!= null) + Setting.UserBasicDetails = userBasicDetail; - if (jsontoken.ValidTo < DateTime.UtcNow) + if (jsontoken?.ValidTo < DateTime.UtcNow) { + logToBrowserConsole.LogToBC("Token needs to be refreshed"); bool isTokenRefreshed = await UserDataService.RefreshToken(); if (isTokenRefreshed) { + logToBrowserConsole.LogToBC("Token refreshed"); NavManager.NavigateTo("/home"); } else { + logToBrowserConsole.LogToBC("Couldn't refresh token"); NavManager.NavigateTo("/login"); } } else { + logToBrowserConsole.LogToBC("Valid token found"); NavManager.NavigateTo("/home"); } } else { + logToBrowserConsole.LogToBC("No token stored yet"); NavManager.NavigateTo("/login"); } diff --git a/TIAMSharedUI/Pages/Index.razor b/TIAMSharedUI/Pages/Index.razor index 8201f41f..b5560892 100644 --- a/TIAMSharedUI/Pages/Index.razor +++ b/TIAMSharedUI/Pages/Index.razor @@ -1,4 +1,4 @@ -@page "/index" +@page "/" @using TIAMSharedUI.Shared Index diff --git a/TIAMSharedUI/Pages/Login2.razor b/TIAMSharedUI/Pages/Login2.razor index a1ee0510..f7e43727 100644 --- a/TIAMSharedUI/Pages/Login2.razor +++ b/TIAMSharedUI/Pages/Login2.razor @@ -57,7 +57,7 @@ } }
- Already have an account? Sign in here! + No account yet? Sign up here!
@@ -130,7 +130,7 @@ //await App.Current.MainPage.DisplayAlert("Error", "Invalid credentials", "Ok"); //display error message via jsinterop logToBrowserConsole.LogToBC("Invalid credentials"); - navManager.NavigateTo("login2"); + navManager.NavigateTo("login"); } else { @@ -153,7 +153,7 @@ //await App.Current.MainPage.DisplayAlert("Error", "An error occured while trying to login", "Ok"); //display error message via jsinterop logToBrowserConsole.LogToBC("An error occured while trying to login"); - navManager.NavigateTo("login2"); + navManager.NavigateTo("login"); } } diff --git a/TIAMSharedUI/Shared/MainLayout.razor b/TIAMSharedUI/Shared/MainLayout.razor index f5d6d31f..604d917e 100644 --- a/TIAMSharedUI/Shared/MainLayout.razor +++ b/TIAMSharedUI/Shared/MainLayout.razor @@ -5,14 +5,11 @@ @inject IJSRuntime jsRuntime
- @if (Setting.UserBasicDetails != null) - { +
- } - - +
@{ @@ -20,8 +17,7 @@ { } - } - + } @Body
diff --git a/TIAMSharedUI/Shared/NavMenu.razor b/TIAMSharedUI/Shared/NavMenu.razor index b9d88571..8c558b42 100644 --- a/TIAMSharedUI/Shared/NavMenu.razor +++ b/TIAMSharedUI/Shared/NavMenu.razor @@ -1,4 +1,7 @@ -
+@using TIAMWebApp.Shared.Application.Interfaces +@inject ISecureStorageHandler SecureStorageHandler + +
- - Api + + Signout
@@ -63,6 +66,11 @@ private void NavigateBack() { - + + } + + private void SignOut() + { + SecureStorageHandler.ClearAllSecureStorageAsync(); } } diff --git a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor index e5981f72..cc98d638 100644 --- a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor +++ b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor @@ -1,4 +1,7 @@ -
+@using TIAMWebApp.Shared.Application.Interfaces +@inject ISecureStorageHandler SecureStorageHandler + +
+
+ + Signout + +
@@ -67,4 +75,10 @@ { } + + private void SignOut() + { + SecureStorageHandler.ClearAllSecureStorageAsync(); + } + } diff --git a/TIAMWebApp/Client/Services/SecureStorageHandler.cs b/TIAMWebApp/Client/Services/SecureStorageHandler.cs index 9bfd97d2..3dbea9de 100644 --- a/TIAMWebApp/Client/Services/SecureStorageHandler.cs +++ b/TIAMWebApp/Client/Services/SecureStorageHandler.cs @@ -29,5 +29,17 @@ namespace TIAMWebApp.Client.Services return await ssa.GetValueAsync(key); } + + public async Task DeleteFromSecureStorageAsync(string key) + { + await localStoragService.RemoveItemAsync(key); + await ssa.RemoveAsync(key); + } + + public async Task ClearAllSecureStorageAsync() + { + await localStoragService.ClearAsync(); + await ssa.Clear(); + } } } diff --git a/TIAMWebApp/Client/Services/UserDataService.cs b/TIAMWebApp/Client/Services/UserDataService.cs index 441c9eae..ebb77a9a 100644 --- a/TIAMWebApp/Client/Services/UserDataService.cs +++ b/TIAMWebApp/Client/Services/UserDataService.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.JSInterop; using Newtonsoft.Json; using System.Net.Http.Json; using System.Text; @@ -8,6 +9,7 @@ using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Models.ClientSide; using TIAMWebApp.Shared.Application.Models.PageModels; +using TIAMWebApp.Shared.Application.Utility; namespace TIAMWebApp.Client.Services @@ -16,13 +18,17 @@ namespace TIAMWebApp.Client.Services { private readonly HttpClient http; private readonly ISecureStorageHandler secureStorageHandler; + private readonly IJSRuntime jsRuntime; + private readonly LogToBrowserConsole logToBrowserConsole; public UserModel? User { get; set; } = new UserModel("", "", ""); public Dictionary userRoleTypes { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } - public UserDataService(HttpClient http, ISecureStorageHandler secureStorageHandler) + public UserDataService(HttpClient http, ISecureStorageHandler secureStorageHandler, IJSRuntime jSRuntime) { this.http = http; this.secureStorageHandler = secureStorageHandler; + this.jsRuntime = jSRuntime; + this.logToBrowserConsole = new LogToBrowserConsole(jsRuntime); } @@ -108,9 +114,9 @@ namespace TIAMWebApp.Client.Services { bool isSuccess = true; - string result = string.Empty; - var url = APIUrls.CreateUser; - + string result = string.Empty; + var url = $"{Setting.BaseUrl}/{APIUrls.CreateUser}"; + logToBrowserConsole.LogToBC("CreateUser url: " + url); var response = await http.PostAsJsonAsync(url, regModel); result = await response.Content.ReadAsStringAsync(); /*if (response.IsSuccessStatusCode) @@ -140,10 +146,12 @@ namespace TIAMWebApp.Client.Services public async Task RefreshToken() { + logToBrowserConsole.LogToBC("RefreshToken() called"); bool isTokenRefreshed = false; using (var client = new HttpClient()) { - var url = APIUrls.RefreshToken; + var url = $"{Setting.BaseUrl}{APIUrls.RefreshToken}"; + //var url = APIUrls.RefreshToken; var serializedStr = JsonConvert.SerializeObject(new AuthenticateRequestAndResponse { @@ -153,6 +161,7 @@ namespace TIAMWebApp.Client.Services try { + logToBrowserConsole.LogToBC("Refreshtoken url: " + url); var response = await client.PostAsync(url, new StringContent(serializedStr, Encoding.UTF8, "application/json")); if (response.IsSuccessStatusCode) { @@ -173,6 +182,7 @@ namespace TIAMWebApp.Client.Services catch (Exception ex) { string msg = ex.Message; + logToBrowserConsole.LogToBC("Refreshtoken exception: " + ex.ToString()); } diff --git a/TIAMWebApp/Server/Controllers/GoogleAPIController .cs b/TIAMWebApp/Server/Controllers/GoogleAPIController .cs index 75b1c8fb..3554ab4b 100644 --- a/TIAMWebApp/Server/Controllers/GoogleAPIController .cs +++ b/TIAMWebApp/Server/Controllers/GoogleAPIController .cs @@ -16,7 +16,7 @@ using GoogleApi.Entities.Maps.DistanceMatrix.Response; namespace TIAMWebApp.Server.Controllers { [ApiController] - [Route("[controller]")] + [Route("api/[controller]")] public class GoogleAPIController : ControllerBase { diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index cf4ad85c..f4d9d577 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -1,17 +1,22 @@ +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; +using Newtonsoft.Json.Linq; using System.Reflection.Metadata; +using System.Text.Json; using TIAM.Database.DataLayers; using TIAM.Database.DataLayers.TransferDestinations; using TIAM.Database.DataLayers.Users; using TIAM.Database.DbContexts; using TIAM.Entities.TransferDestinations; +using TIAM.Entities.Users; using TIAMWebApp.Shared.Application.Models; +using TIAMWebApp.Shared.Application.Models.PageModels; namespace TIAMWebApp.Server.Controllers { [ApiController] - [Route("[controller]")] + [Route("api/[controller]")] public class TransferDataAPIController : ControllerBase { //private static readonly TransferDestination[] Names = new TransferDestination[] @@ -24,22 +29,87 @@ namespace TIAMWebApp.Server.Controllers // new() { DestinationId = 5, DestinationName = "Heroes square", DestinationDescription = "International airport of Budapest", DestinationLatitude = 42.234444f, DestinationLongitude = 39.100010f }, // new() { DestinationId = 6, DestinationName = "Gellert Hill", DestinationDescription = "International airport of Budapest", DestinationLatitude = 42.234444f, DestinationLongitude = 39.100010f }, // new() { DestinationId = 6, DestinationName = "Margaret Island", DestinationDescription = "International airport of Budapest", DestinationLatitude = 42.234444f, DestinationLongitude = 39.100010f } - + //}; private readonly TransferDestinationDal _transferDestinationDal; + private readonly AdminDal _adminDal; private readonly ILogger _logger; - public TransferDataAPIController(ILogger logger, TransferDestinationDal transferDestinationDal) + public TransferDataAPIController(ILogger logger, TransferDestinationDal transferDestinationDal, AdminDal adminDal) { _logger = logger; _transferDestinationDal = transferDestinationDal; + _adminDal = adminDal; } + [AllowAnonymous] [HttpGet] - public async Task> Get() + [Route("GetTransferDestinations")] + public async Task> GetTransferDestinations() { return await _transferDestinationDal.Ctx.TransferDestinations.ToListAsync(); } + + [AllowAnonymous] + [HttpGet] + [Route("GetTransferDestinationByCoordinates")] + public async Task GetTransferDestinationByCoordinates(double latitude, double longitude) + { + return await _transferDestinationDal.Ctx.TransferDestinations.FirstOrDefaultAsync(x => x.Latitude == latitude && x.Longitude == longitude); + } + + [AllowAnonymous] + [HttpGet] + [Route("GetTransferDestinationByAddress")] + public async Task GetTransferDestinationByAddress(string address) + { + return await _transferDestinationDal.Ctx.TransferDestinations.FirstOrDefaultAsync(x => x.Address == address); + } + + [AllowAnonymous] + [HttpPost] + [Route("CreateTransferDestination")] + public async Task CreateTransferDestination([FromBody] JsonElement SerializedTransferDestinationModel) + { + Console.WriteLine("CreateTransferDestination called!"); + if (string.IsNullOrEmpty(SerializedTransferDestinationModel.GetRawText())) + { + return BadRequest("SerializedLoginModel is required"); + } + else + { + TransferDestination? transferDestination = JObject.Parse(SerializedTransferDestinationModel.GetRawText()).ToObject(); + + + if (transferDestination != null) + { + var Id = Guid.NewGuid(); + double Latitude = transferDestination.Latitude; + double Longitude = transferDestination.Longitude; + string Address = transferDestination.Address; + + if (Id == null || Latitude == null || Longitude == null || Address == null) + { + return BadRequest("Invalid request"); + } + else + { + Console.WriteLine($"TransferDestination to be created: {Id}"); + Console.WriteLine($"TransferDestination to be created: {Latitude}"); + Console.WriteLine($"TransferDestination to be created: {Longitude}"); + Console.WriteLine($"TransferDestination to be created: {Address}"); + + await _transferDestinationDal.Ctx.TransferDestinations.AddRangeAsync(transferDestination); + } + + } + return Ok("yes"); + + } + + + } + } } \ No newline at end of file diff --git a/TIAMWebApp/Server/Controllers/UserAPIController.cs b/TIAMWebApp/Server/Controllers/UserAPIController.cs index e72785f1..e3ada751 100644 --- a/TIAMWebApp/Server/Controllers/UserAPIController.cs +++ b/TIAMWebApp/Server/Controllers/UserAPIController.cs @@ -17,12 +17,14 @@ using System.Text; using Microsoft.AspNetCore.Hosting; using Microsoft.EntityFrameworkCore; using TIAM.Database.DataLayers.Users; +using AyCode.Utils.Helpers; using TIAM.Entities.Users; using TIAMWebApp.Server.ModelsTIAMWebApp.Shared.Application.Models; +using TIAMWebApp.Shared.Application.Utility; namespace TIAMWebApp.Server.Controllers { - //[Authorize] + [Authorize] [ApiController] [Route("api/[controller]")] public class UserAPIController : ControllerBase @@ -83,61 +85,73 @@ namespace TIAMWebApp.Server.Controllers }*/ [AllowAnonymous] - [HttpPost("AuthenticateUser")] + [HttpPost] + [Route("AuthenticateUser")] public async Task AuthenticateUser([FromBody] JsonElement SerializedLoginModel) { - + Console.WriteLine("AuthenticateUser called"); var authenticateUser = JObject.Parse(SerializedLoginModel.GetRawText()).ToObject(); //check if userModel exists //var userModel = await _userManager.FindByNameAsync(authenticateUser.UserName); //if (userModel == null) return Unauthorized(); + Console.WriteLine(authenticateUser.Email); + + var dbUser = await GetUserByEmail(authenticateUser.Email); - //mocking - var user = users.FirstOrDefault(x => x.Email == authenticateUser.Email); //check if password is valid //bool isValidUser = await _userManager.CheckPasswordAsync(userModel, authenticateUser.Password); //mocking - bool isValidUser = false; - - if (user.Password == authenticateUser.Password) - { - isValidUser = true; - - } - - if (isValidUser) - { - Console.WriteLine("UserModel authenticated, let's start JWT"); - string accessToken = GenerateAccessToken(user); - Console.WriteLine("Generate refresh token"); - var refreshToken = GenerateRefreshToken(); - user.RefreshToken = refreshToken; - //Update userModel with refreshToken!! - //await _userManager.UpdateAsync(userModel); - - var response = new MainResponse - { - Content = new AuthenticationResponse - { - RefreshToken = refreshToken, - AccessToken = accessToken - }, - IsSuccess = true, - ErrorMessage = "" - }; - return Ok(response); - } - else + if (dbUser is null) { return Unauthorized(); } + else + { + bool isValidUser = false; + + if (dbUser.Password == authenticateUser.Password) + { + Console.WriteLine("Password is valid"); + isValidUser = true; + + } + + if (isValidUser) + { + Console.WriteLine("UserModel authenticated, let's start JWT"); + string accessToken = GenerateAccessToken(dbUser); + Console.WriteLine("Generate refresh token"); + var refreshToken = GenerateRefreshToken(); + dbUser.RefreshToken = refreshToken; + //Update userModel with refreshToken!! + await _userDal.UpdateUserAsync(dbUser); + + var response = new MainResponse + { + Content = new AuthenticationResponse + { + RefreshToken = refreshToken, + AccessToken = accessToken + }, + IsSuccess = true, + ErrorMessage = "" + }; + return Ok(response); + } + else + { + return Unauthorized(); + } + } + + } - private string GenerateAccessToken(UserModel userModel) + private string GenerateAccessToken(User user) { var tokenHandler = new JwtSecurityTokenHandler(); var token = new JwtSecurityToken(); @@ -147,8 +161,8 @@ namespace TIAMWebApp.Server.Controllers var claims = new List { - new Claim(ClaimTypes.NameIdentifier, userModel.Id.ToString()), - new Claim(ClaimTypes.Email, userModel.Email) + new Claim(ClaimTypes.NameIdentifier, user.Id.ToString()), + new Claim(ClaimTypes.Email, user.Email) }; var tokenDescriptor = new SecurityTokenDescriptor @@ -166,12 +180,15 @@ namespace TIAMWebApp.Server.Controllers } [AllowAnonymous] - [HttpPost("RefreshToken")] + [HttpPost] + [Route("RefreshToken")] public async Task RefreshToken(RefreshTokenRequest refreshTokenRequest) { + Console.WriteLine("RefreshToken called"); var response = new MainResponse(); if (refreshTokenRequest is null) { + Console.WriteLine("RefreshTokenRequest is null"); response.ErrorMessage = "Invalid request"; return BadRequest(response); } @@ -180,23 +197,33 @@ namespace TIAMWebApp.Server.Controllers if (principal != null) { + Console.WriteLine("Principal is not null"); var email = principal.Claims.FirstOrDefault(f => f.Type == ClaimTypes.Email); //var userModel = await _userManager.FindByEmailAsync(email?.Value); - var user = users.FirstOrDefault(x => x.Email == email?.Value); + //UserModel? user = users.FirstOrDefault(x => x.Email == email?.Value); + User? dbUser = null; + if (email != null) + { + //get user from db + dbUser = await _userDal.GetUserByEmailAsync(email.Value); + } - if (user is null || user.RefreshToken != refreshTokenRequest.RefreshToken) + //mocking - update userModel with new refreshToken so it returns true after the check below + //dbUser.RefreshToken = refreshTokenRequest.RefreshToken; + + if (dbUser is null || dbUser.RefreshToken != refreshTokenRequest.RefreshToken) { response.ErrorMessage = "Invalid Request"; return BadRequest(response); } - string newAccessToken = GenerateAccessToken(user); + string newAccessToken = GenerateAccessToken(dbUser); string refreshToken = GenerateRefreshToken(); //mocking - update userModel with new refreshToken - user.RefreshToken = refreshToken; + dbUser.RefreshToken = refreshToken; //await _userManager.UpdateAsync(userModel); response.IsSuccess = true; @@ -209,6 +236,7 @@ namespace TIAMWebApp.Server.Controllers } else { + Console.WriteLine("Principal is null"); return NotFound("Invalid Token Found"); } @@ -251,29 +279,53 @@ namespace TIAMWebApp.Server.Controllers } - + [AllowAnonymous] [HttpPost] [Route("CreateUser")] public async Task CreateUser([FromBody] JsonElement SerializedRegistrationModel) { + Console.WriteLine("CreateUser called"); if (string.IsNullOrEmpty(SerializedRegistrationModel.GetRawText())) { return BadRequest("SerializedLoginModel is required"); } else { - var user = JObject.Parse(SerializedRegistrationModel.GetRawText()).ToObject(); + RegistrationModel? user = JObject.Parse(SerializedRegistrationModel.GetRawText()).ToObject(); if (users != null) { - //add userModel to users array - Array.Resize(ref users, users.Length + 1); - users[users.Length - 1] = new UserModel(user.Email, user.PhoneNumber, user.Password); + if(user != null) + { + //add userModel to users array + //Array.Resize(ref users, users.Length + 1); + //users[users.Length - 1] = new UserModel(user.Email, user.PhoneNumber, user.Password); + + + var userId = Guid.NewGuid(); + string? email = user?.Email; + string? phoneNumber = user?.PhoneNumber; + string? password = user?.Password; + + if(email is null || phoneNumber is null || password is null) + { + return BadRequest("Invalid request"); + } + else + { + Console.WriteLine($"User to be created: {userId}"); + Console.WriteLine($"User to be created: {email}"); + Console.WriteLine($"User to be created: {phoneNumber}"); + Console.WriteLine($"User to be created: {password}"); + + await _userDal.CreateUserAsync(new User(userId, email, phoneNumber, password)); + } + } return Ok("yes"); } else { - return Ok("no"); + return NotFound("no"); } } @@ -296,21 +348,22 @@ namespace TIAMWebApp.Server.Controllers } - + [AllowAnonymous] [HttpGet] [Route("GetUsers")] - public Task> GetUsers() + public Task> GetUsers() { //var users = await _userDal.Ctx.Users.ToListAsync();//.GetUsersAsync(); //return users; return _userDal.GetUsersAsync(); } + [AllowAnonymous] [HttpGet] [Route("GetUserByEmail")] - public Task GetUserByEmail(string email) + public async Task GetUserByEmail(string email) { - return _userDal.GetUserByEmailAsync(email); + return await _userDal.GetUserByEmailAsync(email); } private bool VerifyPassword(string password, string hashedPassword) diff --git a/TIAMWebApp/Server/Controllers/WeatherForecastAPIController.cs b/TIAMWebApp/Server/Controllers/WeatherForecastAPIController.cs index d425f274..4aa56b8f 100644 --- a/TIAMWebApp/Server/Controllers/WeatherForecastAPIController.cs +++ b/TIAMWebApp/Server/Controllers/WeatherForecastAPIController.cs @@ -4,7 +4,7 @@ using TIAMWebApp.Shared.Application.Models; namespace TIAMWebApp.Server.Controllers { [ApiController] - [Route("[controller]")] + [Route("api/[controller]")] public class WeatherForecastAPIController : ControllerBase { private static readonly string[] Summaries = new[] diff --git a/TIAMWebApp/Server/Program.cs b/TIAMWebApp/Server/Program.cs index 2904725c..fcc214c5 100644 --- a/TIAMWebApp/Server/Program.cs +++ b/TIAMWebApp/Server/Program.cs @@ -21,7 +21,7 @@ var builder = WebApplication.CreateBuilder(args); builder.Services.AddControllersWithViews(); builder.Services.AddRazorPages(); //builder.Services.AddDbContext(options => options.UseSqlServer(builder.Configuration.GetConnectionString("DeveloperDbConnection")));; -builder.Services.AddScoped(); +builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddSwaggerGen(swagger => diff --git a/TIAMWebApp/Server/TIAMWebApp.Server.csproj b/TIAMWebApp/Server/TIAMWebApp.Server.csproj index da73b9ed..f2e4a959 100644 --- a/TIAMWebApp/Server/TIAMWebApp.Server.csproj +++ b/TIAMWebApp/Server/TIAMWebApp.Server.csproj @@ -47,6 +47,9 @@ ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Interfaces.Server.dll + + ..\..\..\AyCode.Core\AyCode.Utils\bin\Debug\net7.0\AyCode.Utils.dll + diff --git a/TIAMWebApp/Shared/Interfaces/ISecureStorageHandler.cs b/TIAMWebApp/Shared/Interfaces/ISecureStorageHandler.cs index 9f213316..77b83d12 100644 --- a/TIAMWebApp/Shared/Interfaces/ISecureStorageHandler.cs +++ b/TIAMWebApp/Shared/Interfaces/ISecureStorageHandler.cs @@ -10,5 +10,8 @@ namespace TIAMWebApp.Shared.Application.Interfaces { public Task SaveToSecureStorageAsync(string key, string value); public Task GetFromSecureStorageAsync(string key); + public Task DeleteFromSecureStorageAsync(string key); + public Task ClearAllSecureStorageAsync(); + } } diff --git a/TIAMWebApp/Shared/Models/APIUrls.cs b/TIAMWebApp/Shared/Models/APIUrls.cs index d446ec3e..02269c41 100644 --- a/TIAMWebApp/Shared/Models/APIUrls.cs +++ b/TIAMWebApp/Shared/Models/APIUrls.cs @@ -13,8 +13,9 @@ namespace TIAMWebApp.Shared.Application.Models public const string GetUsers = "api/UserAPI/GetUsers"; public const string AuthenticateUser = "api/UserAPI/AuthenticateUser"; public const string CreateUser = "api/UserAPI/CreateUser"; - public const string RefreshToken = "api/UserAPI/RefreshToken"; - public const string WeatherForecast = "WeatherForecastAPI"; + public const string RefreshToken = "/api/UserAPI/RefreshToken"; + public const string WeatherForecast = "api/WeatherForecastAPI"; public const string PopulationStructure = "PopulationStructureAPI"; + public const string GetTransferDestinations = "api/GetTransferDestinations"; } } diff --git a/TIAMWebApp/Shared/Models/ClientSide/Setting.cs b/TIAMWebApp/Shared/Models/ClientSide/Setting.cs index 0a74e82b..124c56f2 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/Setting.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/Setting.cs @@ -9,5 +9,6 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide public class Setting { public static UserBasicDetails UserBasicDetails { get; set; } + public const string BaseUrl = "https://localhost:7116"; } } diff --git a/TIAMWebApp/Shared/Utility/LogToBrowserConsole.cs b/TIAMWebApp/Shared/Utility/LogToBrowserConsole.cs index 94781138..204eccd8 100644 --- a/TIAMWebApp/Shared/Utility/LogToBrowserConsole.cs +++ b/TIAMWebApp/Shared/Utility/LogToBrowserConsole.cs @@ -4,7 +4,12 @@ namespace TIAMWebApp.Shared.Application.Utility { public class LogToBrowserConsole { - private readonly JSRuntime jsRuntime; + private readonly IJSRuntime jsRuntime; + + public LogToBrowserConsole(IJSRuntime jsRuntime) + { + this.jsRuntime = jsRuntime; + } public void LogToBC(string message) { diff --git a/TIAMWebApp/Shared/Utility/PasswordHasher.cs b/TIAMWebApp/Shared/Utility/PasswordHasher.cs deleted file mode 100644 index ba99b1d2..00000000 --- a/TIAMWebApp/Shared/Utility/PasswordHasher.cs +++ /dev/null @@ -1,48 +0,0 @@ -using Microsoft.AspNetCore.Cryptography.KeyDerivation; -using System.Security.Cryptography; - -public class PasswordHasher -{ - public string HashPassword(string password) - { - // Generate a random salt - byte[] salt = new byte[16]; - using (var rng = RandomNumberGenerator.Create()) - { - rng.GetBytes(salt); - } - - // Hash the password with the salt - string hashedPassword = Convert.ToBase64String(KeyDerivation.Pbkdf2( - password: password, - salt: salt, - prf: KeyDerivationPrf.HMACSHA512, - iterationCount: 10000, - numBytesRequested: 32)); - - // Combine the salt and hashed password - string combinedHash = $"$bcrypt$v=1$salt={Convert.ToBase64String(salt)}$hash={hashedPassword}"; - - return combinedHash; - } - - public bool VerifyPassword(string password, string hashedPassword) - { - // Extract the salt and hashed password from the combined hash - string[] parts = hashedPassword.Split('$'); - byte[] salt = Convert.FromBase64String(parts[3]); - string storedHash = parts[5]; - - // Hash the provided password with the extracted salt - string hashedProvidedPassword = Convert.ToBase64String(KeyDerivation.Pbkdf2( - password: password, - salt: salt, - prf: KeyDerivationPrf.HMACSHA512, - iterationCount: 10000, - numBytesRequested: 32)); - - // Compare the hashed passwords - return storedHash == hashedProvidedPassword; - } -} -