diff --git a/TIAM.Database/DataLayers/Auctions/AuctionDal.cs b/TIAM.Database/DataLayers/Auctions/AuctionDal.cs new file mode 100644 index 00000000..97e17052 --- /dev/null +++ b/TIAM.Database/DataLayers/Auctions/AuctionDal.cs @@ -0,0 +1,54 @@ +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.Auctions; + +namespace TIAM.Database.DataLayers.Users +{ + public class AuctionDal : TiamDalBase + { + + public AuctionDal() : base() + { + } + + public Task> GetBids() + { + return Ctx.AuctionBids.ToListAsync(); + } + + public Task> GetBidsByEmail(string email) + { + Console.WriteLine($"Getting bid from db {email}"); + var emailLower = email.ToLower(); + return Ctx.AuctionBids.Where(x => x.Email.ToLower() == emailLower).ToListAsync(); + } + + public async Task GetBidById(Guid id) + { + Console.WriteLine($"Getting bid from db {id}"); + + return Ctx.AuctionBids.FirstOrDefault(x => x.Id == id); + } + + public Task CreateBidAsync(AuctionBid auctionBid) + { + auctionBid.Created = DateTime.UtcNow; + auctionBid.Modified = DateTime.UtcNow; + Ctx.AuctionBids.Add(auctionBid); + Console.WriteLine($"Saving user to db {auctionBid.Id}, {auctionBid.Email}, {auctionBid.PhoneNumber}"); + return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0); + } + + public Task UpdateBidAsync(AuctionBid auctionBid) + { + auctionBid.Modified = DateTime.UtcNow; + Ctx.AuctionBids.Update(auctionBid); + return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0); + } + } +} diff --git a/TIAM.Database/DataLayers/Users/UserDal.cs b/TIAM.Database/DataLayers/Users/UserDal.cs index 2b848fc4..7542d9dd 100644 --- a/TIAM.Database/DataLayers/Users/UserDal.cs +++ b/TIAM.Database/DataLayers/Users/UserDal.cs @@ -32,6 +32,27 @@ namespace TIAM.Database.DataLayers.Users return Ctx.Users.SingleOrDefaultAsync(x=>x.Email.ToLower() == emailLower); } + public virtual Task GetUserByPhoneNumberAsync(string phoneNumber) + { + Console.WriteLine($"Getting user from db {phoneNumber}"); + var phoneNumberLower = phoneNumber.ToLower(); + return Ctx.Users.SingleOrDefaultAsync(x=>x.PhoneNumber.ToLower() == phoneNumberLower); + } + + public virtual Task GetUserByEmailOrPhoneNumberAsync(string emailOrPhoneNumber) + { + Console.WriteLine($"Getting user from db {emailOrPhoneNumber}"); + var emailOrPhoneNumberLower = emailOrPhoneNumber.ToLower(); + return Ctx.Users.SingleOrDefaultAsync(x=>x.Email.ToLower() == emailOrPhoneNumberLower || x.PhoneNumber.ToLower() == emailOrPhoneNumberLower); + } + + //get user by Id + public virtual Task GetUserByIdAsync(Guid id) + { + Console.WriteLine($"Getting user from db {id}"); + return Ctx.Users.SingleOrDefaultAsync(x=>x.Id == id); + } + public Task CreateUserAsync(User user) { user.Created = DateTime.UtcNow; @@ -41,11 +62,27 @@ namespace TIAM.Database.DataLayers.Users return Ctx.SaveChangesAsync().ContinueWith(x=>x.Result > 0); } - public Task UpdateUserAsync(User user) + public Task UpdateUserAsyncOld(User user) { user.Modified = DateTime.UtcNow; Ctx.Users.Update(user); return Ctx.SaveChangesAsync().ContinueWith(x=>x.Result > 0); } + + public Task UpdateUserAsync(User user) + { + var existingUser = Ctx.Users.FirstOrDefault(u => u.Email == user.Email); + if (existingUser != null) + { + user.Modified = DateTime.UtcNow; + existingUser = user; + Ctx.Users.Update(existingUser); + return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0); + } + else + { + throw new Exception("User not found"); + } + } } } diff --git a/TIAM.Database/DbContexts/AuctionDbContext.cs b/TIAM.Database/DbContexts/AuctionDbContext.cs new file mode 100644 index 00000000..231bd562 --- /dev/null +++ b/TIAM.Database/DbContexts/AuctionDbContext.cs @@ -0,0 +1,43 @@ +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.Auctions; +using TIAM.Entities.TransferDestinations; + +namespace TIAM.Database.DbContexts +{ + public class AuctionDbContext : TiamDbContextBase + { + public virtual DbSet AuctionBids { get; set; } + + public AuctionDbContext() //: this(string.Empty) + { + + } + + public AuctionDbContext(DbContextOptions options) //: this(string.Empty) + { + + } + + public AuctionDbContext(string name) : base(name) + { + } + + public AuctionDbContext(DbContextOptions options, string name) : base(options, name) + { + } + + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + optionsBuilder.EnableDetailedErrors(true); + base.OnConfiguring(optionsBuilder); + } + + + } +} diff --git a/TIAM.Entities/Auctions/AuctionBid.cs b/TIAM.Entities/Auctions/AuctionBid.cs new file mode 100644 index 00000000..06103cd7 --- /dev/null +++ b/TIAM.Entities/Auctions/AuctionBid.cs @@ -0,0 +1,82 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using AyCode.Entities.Interfaces; +using AyCode.Entities.Users; +using AyCode.Interfaces.TimeStampInfo; + +namespace TIAM.Entities.Auctions +{ + [Table("AuctionBids")] + public class AuctionBid : IEntityGuid, ITimeStampInfo + { + + + public AuctionBid() { } + public AuctionBid(Guid ownerId, int targetProduct, string email) : this(Guid.NewGuid(), ownerId, targetProduct, email) { } + public AuctionBid(Guid id, Guid ownerId, int targetProductId, string email) : this() + { + Id = id; + OwnerId = ownerId; + TargetProductId = targetProductId; + Email = email; + IsValid = false; + } + public AuctionBid(Guid ownerId, int targetProductId, string email, string phoneNumber) : this(Guid.NewGuid(), ownerId, targetProductId, email,phoneNumber) + { + } + + public AuctionBid(Guid id, Guid ownerId, int targetProductId, string email, string? phoneNumber) : this() + { + Id = id; + OwnerId = ownerId; + TargetProductId = targetProductId; + Email = email; + PhoneNumber = phoneNumber; + IsValid = false; + } + + public AuctionBid(Guid ownerId, int targetProductId, string email, string phoneNumber, int bidAmount) : this(Guid.NewGuid(), ownerId, targetProductId, email, phoneNumber, bidAmount) + { + + OwnerId = ownerId; + TargetProductId = targetProductId; + Email = email; + PhoneNumber = phoneNumber; + BidAmount = bidAmount; + IsValid = false; + } + public AuctionBid(Guid id, Guid ownerId, int targetProductId, string email, string? phoneNumber, int bidAmount) : this() + { + Id = id; + OwnerId = ownerId; + TargetProductId = targetProductId; + Email = email; + PhoneNumber = phoneNumber; + BidAmount = bidAmount; + IsValid = false; + } + + + [Key, DatabaseGenerated(DatabaseGeneratedOption.None)] + public Guid Id { get; set; } + public Guid OwnerId { get; set; } + public int TargetProductId { get; set; } + public string Email { get; set; } + public string? PhoneNumber { get; set; } + public int BidAmount { get; set; } + public bool? IsValid { get; set; } + public DateTime Created { get; set; } + public DateTime Modified { get; set; } + } + + public enum TargetProductType + { + Product1 = 1, + Product2 = 2, + } +} diff --git a/TIAMMobileApp/MauiProgram.cs b/TIAMMobileApp/MauiProgram.cs index 821d1efb..47990a92 100644 --- a/TIAMMobileApp/MauiProgram.cs +++ b/TIAMMobileApp/MauiProgram.cs @@ -4,6 +4,7 @@ using TIAMWebApp.Shared.Application.Interfaces; using DevExpress.Blazor; using TIAMMobilApp.Services; using TIAMWebApp.Shared.Application.Utility; +using AyCode.Interfaces.StorageHandlers; namespace TIAMMobileApp { @@ -44,9 +45,9 @@ namespace TIAMMobileApp builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); - builder.Services.AddScoped(); - builder.Services.AddScoped(); - builder.Services.AddScoped(); + builder.Services.AddScoped(); + builder.Services.AddScoped(); + builder.Services.AddScoped(); return builder.Build(); } diff --git a/TIAMMobileApp/Services/SecureStorageHandler.cs b/TIAMMobileApp/Services/SecureStorageHandler.cs index abd615cc..57d5bb47 100644 --- a/TIAMMobileApp/Services/SecureStorageHandler.cs +++ b/TIAMMobileApp/Services/SecureStorageHandler.cs @@ -1,4 +1,5 @@ -using System; +using AyCode.Interfaces.StorageHandlers; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/TIAMMobileApp/Services/SessionServiceMobile.cs b/TIAMMobileApp/Services/SessionServiceMobile.cs new file mode 100644 index 00000000..1538c95c --- /dev/null +++ b/TIAMMobileApp/Services/SessionServiceMobile.cs @@ -0,0 +1,13 @@ +using System.Net; +using TIAMWebApp.Shared.Application.Interfaces; +using TIAMWebApp.Shared.Application.Models; + +namespace TIAMMobileApp.Services +{ + public class SessionServiceMobile : ISessionService + { + public string? SessionId { get; set; } + public UserSessionModel? User { get; set; } + public IPAddress? IPAddress { get; set; } + } +} diff --git a/TIAMMobileApp/Services/UserDataService.cs b/TIAMMobileApp/Services/UserDataServiceMobile.cs similarity index 79% rename from TIAMMobileApp/Services/UserDataService.cs rename to TIAMMobileApp/Services/UserDataServiceMobile.cs index ab484a85..6fff474c 100644 --- a/TIAMMobileApp/Services/UserDataService.cs +++ b/TIAMMobileApp/Services/UserDataServiceMobile.cs @@ -1,4 +1,5 @@ -using Microsoft.EntityFrameworkCore.Infrastructure; +using AyCode.Interfaces.StorageHandlers; +using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.JSInterop; using Newtonsoft.Json; using System.Net.Http.Json; @@ -12,16 +13,14 @@ using TIAMWebApp.Shared.Application.Utility; namespace TIAMMobilApp.Services { - public class UserDataService : IUserDataService + public class UserDataServiceMobile : IUserDataService { private readonly HttpClient http; 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) + public UserDataServiceMobile(HttpClient http, ISecureStorageHandler secureStorageHandler) { this.http = http; this.secureStorageHandler = secureStorageHandler; @@ -43,35 +42,26 @@ namespace TIAMMobilApp.Services }; - public async Task IsLoggedInAsync() + public async Task IsLoggedInAsync(Guid id) { - if (User == null) - { - User = new UserModel("", "", ""); - User.IsLoggedIn = false; - User.UserType = UserType.User; - return User; - } - - else - { - return User; - } + UserSessionModel User = null; + + var dbUser = await GetUserByIdAsync(id); + if (dbUser != null) + { + + User = new UserSessionModel(dbUser.Id, UserType.User, dbUser.Email, 1); + return User; + } + else + { + + return null; + } + } - //Mock method for now - public async Task AuthorizeUserAsync(int userType) - { - if (User == null) - { - User = new UserModel("", "", ""); - } - //simply return true for now - User.IsLoggedIn = true; - User.UserType = (UserType)userType; - return User; - } public async Task TestUserApi(int Param) { @@ -86,7 +76,7 @@ namespace TIAMMobilApp.Services - var result = string.Empty; + string result = string.Empty; var url = APIUrls.AuthenticateUser; var response = await http.PostAsJsonAsync(url, loginModel); @@ -108,8 +98,9 @@ namespace TIAMMobilApp.Services public async Task<(bool isSuccess, string ErrorMessage)> CreateUser(RegistrationModel regModel) { - var isSuccess = true; - var result = string.Empty; + + bool isSuccess = true; + string result = string.Empty; var url = APIUrls.CreateUser; var response = await http.PostAsJsonAsync(url, regModel); @@ -138,11 +129,14 @@ namespace TIAMMobilApp.Services { return await http.GetFromJsonAsync(APIUrls.GetUserByEmail); } + public async Task GetUserByIdAsync(Guid Id) + { + return await http.GetFromJsonAsync(APIUrls.GetUserById); + } public async Task RefreshToken() { - var isTokenRefreshed = false; - + bool isTokenRefreshed = false; using (var client = new HttpClient()) { var url = APIUrls.RefreshToken; @@ -158,7 +152,7 @@ namespace TIAMMobilApp.Services var response = await client.PostAsync(url, new StringContent(serializedStr, Encoding.UTF8, "application/json")); if (response.IsSuccessStatusCode) { - var contentStr = await response.Content.ReadAsStringAsync(); + string contentStr = await response.Content.ReadAsStringAsync(); var mainResponse = JsonConvert.DeserializeObject(contentStr); if (mainResponse.IsSuccess) { @@ -166,7 +160,7 @@ namespace TIAMMobilApp.Services Setting.UserBasicDetails.AccessToken = tokenDetails.AccessToken; Setting.UserBasicDetails.RefreshToken = tokenDetails.RefreshToken; - var userDetailsStr = JsonConvert.SerializeObject(Setting.UserBasicDetails); + string userDetailsStr = JsonConvert.SerializeObject(Setting.UserBasicDetails); await secureStorageHandler.SaveToSecureStorageAsync(nameof(Setting.UserBasicDetails), userDetailsStr); isTokenRefreshed = true; } @@ -174,7 +168,7 @@ namespace TIAMMobilApp.Services } catch (Exception ex) { - var msg = ex.Message; + string msg = ex.Message; } @@ -185,9 +179,9 @@ namespace TIAMMobilApp.Services public Task> GetUserRolesAsync(UserModel userModel) { - + //TODO Finish this //get the userModel's roles - var role = User.UserRoles; + int role = userModel.UserRoles; foreach (var roleType in roleTypes) { diff --git a/TIAMMobileApp/TIAMMobileApp.csproj b/TIAMMobileApp/TIAMMobileApp.csproj index 36180c33..b0277669 100644 --- a/TIAMMobileApp/TIAMMobileApp.csproj +++ b/TIAMMobileApp/TIAMMobileApp.csproj @@ -54,6 +54,11 @@ + + + + + diff --git a/TIAMSharedUI/Pages/Auction.razor b/TIAMSharedUI/Pages/Auction.razor new file mode 100644 index 00000000..ea315267 --- /dev/null +++ b/TIAMSharedUI/Pages/Auction.razor @@ -0,0 +1,13 @@ +@page "/auction" +@using TIAMSharedUI.Pages.Components +@using TIAMWebApp.Shared.Application.Interfaces; +@using TIAMWebApp.Shared.Application.Models; +@inject ISessionService sessionService + +
+

Auction

+ +
+@code { + +} diff --git a/TIAMSharedUI/Pages/Components/AppLaunch.razor b/TIAMSharedUI/Pages/Components/AppLaunch.razor index 8c9b90db..b96fdf9e 100644 --- a/TIAMSharedUI/Pages/Components/AppLaunch.razor +++ b/TIAMSharedUI/Pages/Components/AppLaunch.razor @@ -5,6 +5,7 @@ @using Newtonsoft.Json @using System.IdentityModel.Tokens.Jwt @using TIAMWebApp.Shared.Application.Models.ClientSide +@using AyCode.Interfaces.StorageHandlers; @inject NavigationManager NavManager @inject IJSRuntime JSRuntime @inject LogToBrowserConsole logToBrowserConsole diff --git a/TIAMSharedUI/Pages/Components/AuctionComponent.razor b/TIAMSharedUI/Pages/Components/AuctionComponent.razor new file mode 100644 index 00000000..b81a6fbf --- /dev/null +++ b/TIAMSharedUI/Pages/Components/AuctionComponent.razor @@ -0,0 +1,16 @@ + +

Hello @UserId.ToString()

+
+ +
+ +
+
+ +
+
+ +@code { + [Parameter] + public Guid UserId { get; set; } +} diff --git a/TIAMSharedUI/Pages/Components/AuctionItemComponent.cs b/TIAMSharedUI/Pages/Components/AuctionItemComponent.cs new file mode 100644 index 00000000..cdb7ca75 --- /dev/null +++ b/TIAMSharedUI/Pages/Components/AuctionItemComponent.cs @@ -0,0 +1,42 @@ +using Microsoft.AspNetCore.Components; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TIAMWebApp.Shared.Application.Models; + +namespace TIAMSharedUI.Pages.Components +{ + public partial class AuctionItemComponent + { + [Parameter] + public int AuctionItemId { get; set; } + public string IsLoading { get; set; } = ""; + + public int currentStep = 0; + + public AuctionBidModel auctionBidModel = new(); + + public void NextStep() + { + currentStep++; + } + public void PreviousStep() + { + currentStep--; + } + + protected override void OnInitialized() + { + IsLoading = "loaded!"; + base.OnInitialized(); + } + + public void SubmitBid() + { + + } + } + +} diff --git a/TIAMSharedUI/Pages/Components/AuctionItemComponent.razor b/TIAMSharedUI/Pages/Components/AuctionItemComponent.razor new file mode 100644 index 00000000..d8b18b49 --- /dev/null +++ b/TIAMSharedUI/Pages/Components/AuctionItemComponent.razor @@ -0,0 +1,57 @@ +@using TIAMWebApp.Shared.Application.Models; +
+
+ @{ + var url = "_content/TIAMSharedUI/images/auction" + AuctionItemId.ToString() + ".jpg"; + } + ... + +
+
+

Item @AuctionItemId.ToString()

+

@IsLoading

+
+
    +
  • An item
    • +
  • A second item
    • +
  • A third item
    • +
+
+
+
+ @switch (currentStep) + { + case 0: + + ; + break; + case 1: + + ; + break; + case 2: + + ; + break; + case 3: + + ; + break; + } +
+ + +
+
+
+

Bid azonosító: @auctionBidModel.Id

+ + +
+
+ + +@code { + +} diff --git a/TIAMSharedUI/Pages/Components/AuctionStep0.razor b/TIAMSharedUI/Pages/Components/AuctionStep0.razor new file mode 100644 index 00000000..ec5f3369 --- /dev/null +++ b/TIAMSharedUI/Pages/Components/AuctionStep0.razor @@ -0,0 +1,38 @@ +@using TIAMWebApp.Shared.Application.Models.PageModels; + + + + +
+ + + + Licitálok! + + + +
+ + + + + + + +@code { + + [Parameter] + public EventCallback onNext { get; set; } + + + private string spinnerClass = ""; + + private async Task GoToNextStep() + { + spinnerClass = "spinner-border spinner-border-sm"; + await Task.Delay(500); + spinnerClass = ""; + await onNext.InvokeAsync(); + } + +} \ No newline at end of file diff --git a/TIAMSharedUI/Pages/Components/AuctionStep1.razor b/TIAMSharedUI/Pages/Components/AuctionStep1.razor new file mode 100644 index 00000000..a73fef6c --- /dev/null +++ b/TIAMSharedUI/Pages/Components/AuctionStep1.razor @@ -0,0 +1,65 @@ +@using TIAMWebApp.Shared.Application.Models.PageModels; +@using TIAMWebApp.Shared.Application.Models; + + + +

Step 1

+
+ + + + + + + +
+ + + + + + + + +@code { + [Parameter] + public AuctionBidModel auctionBidModel { get; set; } + + //[Parameter] + //public string Email { get; set; } + + [Parameter] + public EventCallback onNext { get; set; } + + [Parameter] + public EventCallback auctionBidModelChanged { get; set; } + + IEnumerable PredefinedPlaceholders { get; set; } = new List() { '_', '#' }; + + string EmailMask { get; set; } = @"(\w|[.-])+@(\w|-)+\.(\w|-){2,4}"; + MaskAutoCompleteMode AutoCompleteMode { get; set; } = MaskAutoCompleteMode.Strong; + char Placeholder { get; set; } = '_'; + bool PlaceholderVisible { get; set; } = false; + + private string spinnerClass = ""; + + private async Task GoToNextStep() + { + spinnerClass = "spinner-border spinner-border-sm"; + await Task.Delay(500); + spinnerClass = ""; + auctionBidModel.Id = Guid.NewGuid(); + await auctionBidModelChanged.InvokeAsync(auctionBidModel); + await onNext.InvokeAsync(); + } + +} \ No newline at end of file diff --git a/TIAMSharedUI/Pages/Components/AuctionStep2.razor b/TIAMSharedUI/Pages/Components/AuctionStep2.razor new file mode 100644 index 00000000..61f75004 --- /dev/null +++ b/TIAMSharedUI/Pages/Components/AuctionStep2.razor @@ -0,0 +1,68 @@ +@using TIAMWebApp.Shared.Application.Models.PageModels; +

Step 2: Phone Number

+ + + + + + + +
+ + + + + + + + +
+ + + Previous + + + + + + +@code { + [Parameter] + public RegistrationModel regModel { get; set; } + + [Parameter] + public EventCallback onNext { get; set; } + + [Parameter] + public EventCallback onPrev { get; set; } + + [Parameter] + public EventCallback RegModelChanged { get; set; } + + char Placeholder = '_'; + + private string spinnerClass = ""; + + private async Task GoToNextStep() + { + spinnerClass = "spinner-border spinner-border-sm"; + await Task.Delay(500); + spinnerClass = ""; + await RegModelChanged.InvokeAsync(regModel); + await onNext.InvokeAsync(); + } + + private async Task GoToPreviousStep() + { + + await onPrev.InvokeAsync(); + } + +} \ No newline at end of file diff --git a/TIAMSharedUI/Pages/Components/AuctionStep3.razor b/TIAMSharedUI/Pages/Components/AuctionStep3.razor new file mode 100644 index 00000000..04ea487c --- /dev/null +++ b/TIAMSharedUI/Pages/Components/AuctionStep3.razor @@ -0,0 +1,64 @@ +@using TIAMWebApp.Shared.Application.Models.PageModels; +

Step 3: Password

+ + + + + + + +
+ + + + + + +
+ + + Previous + + + + + +@code { + [Parameter] + public RegistrationModel regModel { get; set; } + + [Parameter] + public EventCallback RegModelChanged { get; set; } + + [Parameter] + public EventCallback onPrev { get; set; } + + [Parameter] + public EventCallback onSubmit { get; set; } + + private string spinnerClass = ""; + + public async Task SubmitRegistration() + { + + spinnerClass = "spinner-border spinner-border-sm"; + await Task.Delay(500); + spinnerClass = ""; + + await RegModelChanged.InvokeAsync(regModel); + await onSubmit.InvokeAsync(); + } + + private async Task GoToPreviousStep() + { + + await onPrev.InvokeAsync(); + } +} + diff --git a/TIAMSharedUI/Pages/Index.razor b/TIAMSharedUI/Pages/Index.razor index b5560892..b103267e 100644 --- a/TIAMSharedUI/Pages/Index.razor +++ b/TIAMSharedUI/Pages/Index.razor @@ -1,4 +1,17 @@ @page "/" +@using AyCode.Interfaces.StorageHandlers; +@using Newtonsoft.Json; +@using TIAMWebApp.Shared.Application.Interfaces +@using TIAMWebApp.Shared.Application.Models.ClientSide; +@using AyCode.Blazor.Components; +@using TIAMWebApp.Shared.Application.Models; +@using TIAMWebApp.Shared.Application.Utility; +@using System.IdentityModel.Tokens.Jwt; +@inject NavigationManager NavManager +@inject IUserDataService UserDataService; +@inject IJSRuntime jsRuntime; +@inject ISecureStorageHandler SecureStorageHandler +@inject ISessionService sessionService; @using TIAMSharedUI.Shared Index @@ -57,6 +70,76 @@ +@code { + + bool isUserLoggedIn; + int userType = 0; + int currentUserRole = 249; + public UserSessionModel MyUser; + //add a new dictionary for the role types + + protected async override Task OnInitializedAsync() + { + //old + + + var 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)) + { + var userBasicDetail = JsonConvert.DeserializeObject(userDetailsStr); + + var handler = new JwtSecurityTokenHandler(); + var jsontoken = handler.ReadToken(userBasicDetail?.AccessToken) as JwtSecurityToken; + + if (userBasicDetail != null) + Setting.UserBasicDetails = userBasicDetail; + + if (jsontoken?.ValidTo < DateTime.UtcNow) + { + logToBrowserConsole.LogToBC("Token needs to be refreshed"); + bool isTokenRefreshed = await UserDataService.RefreshToken(); + + if (isTokenRefreshed) + { + logToBrowserConsole.LogToBC("Token refreshed"); + var myId = Guid.Parse(jsontoken.Claims.First(claim => claim.Type == JwtRegisteredClaimNames.NameId).Value); + //UserDataService.User.Email = jsontoken.Claims.First(claim => claim.Type == JwtRegisteredClaimNames.Email).Value; + MyUser = await UserDataService.IsLoggedInAsync(myId); + logToBrowserConsole.LogToBC(MyUser.UserId.ToString()); + } + else + { + logToBrowserConsole.LogToBC("Couldn't refresh token"); + } + + } + else + { + logToBrowserConsole.LogToBC("Valid token found"); + + var myId = Guid.Parse(jsontoken.Claims.First(claim => claim.Type == JwtRegisteredClaimNames.NameId).Value); + logToBrowserConsole.LogToBC(myId.ToString()); + //UserDataService.User.Email = jsontoken.Claims.First(claim => claim.Type == JwtRegisteredClaimNames.Email).Value; + MyUser = await UserDataService.IsLoggedInAsync(myId); + logToBrowserConsole.LogToBC(MyUser.UserId.ToString()); + sessionService.User = MyUser; + logToBrowserConsole.LogToBC($"{sessionService.User.UserId.ToString()}, {sessionService.User.Email}."); + } + } + else + { + logToBrowserConsole.LogToBC("No token stored yet"); + } + + } + +} + diff --git a/TIAMSharedUI/Pages/Login.razor b/TIAMSharedUI/Pages/Login.razor index 4093d6c5..ed89d9ad 100644 --- a/TIAMSharedUI/Pages/Login.razor +++ b/TIAMSharedUI/Pages/Login.razor @@ -58,11 +58,11 @@ public async Task next() { - var user = await userDataService.IsLoggedInAsync(); - user.IsLoggedIn = true; - isUserLoggedIn = user.IsLoggedIn; - user.UserType = (UserType)CurrentValue; - navManager.NavigateTo("home"); + //var user = await userDataService.IsLoggedInAsync(); + //user.IsLoggedIn = true; + //isUserLoggedIn = user.IsLoggedIn; + //user.UserType = (UserType)CurrentValue; + //navManager.NavigateTo("home"); } diff --git a/TIAMSharedUI/Pages/Login2.razor b/TIAMSharedUI/Pages/Login2.razor index f7e43727..edb05e42 100644 --- a/TIAMSharedUI/Pages/Login2.razor +++ b/TIAMSharedUI/Pages/Login2.razor @@ -10,9 +10,10 @@ @using TIAMWebApp.Shared.Application.Models.ClientSide; @using TIAMWebApp.Shared.Application.Models; @using TIAMWebApp.Shared.Application.Utility; +@using AyCode.Interfaces.StorageHandlers; @inject NavigationManager navManager @inject LogToBrowserConsole logToBrowserConsole -@inject IUserDataService UserDataservice +@inject IUserDataService userDataService @inject IJSRuntime jsRuntime @inject ISecureStorageHandler SecureStorageHandler @@ -86,7 +87,7 @@ currentStep = 1; logToBrowserConsole.LogToBC("Login started: " + "Email: " + loginModel.Email + ", Password: " + loginModel.Password); - var response = await UserDataservice.AuthenticateUser(loginModel); + var response = await userDataService.AuthenticateUser(loginModel); //var response = await UserDataservice.TestUserApi(30); logToBrowserConsole.LogToBC("Login started"); logToBrowserConsole.LogToBC(response); @@ -116,6 +117,9 @@ string _userId = token.Claims.First(claim => claim.Type == JwtRegisteredClaimNames.NameId).Value; string _email = token.Claims.First(claim => claim.Type == JwtRegisteredClaimNames.Email).Value; + var myId = Guid.Parse(_userId); + //userDataService.User.Email = _email; + var userBasicDetails = new UserBasicDetails(_userId, _email, AuthResponse.AccessToken, AuthResponse.RefreshToken); string userBasicDetailsJson = JsonSerializer.Serialize(userBasicDetails); @@ -137,8 +141,7 @@ //await App.Current.MainPage.DisplayAlert("Success", "Successful login", "Ok"); //display success message via jsinterop logToBrowserConsole.LogToBC("Successful login"); - var user = await UserDataservice.IsLoggedInAsync(); - user.IsLoggedIn = true; + var user = await userDataService.IsLoggedInAsync(myId); user.UserType = UserType.Admin; navManager.NavigateTo("home"); diff --git a/TIAMSharedUI/Pages/Register.razor b/TIAMSharedUI/Pages/Register.razor index 7466ddaa..a2723dfb 100644 --- a/TIAMSharedUI/Pages/Register.razor +++ b/TIAMSharedUI/Pages/Register.razor @@ -57,12 +57,7 @@ /*IEnumerable PredefinedPlaceholders = new List() { '_', '#' }; string Telephone { get; set; } = "5625595830"; char Placeholder { get; set; } = '_'; - bool SaveLiterals { get; set; } = true;*/ - - private void next() - { - navManager.NavigateTo("register2"); - } + bool SaveLiterals { get; set; } = true;*/ private int currentStep = 1; diff --git a/TIAMSharedUI/Pages/User/Home.razor b/TIAMSharedUI/Pages/User/Home.razor index 6f96239d..c99b9b73 100644 --- a/TIAMSharedUI/Pages/User/Home.razor +++ b/TIAMSharedUI/Pages/User/Home.razor @@ -758,11 +758,7 @@ protected override async Task OnInitializedAsync() { - base.OnInitialized(); - - var user = await UserDataService.IsLoggedInAsync(); - isUserLoggedIn = user.IsLoggedIn; - userType = (int)user.UserType; + base.OnInitialized(); OrderData = new object[] { diff --git a/TIAMSharedUI/Shared/MainLayout.razor b/TIAMSharedUI/Shared/MainLayout.razor index 604d917e..d256323f 100644 --- a/TIAMSharedUI/Shared/MainLayout.razor +++ b/TIAMSharedUI/Shared/MainLayout.razor @@ -1,8 +1,17 @@ @inherits LayoutComponentBase +@using AyCode.Interfaces.StorageHandlers; +@using Newtonsoft.Json; @using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Models.ClientSide; +@using AyCode.Blazor.Components; +@using TIAMWebApp.Shared.Application.Models; +@using TIAMWebApp.Shared.Application.Utility; +@using System.IdentityModel.Tokens.Jwt; +@inject NavigationManager NavManager @inject IUserDataService UserDataService; -@inject IJSRuntime jsRuntime +@inject IJSRuntime jsRuntime; +@inject ISecureStorageHandler SecureStorageHandler +@inject ISessionService sessionService;
@@ -12,43 +21,18 @@
- @{ - if(isUserLoggedIn) - { - - } - } + @if (Setting.UserBasicDetails != null) + { + + } @Body
+
+
+ @code { - bool isUserLoggedIn; - int userType = 0; - int currentUserRole = 249; - //add a new dictionary for the role types - - - - - protected override async Task OnInitializedAsync() - { - var user = await UserDataService.IsLoggedInAsync(); - isUserLoggedIn = user.IsLoggedIn; - - } - - protected override void OnAfterRender(bool isFirst) - { - - - } - - - - - - } diff --git a/TIAMSharedUI/Shared/NavMenu.razor b/TIAMSharedUI/Shared/NavMenu.razor index 8c558b42..af3a9f19 100644 --- a/TIAMSharedUI/Shared/NavMenu.razor +++ b/TIAMSharedUI/Shared/NavMenu.razor @@ -1,4 +1,5 @@ @using TIAMWebApp.Shared.Application.Interfaces +@using AyCode.Interfaces.StorageHandlers; @inject ISecureStorageHandler SecureStorageHandler
@@ -40,6 +41,16 @@ Transfer
+
+ + Auction + +
+
+ + API + +
Login diff --git a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor index cc98d638..dc5e93e2 100644 --- a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor +++ b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor @@ -1,4 +1,5 @@ @using TIAMWebApp.Shared.Application.Interfaces +@using AyCode.Interfaces.StorageHandlers; @inject ISecureStorageHandler SecureStorageHandler
diff --git a/TIAMSharedUI/TIAMSharedUI.csproj b/TIAMSharedUI/TIAMSharedUI.csproj index 35275e49..e1e1538c 100644 --- a/TIAMSharedUI/TIAMSharedUI.csproj +++ b/TIAMSharedUI/TIAMSharedUI.csproj @@ -17,6 +17,8 @@ + + diff --git a/TIAMSharedUI/wwwroot/images/Auction1.jpg b/TIAMSharedUI/wwwroot/images/Auction1.jpg new file mode 100644 index 00000000..b33cbe62 Binary files /dev/null and b/TIAMSharedUI/wwwroot/images/Auction1.jpg differ diff --git a/TIAMSharedUI/wwwroot/images/Auction2.jpg b/TIAMSharedUI/wwwroot/images/Auction2.jpg new file mode 100644 index 00000000..259df762 Binary files /dev/null and b/TIAMSharedUI/wwwroot/images/Auction2.jpg differ diff --git a/TIAMWebApp/Client/Program.cs b/TIAMWebApp/Client/Program.cs index 52a0ff30..f075cb59 100644 --- a/TIAMWebApp/Client/Program.cs +++ b/TIAMWebApp/Client/Program.cs @@ -1,3 +1,4 @@ +using AyCode.Interfaces.StorageHandlers; using Blazored.LocalStorage; using DevExpress.Blazor; using Microsoft.AspNetCore.Components.Web; @@ -16,10 +17,11 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); -builder.Services.AddScoped(); +builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddBlazoredLocalStorage(); +builder.Services.AddSingleton(); //WebSpecific builder.Services.AddScoped(); //WebSpecific end diff --git a/TIAMWebApp/Client/Services/SecureStorageHandler.cs b/TIAMWebApp/Client/Services/SecureStorageHandler.cs index 3dbea9de..ece29f9f 100644 --- a/TIAMWebApp/Client/Services/SecureStorageHandler.cs +++ b/TIAMWebApp/Client/Services/SecureStorageHandler.cs @@ -1,4 +1,5 @@ -using Blazored.LocalStorage; +using AyCode.Interfaces.StorageHandlers; +using Blazored.LocalStorage; using TIAMWebApp.Shared.Application.Interfaces; namespace TIAMWebApp.Client.Services diff --git a/TIAMWebApp/Client/Services/SessionServiceWeb.cs b/TIAMWebApp/Client/Services/SessionServiceWeb.cs new file mode 100644 index 00000000..3ef45647 --- /dev/null +++ b/TIAMWebApp/Client/Services/SessionServiceWeb.cs @@ -0,0 +1,13 @@ +using System.Net; +using TIAMWebApp.Shared.Application.Interfaces; +using TIAMWebApp.Shared.Application.Models; + +namespace TIAMWebApp.Client.Services +{ + public class SessionServiceWeb : ISessionService + { + public string? SessionId { get; set; } + public UserSessionModel? User { get; set; } + public IPAddress? IPAddress { get; set; } + } +} diff --git a/TIAMWebApp/Client/Services/UserDataService.cs b/TIAMWebApp/Client/Services/UserDataService.cs deleted file mode 100644 index 585bb8aa..00000000 --- a/TIAMWebApp/Client/Services/UserDataService.cs +++ /dev/null @@ -1,217 +0,0 @@ -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.JSInterop; -using Newtonsoft.Json; -using System.Net.Http.Json; -using System.Text; -using TIAM.Entities.TransferDestinations; -using TIAM.Entities.Users; -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 -{ - public class UserDataService : IUserDataService - { - 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, IJSRuntime jSRuntime) - { - this.http = http; - this.secureStorageHandler = secureStorageHandler; - this.jsRuntime = jSRuntime; - this.logToBrowserConsole = new LogToBrowserConsole(jsRuntime); - } - - - public List roleTypes = new List - { - new RoleType { Id = 1, RoleName = "Login" }, - new RoleType { Id = 2, RoleName = "Member" }, - new RoleType { Id = 4, RoleName = "Vip" }, - new RoleType { Id = 8, RoleName = "Uvip" }, - new RoleType { Id = 16, RoleName = "Volunteer" }, - new RoleType { Id = 32, RoleName = "Guide" }, - new RoleType { Id = 64, RoleName = "Protector" }, - new RoleType { Id = 128, RoleName = "Admin" }, - new RoleType { Id = 256, RoleName = "SuperAdmin" }, - new RoleType { Id = 512, RoleName = "God" } - }; - - - public async Task IsLoggedInAsync() - { - if (User == null) - { - User = new UserModel("", "", ""); - User.IsLoggedIn = false; - User.UserType = UserType.User; - return User; - } - - else - { - return User; - } - - } - - //Mock method for now - public async Task AuthorizeUserAsync(int userType) - { - if (User == null) - { - User = new UserModel("", "", ""); - } - - //simply return true for now - User.IsLoggedIn = true; - User.UserType = (UserType)userType; - return User; - } - - public async Task TestUserApi(int Param) - { - var url = APIUrls.UserTest; - var response = await http.PostAsJsonAsync(url, Param); - var result = await response.Content.ReadAsStringAsync(); - return result; - } - - public async Task AuthenticateUser(LoginModel loginModel) - { - - - - var result = string.Empty; - var url = APIUrls.AuthenticateUser; - - var response = await http.PostAsJsonAsync(url, loginModel); - - if (response.IsSuccessStatusCode) - { - result = await response.Content.ReadAsStringAsync(); - } - else - { - result = await response.Content.ReadAsStringAsync(); - } - - //result = await response.Content.ReadAsStringAsync(); - return result; - } - - public async Task<(bool isSuccess, string ErrorMessage)> CreateUser(RegistrationModel regModel) - { - var isSuccess = true; - var 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) - { - isSuccess = true; - result = await response.Content.ReadAsStringAsync(); - } - else - { - isSuccess = false; - result = await response.Content.ReadAsStringAsync(); - }*/ - - - return (isSuccess, result); - } - - public async Task?> GetUsersAsync() - { - return await http.GetFromJsonAsync>(APIUrls.GetUsers); - } - - public async Task GetUserByEmailAsync(string email) - { - return await http.GetFromJsonAsync(APIUrls.GetUserByEmail); - } - - public async Task RefreshToken() - { - logToBrowserConsole.LogToBC("RefreshToken() called"); - var isTokenRefreshed = false; - - using var client = new HttpClient(); - var url = $"{Setting.BaseUrl}{APIUrls.RefreshToken}"; - //var url = APIUrls.RefreshToken; - - var serializedStr = JsonConvert.SerializeObject(new AuthenticateRequestAndResponse - { - RefreshToken = Setting.UserBasicDetails.RefreshToken, - AccessToken = Setting.UserBasicDetails.AccessToken - }); - - try - { - logToBrowserConsole.LogToBC("Refreshtoken url: " + url); - var response = await client.PostAsync(url, new StringContent(serializedStr, Encoding.UTF8, "application/json")); - if (response.IsSuccessStatusCode) - { - var contentStr = await response.Content.ReadAsStringAsync(); - var mainResponse = JsonConvert.DeserializeObject(contentStr); - if (mainResponse is { IsSuccess: true }) - { - var tokenDetails = JsonConvert.DeserializeObject(mainResponse.Content.ToString()); - Setting.UserBasicDetails.AccessToken = tokenDetails.AccessToken; - Setting.UserBasicDetails.RefreshToken = tokenDetails.RefreshToken; - - var userDetailsStr = JsonConvert.SerializeObject(Setting.UserBasicDetails); - await secureStorageHandler.SaveToSecureStorageAsync(nameof(Setting.UserBasicDetails), userDetailsStr); - isTokenRefreshed = true; - } - } - } - catch (Exception ex) - { - var msg = ex.Message; - logToBrowserConsole.LogToBC("Refreshtoken exception: " + ex.ToString()); - } - - return isTokenRefreshed; - } - - - public Task> GetUserRolesAsync(UserModel userModel) - { - //get the userModel's roles - var role = User.UserRoles; - - foreach (var roleType in roleTypes) - { - if ((role & roleType.Id) == roleType.Id) - { - - //add the role to the dictionary - userRoleTypes.Add(roleType.Id, roleType.RoleName); - - } - } - - return Task.FromResult(userRoleTypes); - } - } -} - diff --git a/TIAMWebApp/Client/Services/UserDataServiceWeb.cs b/TIAMWebApp/Client/Services/UserDataServiceWeb.cs new file mode 100644 index 00000000..dbdfea0d --- /dev/null +++ b/TIAMWebApp/Client/Services/UserDataServiceWeb.cs @@ -0,0 +1,215 @@ +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.JSInterop; +using Newtonsoft.Json; +using System.Net.Http.Json; +using System.Text; +using TIAM.Entities.TransferDestinations; +using TIAM.Entities.Users; +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; +using AyCode.Interfaces.StorageHandlers; + + +namespace TIAMWebApp.Client.Services +{ + public class UserDataServiceWeb : IUserDataService + { + private readonly HttpClient http; + private readonly ISecureStorageHandler secureStorageHandler; + private readonly IJSRuntime jsRuntime; + private readonly LogToBrowserConsole logToBrowserConsole; + public Dictionary userRoleTypes { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } + + public UserDataServiceWeb(HttpClient http, ISecureStorageHandler secureStorageHandler, IJSRuntime jSRuntime) + { + this.http = http; + this.secureStorageHandler = secureStorageHandler; + this.jsRuntime = jSRuntime; + this.logToBrowserConsole = new LogToBrowserConsole(jsRuntime); + } + + + public List roleTypes = new List + { + new RoleType { Id = 1, RoleName = "Login" }, + new RoleType { Id = 2, RoleName = "Member" }, + new RoleType { Id = 4, RoleName = "Vip" }, + new RoleType { Id = 8, RoleName = "Uvip" }, + new RoleType { Id = 16, RoleName = "Volunteer" }, + new RoleType { Id = 32, RoleName = "Guide" }, + new RoleType { Id = 64, RoleName = "Protector" }, + new RoleType { Id = 128, RoleName = "Admin" }, + new RoleType { Id = 256, RoleName = "SuperAdmin" }, + new RoleType { Id = 512, RoleName = "God" } + }; + + + public async Task IsLoggedInAsync(Guid id) + { + UserSessionModel User = null; + + var dbUser = await GetUserByIdAsync(id); + + if (dbUser != null) + { + + User = new UserSessionModel(dbUser.Id, UserType.User, dbUser.Email, 1); + return User; + } + else + { + + return null; + } + + } + + public async Task TestUserApi(int Param) + { + var url = APIUrls.UserTest; + var response = await http.PostAsJsonAsync(url, Param); + var result = await response.Content.ReadAsStringAsync(); + return result; + } + + public async Task AuthenticateUser(LoginModel loginModel) + { + + + + string result = string.Empty; + var url = APIUrls.AuthenticateUser; + + var response = await http.PostAsJsonAsync(url, loginModel); + + if (response.IsSuccessStatusCode) + { + result = await response.Content.ReadAsStringAsync(); + } + else + { + result = await response.Content.ReadAsStringAsync(); + } + + //result = await response.Content.ReadAsStringAsync(); + return result; + + } + + public async Task<(bool isSuccess, string ErrorMessage)> CreateUser(RegistrationModel regModel) + { + + bool isSuccess = true; + 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) + { + isSuccess = true; + result = await response.Content.ReadAsStringAsync(); + } + else + { + isSuccess = false; + result = await response.Content.ReadAsStringAsync(); + }*/ + + + return (isSuccess, result); + } + + public async Task?> GetUsersAsync() + { + return await http.GetFromJsonAsync>(APIUrls.GetUsers); + } + + public async Task GetUserByEmailAsync(string email) + { + var url = $"{Setting.BaseUrl}/{APIUrls.GetUserByEmail}"; + return await http.GetFromJsonAsync(url); + } + + public async Task GetUserByIdAsync(Guid Id) + { + var url = $"{Setting.BaseUrl}/{APIUrls.GetUserById}"; + logToBrowserConsole.LogToBC("GetUserByIdAsync url: " + url + ", " + Id.ToString()); + var response = await http.PostAsJsonAsync(url, Id); + var result = await response.Content.ReadAsStringAsync(); + var user = JsonConvert.DeserializeObject(result); + return user; + } + + public async Task RefreshToken() + { + logToBrowserConsole.LogToBC("RefreshToken() called"); + bool isTokenRefreshed = false; + using (var client = new HttpClient()) + { + var url = $"{Setting.BaseUrl}{APIUrls.RefreshToken}"; + //var url = APIUrls.RefreshToken; + + var serializedStr = JsonConvert.SerializeObject(new AuthenticateRequestAndResponse + { + RefreshToken = Setting.UserBasicDetails.RefreshToken, + AccessToken = Setting.UserBasicDetails.AccessToken + }); + + try + { + logToBrowserConsole.LogToBC("Refreshtoken url: " + url); + var response = await client.PostAsync(url, new StringContent(serializedStr, Encoding.UTF8, "application/json")); + if (response.IsSuccessStatusCode) + { + string contentStr = await response.Content.ReadAsStringAsync(); + var mainResponse = JsonConvert.DeserializeObject(contentStr); + if (mainResponse.IsSuccess) + { + var tokenDetails = JsonConvert.DeserializeObject(mainResponse.Content.ToString()); + Setting.UserBasicDetails.AccessToken = tokenDetails.AccessToken; + Setting.UserBasicDetails.RefreshToken = tokenDetails.RefreshToken; + + string userDetailsStr = JsonConvert.SerializeObject(Setting.UserBasicDetails); + await secureStorageHandler.SaveToSecureStorageAsync(nameof(Setting.UserBasicDetails), userDetailsStr); + isTokenRefreshed = true; + } + } + } + catch (Exception ex) + { + string msg = ex.Message; + logToBrowserConsole.LogToBC("Refreshtoken exception: " + ex.ToString()); + } + + + } + return isTokenRefreshed; + } + + + public Task> GetUserRolesAsync(UserModel userModel) + { + //TODO: finish this + //get the userModel's roles + int role = userModel.UserRoles; + + foreach (var roleType in roleTypes) + { + if ((role & roleType.Id) == roleType.Id) + { + + //add the role to the dictionary + userRoleTypes.Add(roleType.Id, roleType.RoleName); + + } + } + return Task.FromResult(userRoleTypes); + + } + } +} + diff --git a/TIAMWebApp/Server/Controllers/AuctionAPIController.cs b/TIAMWebApp/Server/Controllers/AuctionAPIController.cs new file mode 100644 index 00000000..a1d75492 --- /dev/null +++ b/TIAMWebApp/Server/Controllers/AuctionAPIController.cs @@ -0,0 +1,168 @@ +using DevExpress.Office.Crypto; +using DevExpress.Xpo.DB; +using DevExpress.XtraPrinting; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json.Linq; +using Microsoft.IdentityModel.Tokens; +using System.IdentityModel.Tokens.Jwt; +using System.Security.Claims; +using System.Security.Cryptography; +using System.Text.Json; +using TIAMWebApp.Shared.Application.Models; +using TIAMWebApp.Shared.Application.Models.PageModels; +using TIAMWebApp.Server.Models; +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; +using TIAM.Entities.Auctions; + +namespace TIAMWebApp.Server.Controllers +{ + [Authorize] + [ApiController] + [Route("api/[controller]")] + public class AuctionAPIController : ControllerBase + { + private AuctionDal _auctionDal; + private readonly IConfiguration _configuration; + private readonly IWebHostEnvironment _webHostEnvironment; + PasswordHasher hasher = new PasswordHasher(); + + + private readonly ILogger _logger; + + public AuctionAPIController(ILogger logger, IConfiguration configuration, IWebHostEnvironment webHostEnvironment, AuctionDal auctionDal) + { + _logger = logger; + _configuration = configuration; + _webHostEnvironment = webHostEnvironment; + _auctionDal = auctionDal; + } + + [AllowAnonymous] + [HttpPost] + [Route("CreateBid")] + public async Task CreateUser([FromBody] AuctionBid SerializedAuctionBidModel) + { + Console.WriteLine("CreateBid called"); + //if (string.IsNullOrEmpty(SerializedAuctionBidModel.GetRawText())) + //{ + // return BadRequest("SerializedAuctionBidModel is required"); + //} + //else + //{ + //AuctionBidModel? bid = JObject.Parse(SerializedAuctionBidModel.GetRawText()).ToObject(); + AuctionBid bid = SerializedAuctionBidModel; + AuctionBid finalizedBidModel; + + if(bid != 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 = bid.OwnerId; + var targetProductId = bid.TargetProductId; + string? email = bid?.Email; + string? phoneNumber = bid?.PhoneNumber; + int bidAmount = bid?.BidAmount ?? 0; + bool isValid = false; + + if(userId == Guid.Empty || string.IsNullOrEmpty(email) || targetProductId==0 || bidAmount == 0) + { + return BadRequest("Invalid request"); + } + else + { + Console.WriteLine($"Bid to be created: {userId}, {targetProductId}, {email}, {phoneNumber}, {bidAmount}, {isValid}"); + finalizedBidModel = new AuctionBid(userId, targetProductId, email, phoneNumber, bidAmount); + await _auctionDal.CreateBidAsync(finalizedBidModel); + return Ok(finalizedBidModel.Id); + } + } + else + { + return BadRequest("Invalid request"); + } + //} + } + + + [AllowAnonymous] + [HttpGet] + [Route("GetBids")] + public Task> GetBids() + { + //var users = await _userDal.Ctx.Users.ToListAsync();//.GetUsersAsync(); + //return users; + return _auctionDal.GetBids(); + } + + [AllowAnonymous] + [HttpGet] + [Route("GetBidsByEmail")] + public async Task> GetUserByEmail(string email) + { + return await _auctionDal.GetBidsByEmail(email); + } + + [AllowAnonymous] + [HttpPost] + [Route("ValidateBid")] + public async Task ValidateBid([FromBody] AuctionBid SerializedAuctionBidModel) + { + Console.WriteLine("ValidateBid called"); + //var validateBid = JObject.Parse(SerializedAuctionBidModel.GetRawText()).ToObject(); + + //check if bid exists + AuctionBid? dbBid = null; + + //Console.WriteLine(validateBid?.Id); + Console.WriteLine(SerializedAuctionBidModel?.Id); + //if (validateBid != null) + if (SerializedAuctionBidModel != null) + { + //dbBid = await _auctionDal.GetBidById(validateBid.Id); + dbBid = await _auctionDal.GetBidById(SerializedAuctionBidModel.Id); + } + + //check if password is valid + //bool isValidUser = await _userManager.CheckPasswordAsync(userModel, authenticateUser.Password); + + //mocking + if (dbBid is null) + { + return Unauthorized("Not found in DB"); + } + else + { + + //if (dbBid.Email == validateBid?.Email) + if (dbBid.Email == SerializedAuctionBidModel?.Email) + { + Console.WriteLine("Bid is valid"); + dbBid.IsValid = true; + //Update userModel with refreshToken!! + await _auctionDal.UpdateBidAsync(dbBid); + return Ok(dbBid.IsValid); + + } + else + { + return Unauthorized("Emails not matching"); + } + } + + + + } + + } +} \ No newline at end of file diff --git a/TIAMWebApp/Server/Controllers/GoogleAPIController .cs b/TIAMWebApp/Server/Controllers/GoogleAPIController .cs index 3554ab4b..d603c099 100644 --- a/TIAMWebApp/Server/Controllers/GoogleAPIController .cs +++ b/TIAMWebApp/Server/Controllers/GoogleAPIController .cs @@ -11,7 +11,16 @@ using System.Reflection.Metadata; using TIAMWebApp.Shared.Application.Models; using static DevExpress.XtraPrinting.Native.ExportOptionsPropertiesNames; using System.Net; +using GoogleApi.Entities.Maps.Geocoding.Address.Request; using GoogleApi.Entities.Maps.DistanceMatrix.Response; +using System.Net.Http; +using System.Text.Json; +using GoogleApi.Entities.Maps.Directions.Response; +using GoogleApi.Entities.Maps.Geocoding.Location.Request; +using GoogleApi; +using GoogleApi.Entities.Search.Common.Enums; +using Microsoft.AspNetCore.Razor.TagHelpers; +using GoogleApi.Entities.Maps.AddressValidation.Request; namespace TIAMWebApp.Server.Controllers { @@ -20,8 +29,7 @@ namespace TIAMWebApp.Server.Controllers public class GoogleAPIController : ControllerBase { - - + private string _apiKey = "AIzaSyAyEYJkpt2KDa3SJ34UNWO4-dNOJKmUtF8"; private static readonly TripInfo[] Trips = new TripInfo[] { @@ -32,37 +40,87 @@ namespace TIAMWebApp.Server.Controllers private readonly ILogger _logger; + public GoogleAPIController(ILogger logger) { _logger = logger; + } - [HttpGet] + [HttpPost] [Route("GetAddressForCoordinates")] - public string GetAddressForCoordinates(TripInfo myTrip) + public async Task GetAddressForCoordinates(TripInfo myTrip) { - var latitude = Trips[0].StartLatitude; // Example latitude + var latitude = myTrip.StartLatitude; // Example latitude - var longitude = Trips[0].StartLongitude; // Example longitude + var longitude = myTrip.StartLongitude; // Example longitude Console.WriteLine(latitude); Console.WriteLine(longitude); + var booo = new Coordinate(latitude, longitude); + + var request = new LocationGeocodeRequest + { + Key = _apiKey, + Location = booo + }; try { - /*var address = locationService.GetAddressFromLatLang(latitude, longitude); - Console.WriteLine(address.Address); - string myaddress = address.Address; - return "myaddress: " + myaddress;*/ - return ""; + var response = await GoogleMaps.Geocode.LocationGeocode.QueryAsync(request); + if (response.Status == Status.Ok) + { + return response.RawJson; + } + + else + { + return "Something wrong"; + } } - catch (System.Net.WebException ex) + catch (Exception ex) { - Console.WriteLine("Google Maps API Error {0}", ex.Message); - return "Google Maps API Error {0}" + ex.Message; + return ex + "Error occurred while calling GoogleMaps.Geocode.LocationGeocode.QueryAsync"; } + } + //google api call to get coordinates from address + [HttpPost] + [Route("ValidateAddress")] + public async Task ValidateAddress(string address) + { + + var request = new AddressValidationRequest + { + Key = _apiKey, + Address = new PostalAddress + { + AddressLines = new List + { + address + } + } + }; + + + var response = await GoogleMaps.AddressValidation.QueryAsync(request); + if (response.Status == Status.Ok) + { + return response.Result.Address.FormattedAddress; + } + else if (response.Status == Status.ZeroResults) + { + return "No results found for the given address."; + } + else + { + return "Something went wrong."; + } + + } + + [HttpGet] [Route("GetTravelTime")] //public string GetTravelTime(TripInfo) @@ -95,7 +153,7 @@ namespace TIAMWebApp.Server.Controllers { var request = new DistanceMatrixRequest { - Key = "AIzaSyAyEYJkpt2KDa3SJ34UNWO4-dNOJKmUtF8", + Key = _apiKey, Origins = new[] { new LocationEx(origin1), @@ -134,5 +192,16 @@ namespace TIAMWebApp.Server.Controllers } + public class GoogleMapsResponse + { + public string Status { get; set; } + public Result[] Results { get; set; } + } + + public class Result + { + public string FormattedAddress { get; set; } + } + } } \ No newline at end of file diff --git a/TIAMWebApp/Server/Controllers/UserAPIController.cs b/TIAMWebApp/Server/Controllers/UserAPIController.cs index 663e05f8..bbc9385b 100644 --- a/TIAMWebApp/Server/Controllers/UserAPIController.cs +++ b/TIAMWebApp/Server/Controllers/UserAPIController.cs @@ -53,37 +53,6 @@ namespace TIAMWebApp.Server.Controllers } - /*[HttpPost] - [Route("Auth")] - public async Task AuthenticateUser([FromBody] JsonElement SerializedLoginModel) - { - Console.WriteLine("Auth called"); - Console.WriteLine(SerializedLoginModel.GetRawText()); - if (string.IsNullOrEmpty(SerializedLoginModel.GetRawText())) - { - return BadRequest("SerializedLoginModel is required"); - } - else - { - var userModel = JObject.Parse(SerializedLoginModel.GetRawText()).ToObject(); - - Console.WriteLine(userModel.Email); - Console.WriteLine(userModel.Password); - - if (userModel.Email == "test@tiam.hu" && userModel.Password == "Asdasd123456") - { - Console.WriteLine("UserModel authenticated"); - return Ok("yes"); - } - else - { - Console.WriteLine("UserModel NOT authenticated"); - return Ok("no"); - } - } - - }*/ - [AllowAnonymous] [HttpPost] [Route("AuthenticateUser")] @@ -208,6 +177,7 @@ namespace TIAMWebApp.Server.Controllers { //get user from db dbUser = await _userDal.GetUserByEmailAsync(email.Value); + Console.WriteLine("DbUser email: " + dbUser?.Email); } //mocking - update userModel with new refreshToken so it returns true after the check below @@ -216,6 +186,7 @@ namespace TIAMWebApp.Server.Controllers if (dbUser is null || dbUser.RefreshToken != refreshTokenRequest.RefreshToken) { response.ErrorMessage = "Invalid Request"; + Console.WriteLine($"{dbUser?.RefreshToken}, {refreshTokenRequest.RefreshToken}"); return BadRequest(response); } @@ -224,7 +195,8 @@ namespace TIAMWebApp.Server.Controllers //mocking - update userModel with new refreshToken dbUser.RefreshToken = refreshToken; - //await _userManager.UpdateAsync(userModel); + //TODO await _userManager.UpdateAsync(userModel); + await _userDal.UpdateUserAsync(dbUser); response.IsSuccess = true; response.Content = new AuthenticationResponse @@ -361,6 +333,16 @@ namespace TIAMWebApp.Server.Controllers return await _userDal.GetUserByEmailAsync(email); } + [AllowAnonymous] + [HttpPost] + [Route("GetUserById")] + public async Task GetUserById([FromBody] Guid id) + { + Console.WriteLine($"GetUserById called with id: {id}"); + + return await _userDal.GetUserByIdAsync(id); + } + private bool VerifyPassword(string password, string hashedPassword) { bool isPasswordValid = hasher.VerifyPassword(password, hashedPassword); diff --git a/TIAMWebApp/Server/Program.cs b/TIAMWebApp/Server/Program.cs index 8312340b..dbf3d89f 100644 --- a/TIAMWebApp/Server/Program.cs +++ b/TIAMWebApp/Server/Program.cs @@ -23,6 +23,7 @@ builder.Services.AddRazorPages(); //builder.Services.AddDbContext(options => options.UseSqlServer(builder.Configuration.GetConnectionString("DeveloperDbConnection")));; builder.Services.AddScoped(); 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 f2e4a959..8e1b5f8f 100644 --- a/TIAMWebApp/Server/TIAMWebApp.Server.csproj +++ b/TIAMWebApp/Server/TIAMWebApp.Server.csproj @@ -18,6 +18,7 @@ + diff --git a/TIAMWebApp/Shared/Interfaces/ISecureStorageHandler.cs b/TIAMWebApp/Shared/Interfaces/ISecureStorageHandler.cs deleted file mode 100644 index 77b83d12..00000000 --- a/TIAMWebApp/Shared/Interfaces/ISecureStorageHandler.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TIAMWebApp.Shared.Application.Interfaces -{ - public interface ISecureStorageHandler - { - 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/Interfaces/ISessionService.cs b/TIAMWebApp/Shared/Interfaces/ISessionService.cs new file mode 100644 index 00000000..00b27144 --- /dev/null +++ b/TIAMWebApp/Shared/Interfaces/ISessionService.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Text; +using System.Threading.Tasks; +using TIAMWebApp.Shared.Application.Models; + +namespace TIAMWebApp.Shared.Application.Interfaces +{ + public interface ISessionService + { + public string? SessionId { get; set; } + public UserSessionModel? User { get; set; } + public IPAddress? IPAddress { get; set; } + } +} diff --git a/TIAMWebApp/Shared/Interfaces/IUserDataService.cs b/TIAMWebApp/Shared/Interfaces/IUserDataService.cs index eb4d9673..e7a08e84 100644 --- a/TIAMWebApp/Shared/Interfaces/IUserDataService.cs +++ b/TIAMWebApp/Shared/Interfaces/IUserDataService.cs @@ -11,13 +11,9 @@ namespace TIAMWebApp.Shared.Application.Interfaces { public interface IUserDataService { - public UserModel? User { get; set; } public Dictionary userRoleTypes { get; set; } - public Task IsLoggedInAsync(); - - //mock method for now - public Task AuthorizeUserAsync(int userType); + public Task IsLoggedInAsync(Guid id); public Task AuthenticateUser(LoginModel loginModel); public Task<(bool isSuccess, string ErrorMessage)> CreateUser(RegistrationModel regModel); diff --git a/TIAMWebApp/Shared/Models/APIUrls.cs b/TIAMWebApp/Shared/Models/APIUrls.cs index e88af920..bcbb5be0 100644 --- a/TIAMWebApp/Shared/Models/APIUrls.cs +++ b/TIAMWebApp/Shared/Models/APIUrls.cs @@ -10,6 +10,7 @@ namespace TIAMWebApp.Shared.Application.Models { public const string UserTest = "api/UserAPI/test1"; public const string GetUserByEmail = "api/UserAPI/GetUserByEmail"; + public const string GetUserById = "api/UserAPI/GetUserById"; public const string GetUsers = "api/UserAPI/GetUsers"; public const string AuthenticateUser = "api/UserAPI/AuthenticateUser"; public const string CreateUser = "api/UserAPI/CreateUser"; diff --git a/TIAMWebApp/Shared/Models/AuctionBidModel.cs b/TIAMWebApp/Shared/Models/AuctionBidModel.cs new file mode 100644 index 00000000..fc754117 --- /dev/null +++ b/TIAMWebApp/Shared/Models/AuctionBidModel.cs @@ -0,0 +1,14 @@ +using TIAM.Entities.Auctions; + + +namespace TIAMWebApp.Shared.Application.Models +{ + public class AuctionBidModel : AuctionBid + { + + public AuctionBidModel() { } + public AuctionBidModel(Guid Id, Guid ownerId, int targetProduct, string email, string phoneNumber, int bidAmount) : base(ownerId, targetProduct, email, phoneNumber, bidAmount) + { } + + } +} diff --git a/TIAMWebApp/Shared/Models/UserModel.cs b/TIAMWebApp/Shared/Models/UserModel.cs index 33a4db0b..4b67a9ff 100644 --- a/TIAMWebApp/Shared/Models/UserModel.cs +++ b/TIAMWebApp/Shared/Models/UserModel.cs @@ -23,13 +23,4 @@ namespace TIAMWebApp.Shared.Application.Models } - public enum UserType - { - Hotel = 1, - Transfer = 2, - Guide = 3, - Admin = 4, - User = 5, - Driver= 6 - } } diff --git a/TIAMWebApp/Shared/Models/UserSessionModel.cs b/TIAMWebApp/Shared/Models/UserSessionModel.cs new file mode 100644 index 00000000..bf316196 --- /dev/null +++ b/TIAMWebApp/Shared/Models/UserSessionModel.cs @@ -0,0 +1,32 @@ +using TIAM.Entities.Users; + +namespace TIAMWebApp.Shared.Application.Models +{ + public class UserSessionModel + { + public Guid UserId { get; set; } + public UserType UserType { get; set; } + public string Email { get; set; } + public int UserRoles { get; set; } + public Dictionary UserRolesDictionary { get; set; } + + public UserSessionModel(Guid userId, UserType userType, string email, int userRoles) + { + UserId = userId; + UserType = userType; + Email = email; + UserRoles = userRoles; + UserRolesDictionary = new Dictionary(); + } + } + + public enum UserType + { + Hotel = 1, + Transfer = 2, + Guide = 3, + Admin = 4, + User = 5, + Driver = 6 + } +} diff --git a/TourIAmProject.sln b/TourIAmProject.sln index 5ff2ba6c..48257c64 100644 --- a/TourIAmProject.sln +++ b/TourIAmProject.sln @@ -23,6 +23,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TIAM.Entities.Server", "TIA EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TIAM.Core", "TIAM.Core\TIAM.Core.csproj", "{4FDE0CD3-5914-4919-933B-6B0E04275313}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AyCode.Blazor.Components", "..\Aycode.Blazor\AyCode.Blazor.Components\AyCode.Blazor.Components.csproj", "{374FDE0D-C289-4069-AD74-AF32B81F9240}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AyCode.Blazor.Controllers", "..\Aycode.Blazor\AyCode.Blazor.Controllers\AyCode.Blazor.Controllers.csproj", "{75A00A4B-6A04-40E8-99FF-507B26E69DDA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AyCode.Maui.Core", "..\Aycode.Blazor\AyCode.Maui.Core\AyCode.Maui.Core.csproj", "{E0D4D619-4F6C-4165-95CE-EB295947E4E3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AyCode.Blazor.Models", "..\Aycode.Blazor\AyCode.Blazor.Models\AyCode.Blazor.Models.csproj", "{C0597140-AD8D-464B-B032-E11F7BC570BA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AyCode.Blazor.Models.Server", "..\Aycode.Blazor\AyCode.Blazor.Models.Server\AyCode.Blazor.Models.Server.csproj", "{A36322E8-F485-455E-84AA-B911948B6702}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -71,6 +81,26 @@ Global {4FDE0CD3-5914-4919-933B-6B0E04275313}.Debug|Any CPU.Build.0 = Debug|Any CPU {4FDE0CD3-5914-4919-933B-6B0E04275313}.Release|Any CPU.ActiveCfg = Release|Any CPU {4FDE0CD3-5914-4919-933B-6B0E04275313}.Release|Any CPU.Build.0 = Release|Any CPU + {374FDE0D-C289-4069-AD74-AF32B81F9240}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {374FDE0D-C289-4069-AD74-AF32B81F9240}.Debug|Any CPU.Build.0 = Debug|Any CPU + {374FDE0D-C289-4069-AD74-AF32B81F9240}.Release|Any CPU.ActiveCfg = Release|Any CPU + {374FDE0D-C289-4069-AD74-AF32B81F9240}.Release|Any CPU.Build.0 = Release|Any CPU + {75A00A4B-6A04-40E8-99FF-507B26E69DDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {75A00A4B-6A04-40E8-99FF-507B26E69DDA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {75A00A4B-6A04-40E8-99FF-507B26E69DDA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {75A00A4B-6A04-40E8-99FF-507B26E69DDA}.Release|Any CPU.Build.0 = Release|Any CPU + {E0D4D619-4F6C-4165-95CE-EB295947E4E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E0D4D619-4F6C-4165-95CE-EB295947E4E3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E0D4D619-4F6C-4165-95CE-EB295947E4E3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E0D4D619-4F6C-4165-95CE-EB295947E4E3}.Release|Any CPU.Build.0 = Release|Any CPU + {C0597140-AD8D-464B-B032-E11F7BC570BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C0597140-AD8D-464B-B032-E11F7BC570BA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C0597140-AD8D-464B-B032-E11F7BC570BA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C0597140-AD8D-464B-B032-E11F7BC570BA}.Release|Any CPU.Build.0 = Release|Any CPU + {A36322E8-F485-455E-84AA-B911948B6702}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A36322E8-F485-455E-84AA-B911948B6702}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A36322E8-F485-455E-84AA-B911948B6702}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A36322E8-F485-455E-84AA-B911948B6702}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE