Index: KernelRecordsMVC.Application/obj/Debug/net8.0/KernelRecordsMVC.Application.AssemblyInfo.cs =================================================================== --- KernelRecordsMVC.Application/obj/Debug/net8.0/KernelRecordsMVC.Application.AssemblyInfo.cs (revision 595d2e58cf322a776ba1d3cedcb86e9bb2ee8093) +++ KernelRecordsMVC.Application/obj/Debug/net8.0/KernelRecordsMVC.Application.AssemblyInfo.cs (revision 1dcdb2cfb56ccfd57525e0cd573a289cead0870b) @@ -14,5 +14,5 @@ [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d89d25b3a7f785676877cf198c9cc706308ab4a3")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+595d2e58cf322a776ba1d3cedcb86e9bb2ee8093")] [assembly: System.Reflection.AssemblyProductAttribute("KernelRecordsMVC.Application")] [assembly: System.Reflection.AssemblyTitleAttribute("KernelRecordsMVC.Application")] Index: KernelRecordsMVC.Application/obj/Debug/net8.0/KernelRecordsMVC.Application.AssemblyInfoInputs.cache =================================================================== --- KernelRecordsMVC.Application/obj/Debug/net8.0/KernelRecordsMVC.Application.AssemblyInfoInputs.cache (revision 595d2e58cf322a776ba1d3cedcb86e9bb2ee8093) +++ KernelRecordsMVC.Application/obj/Debug/net8.0/KernelRecordsMVC.Application.AssemblyInfoInputs.cache (revision 1dcdb2cfb56ccfd57525e0cd573a289cead0870b) @@ -1,1 +1,1 @@ -1de1e67b21e6555460bba54dec4600f29627ec11612fbabaf75aead1668384fb +2b95f46ca6e7a7b44d1bea5cf3bcb61e1e18ef9f205b6731124e61118243093c Index: KernelRecordsMVC.Application/obj/Debug/net8.0/KernelRecordsMVC.Application.sourcelink.json =================================================================== --- KernelRecordsMVC.Application/obj/Debug/net8.0/KernelRecordsMVC.Application.sourcelink.json (revision 595d2e58cf322a776ba1d3cedcb86e9bb2ee8093) +++ KernelRecordsMVC.Application/obj/Debug/net8.0/KernelRecordsMVC.Application.sourcelink.json (revision 1dcdb2cfb56ccfd57525e0cd573a289cead0870b) @@ -1,1 +1,1 @@ -{"documents":{"C:\\Users\\Marko\\RiderProjects\\KernelRecordsMVC\\*":"https://raw.githubusercontent.com/mmilevski/kernelrecords/d89d25b3a7f785676877cf198c9cc706308ab4a3/*"}} +{"documents":{"C:\\Users\\Marko\\RiderProjects\\KernelRecordsMVC\\*":"https://raw.githubusercontent.com/mmilevski/kernelrecords/595d2e58cf322a776ba1d3cedcb86e9bb2ee8093/*"}} Index: KernelRecordsMVC.Domain/obj/Debug/net8.0/KernelRecordsMVC.Domain.AssemblyInfo.cs =================================================================== --- KernelRecordsMVC.Domain/obj/Debug/net8.0/KernelRecordsMVC.Domain.AssemblyInfo.cs (revision 595d2e58cf322a776ba1d3cedcb86e9bb2ee8093) +++ KernelRecordsMVC.Domain/obj/Debug/net8.0/KernelRecordsMVC.Domain.AssemblyInfo.cs (revision 1dcdb2cfb56ccfd57525e0cd573a289cead0870b) @@ -14,5 +14,5 @@ [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d89d25b3a7f785676877cf198c9cc706308ab4a3")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+595d2e58cf322a776ba1d3cedcb86e9bb2ee8093")] [assembly: System.Reflection.AssemblyProductAttribute("KernelRecordsMVC.Domain")] [assembly: System.Reflection.AssemblyTitleAttribute("KernelRecordsMVC.Domain")] Index: KernelRecordsMVC.Domain/obj/Debug/net8.0/KernelRecordsMVC.Domain.AssemblyInfoInputs.cache =================================================================== --- KernelRecordsMVC.Domain/obj/Debug/net8.0/KernelRecordsMVC.Domain.AssemblyInfoInputs.cache (revision 595d2e58cf322a776ba1d3cedcb86e9bb2ee8093) +++ KernelRecordsMVC.Domain/obj/Debug/net8.0/KernelRecordsMVC.Domain.AssemblyInfoInputs.cache (revision 1dcdb2cfb56ccfd57525e0cd573a289cead0870b) @@ -1,1 +1,1 @@ -2c5c6269aac41449bcb50d10a12b287cb457ef35a5d93683092ccb6ff4c72e0c +0efe0787d662b9426c568107579e3e84ab30d64c136c14f64cb8dcc29bea5998 Index: KernelRecordsMVC.Domain/obj/Debug/net8.0/KernelRecordsMVC.Domain.sourcelink.json =================================================================== --- KernelRecordsMVC.Domain/obj/Debug/net8.0/KernelRecordsMVC.Domain.sourcelink.json (revision 595d2e58cf322a776ba1d3cedcb86e9bb2ee8093) +++ KernelRecordsMVC.Domain/obj/Debug/net8.0/KernelRecordsMVC.Domain.sourcelink.json (revision 1dcdb2cfb56ccfd57525e0cd573a289cead0870b) @@ -1,1 +1,1 @@ -{"documents":{"C:\\Users\\Marko\\RiderProjects\\KernelRecordsMVC\\*":"https://raw.githubusercontent.com/mmilevski/kernelrecords/d89d25b3a7f785676877cf198c9cc706308ab4a3/*"}} +{"documents":{"C:\\Users\\Marko\\RiderProjects\\KernelRecordsMVC\\*":"https://raw.githubusercontent.com/mmilevski/kernelrecords/595d2e58cf322a776ba1d3cedcb86e9bb2ee8093/*"}} Index: KernelRecordsMVC.Infrastructure/obj/Debug/net8.0/KernelRecordsMVC.Infrastructure.AssemblyInfo.cs =================================================================== --- KernelRecordsMVC.Infrastructure/obj/Debug/net8.0/KernelRecordsMVC.Infrastructure.AssemblyInfo.cs (revision 595d2e58cf322a776ba1d3cedcb86e9bb2ee8093) +++ KernelRecordsMVC.Infrastructure/obj/Debug/net8.0/KernelRecordsMVC.Infrastructure.AssemblyInfo.cs (revision 1dcdb2cfb56ccfd57525e0cd573a289cead0870b) @@ -14,5 +14,5 @@ [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d89d25b3a7f785676877cf198c9cc706308ab4a3")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+595d2e58cf322a776ba1d3cedcb86e9bb2ee8093")] [assembly: System.Reflection.AssemblyProductAttribute("KernelRecordsMVC.Infrastructure")] [assembly: System.Reflection.AssemblyTitleAttribute("KernelRecordsMVC.Infrastructure")] Index: KernelRecordsMVC.Infrastructure/obj/Debug/net8.0/KernelRecordsMVC.Infrastructure.AssemblyInfoInputs.cache =================================================================== --- KernelRecordsMVC.Infrastructure/obj/Debug/net8.0/KernelRecordsMVC.Infrastructure.AssemblyInfoInputs.cache (revision 595d2e58cf322a776ba1d3cedcb86e9bb2ee8093) +++ KernelRecordsMVC.Infrastructure/obj/Debug/net8.0/KernelRecordsMVC.Infrastructure.AssemblyInfoInputs.cache (revision 1dcdb2cfb56ccfd57525e0cd573a289cead0870b) @@ -1,1 +1,1 @@ -5ec5e89a0b05a9fba0312a8736adff239c38327d3e73e894fad14b10b6985769 +4045a2d37b7dc6d9739414ba672768dbe0fe8eae8e3c23bace485112222ed00e Index: KernelRecordsMVC.Infrastructure/obj/Debug/net8.0/KernelRecordsMVC.Infrastructure.sourcelink.json =================================================================== --- KernelRecordsMVC.Infrastructure/obj/Debug/net8.0/KernelRecordsMVC.Infrastructure.sourcelink.json (revision 595d2e58cf322a776ba1d3cedcb86e9bb2ee8093) +++ KernelRecordsMVC.Infrastructure/obj/Debug/net8.0/KernelRecordsMVC.Infrastructure.sourcelink.json (revision 1dcdb2cfb56ccfd57525e0cd573a289cead0870b) @@ -1,1 +1,1 @@ -{"documents":{"C:\\Users\\Marko\\RiderProjects\\KernelRecordsMVC\\*":"https://raw.githubusercontent.com/mmilevski/kernelrecords/d89d25b3a7f785676877cf198c9cc706308ab4a3/*"}} +{"documents":{"C:\\Users\\Marko\\RiderProjects\\KernelRecordsMVC\\*":"https://raw.githubusercontent.com/mmilevski/kernelrecords/595d2e58cf322a776ba1d3cedcb86e9bb2ee8093/*"}} Index: KernelRecordsMVC.Web/Controllers/AccountController.cs =================================================================== --- KernelRecordsMVC.Web/Controllers/AccountController.cs (revision 595d2e58cf322a776ba1d3cedcb86e9bb2ee8093) +++ KernelRecordsMVC.Web/Controllers/AccountController.cs (revision 1dcdb2cfb56ccfd57525e0cd573a289cead0870b) @@ -6,4 +6,5 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; +using Microsoft.AspNetCore.Identity; namespace KernelRecordsMVC.Web.Controllers; @@ -12,8 +13,10 @@ { private readonly KernelRecordsContext _context; - - public AccountController(KernelRecordsContext context) + private readonly IPasswordHasher _passwordHasher; + + public AccountController(KernelRecordsContext context,IPasswordHasher passwordHasher) { _context = context; + _passwordHasher = passwordHasher; } @@ -59,35 +62,44 @@ } - var user = new User - { - Email = model.Email, - Username = model.Username, - - // TODO: - // Replace with password hashing later. - Password = model.Password, - - DateCreated = DateTime.Today, - ShippingAddress = model.ShippingAddress, - TelephoneNumber = model.TelephoneNumber - }; - - _context.Users.Add(user); - - _context.SaveChanges(); - - - // Every normal registered user is a Consumer. - var consumer = new Consumer - { - UserId = user.UserId, - PointsCollected = 0 - }; - - _context.Consumers.Add(consumer); - - _context.SaveChanges(); - - return RedirectToAction(nameof(Login)); + using var transaction = + _context.Database.BeginTransaction(); + + try + { + var user = new User + { + Email = model.Email, + Username = model.Username, + DateCreated = DateTime.Today, + ShippingAddress = model.ShippingAddress, + TelephoneNumber = model.TelephoneNumber + }; + + user.Password = + _passwordHasher.HashPassword( + user, + model.Password); + + _context.Users.Add(user); + _context.SaveChanges(); + + var consumer = new Consumer + { + UserId = user.UserId, + PointsCollected = 0 + }; + + _context.Consumers.Add(consumer); + _context.SaveChanges(); + + transaction.Commit(); + + return RedirectToAction(nameof(Login)); + } + catch + { + transaction.Rollback(); + throw; + } } @@ -118,8 +130,22 @@ var user = _context.Users .FirstOrDefault(x => - x.Username == model.Username && - x.Password == model.Password); + x.Username == model.Username); if (user == null) + { + ModelState.AddModelError( + "", + "Invalid username or password."); + + return View(model); + } + + var result = + _passwordHasher.VerifyHashedPassword( + user, + user.Password, + model.Password); + + if (result == PasswordVerificationResult.Failed) { ModelState.AddModelError( Index: KernelRecordsMVC.Web/Controllers/OrderController.cs =================================================================== --- KernelRecordsMVC.Web/Controllers/OrderController.cs (revision 595d2e58cf322a776ba1d3cedcb86e9bb2ee8093) +++ KernelRecordsMVC.Web/Controllers/OrderController.cs (revision 1dcdb2cfb56ccfd57525e0cd573a289cead0870b) @@ -52,98 +52,119 @@ - // Find an existing pending order. - var order = _context.Orders - .Include(o => o.OrderProducts) - .FirstOrDefault(o => - o.UserId == userId.Value && - o.Status == OrderStatusType.PENDING); - - - // If there is no pending order, create one. - if (order == null) - { - order = new Order + using var transaction = + _context.Database.BeginTransaction(); + + try + { + var order = _context.Orders + .Include(o => o.OrderProducts) + .FirstOrDefault(o => + o.UserId == userId.Value && + o.Status == OrderStatusType.PENDING); + + if (order == null) { - UserId = userId.Value, - PaymentMethod = PaymentMethodType.CARD, - PurchaseDate = DateTime.Today, - PointsEarned = 0, - PointsUsed = null, - Status = OrderStatusType.PENDING - }; - - _context.Orders.Add(order); + order = new Order + { + UserId = userId.Value, + PaymentMethod = PaymentMethodType.CARD, + PurchaseDate = DateTime.Today, + PointsEarned = 0, + PointsUsed = null, + Status = OrderStatusType.PENDING + }; + + _context.Orders.Add(order); + + _context.SaveChanges(); + } + + + var existingItem = order.OrderProducts + .FirstOrDefault(x => + x.ProductId == product.ProductId); + + + if (existingItem != null) + { + if (existingItem.Quantity + 1 > + product.Stock) + { + TempData["Error"] = + "There is not enough stock available."; + + transaction.Rollback(); + + return RedirectToAction( + "Details", + "Release", + new { id = product.ReleaseId }); + } + + existingItem.Quantity++; + } + else + { + var discount = _context.ModificationProducts + .Include(mp => mp.Modification) + .Where(mp => + mp.ProductId == product.ProductId && + mp.Modification.TypeOfModification == + ModificationType.DISCOUNT && + mp.Modification.Discount.HasValue && + mp.Modification.Discount.Value > 0) + .Select(mp => mp.Modification) + .OrderByDescending(m => m.DateModified) + .FirstOrDefault(); + + + var priceAtPurchase = product.Price; + + if (discount != null) + { + priceAtPurchase = + product.Price - + ( + product.Price * + discount.Discount!.Value / + 100m + ); + + priceAtPurchase = + Math.Round( + priceAtPurchase, + 2); + } + + + var orderProduct = new OrderProduct + { + OrderId = order.OrderId, + + ProductId = + product.ProductId, + + PriceAtPurchase = + priceAtPurchase, + + Quantity = 1 + }; + + _context.OrderProducts.Add(orderProduct); + } + _context.SaveChanges(); - } - - - // Check whether product is already in cart. - var existingItem = order.OrderProducts - .FirstOrDefault(x => - x.ProductId == product.ProductId); - - - if (existingItem != null) - { - if (existingItem.Quantity + 1 > - product.Stock) - { - TempData["Error"] = - "There is not enough stock available."; - - return RedirectToAction( - "Details", - "Release", - new { id = product.ReleaseId }); - } - - existingItem.Quantity++; - } - else - { - var discount = _context.ModificationProducts - .Include(mp => mp.Modification) - .Where(mp => - mp.ProductId == product.ProductId && - mp.Modification.TypeOfModification == - ModificationType.DISCOUNT && - mp.Modification.Discount.HasValue && - mp.Modification.Discount.Value > 0) - .Select(mp => mp.Modification) - .OrderByDescending(m => m.DateModified) - .FirstOrDefault(); - - var priceAtPurchase = product.Price; - - if (discount != null) - { - priceAtPurchase = - product.Price - - (product.Price * discount.Discount!.Value / 100m); - - priceAtPurchase = Math.Round( - priceAtPurchase, - 2); - } - - var orderProduct = new OrderProduct - { - OrderId = order.OrderId, - - ProductId = product.ProductId, - - PriceAtPurchase = product.Price, - - Quantity = 1 - }; - - _context.OrderProducts.Add(orderProduct); - } - - _context.SaveChanges(); - - - return RedirectToAction(nameof(Cart)); + + transaction.Commit(); + + + return RedirectToAction(nameof(Cart)); + } + catch + { + transaction.Rollback(); + throw; + } } @@ -202,6 +223,7 @@ Stock = op.Product.Stock, - - CoverPhoto = op.Product.Release.CoverPhoto + + CoverPhoto = + op.Product.Release.CoverPhoto }) .ToList(); @@ -241,4 +263,5 @@ { _context.OrderProducts.Remove(item); + _context.SaveChanges(); } @@ -311,5 +334,6 @@ private long? GetUserId() { - var userId = HttpContext.Session.GetInt32("UserId"); + var userId = + HttpContext.Session.GetInt32("UserId"); if (userId.HasValue) Index: KernelRecordsMVC.Web/Controllers/WishlistController.cs =================================================================== --- KernelRecordsMVC.Web/Controllers/WishlistController.cs (revision 595d2e58cf322a776ba1d3cedcb86e9bb2ee8093) +++ KernelRecordsMVC.Web/Controllers/WishlistController.cs (revision 1dcdb2cfb56ccfd57525e0cd573a289cead0870b) @@ -51,30 +51,35 @@ [HttpPost] - [ValidateAntiForgeryToken] - public IActionResult Add(long productId) - { - var sessionUserId = - HttpContext.Session.GetInt32("UserId"); - - if (!sessionUserId.HasValue) - { - return RedirectToAction( - "Login", - "Account"); - } - - var userId = - (long)sessionUserId.Value; - - - var product = - _context.Products - .FirstOrDefault(p => - p.ProductId == productId); - - if (product == null) - return NotFound(); - - +[ValidateAntiForgeryToken] +public IActionResult Add(long productId) +{ + var sessionUserId = + HttpContext.Session.GetInt32("UserId"); + + if (!sessionUserId.HasValue) + { + return RedirectToAction( + "Login", + "Account"); + } + + var userId = + (long)sessionUserId.Value; + + + var product = + _context.Products + .FirstOrDefault(p => + p.ProductId == productId); + + if (product == null) + return NotFound(); + + + using var transaction = + _context.Database.BeginTransaction(); + + try + { var wishlist = _context.Wishlists @@ -82,6 +87,5 @@ w.UserId == userId); - - // Create wishlist if user doesn't have one yet. + if (wishlist == null) { @@ -102,6 +106,5 @@ } - - // Prevent duplicate product. + var alreadyExists = _context.WishlistProducts @@ -133,4 +136,7 @@ + transaction.Commit(); + + TempData["Success"] = "Product added to your wishlist."; @@ -140,4 +146,11 @@ nameof(Index)); } + catch + { + transaction.Rollback(); + + throw; + } +} Index: KernelRecordsMVC.Web/Program.cs =================================================================== --- KernelRecordsMVC.Web/Program.cs (revision 595d2e58cf322a776ba1d3cedcb86e9bb2ee8093) +++ KernelRecordsMVC.Web/Program.cs (revision 1dcdb2cfb56ccfd57525e0cd573a289cead0870b) @@ -4,4 +4,6 @@ using KernelRecordsMVC.Domain.Enums; using KernelRecordsMVC.Infrastructure.Data; +using Microsoft.AspNetCore.Identity; +using KernelRecordsMVC.Models; var builder = WebApplication.CreateBuilder(args); @@ -24,4 +26,6 @@ builder.Services.AddControllersWithViews(); + +builder.Services.AddScoped, PasswordHasher>(); // ========================================== Index: KernelRecordsMVC.Web/obj/Debug/net8.0/KernelRecordsMVC.Web.AssemblyInfo.cs =================================================================== --- KernelRecordsMVC.Web/obj/Debug/net8.0/KernelRecordsMVC.Web.AssemblyInfo.cs (revision 595d2e58cf322a776ba1d3cedcb86e9bb2ee8093) +++ KernelRecordsMVC.Web/obj/Debug/net8.0/KernelRecordsMVC.Web.AssemblyInfo.cs (revision 1dcdb2cfb56ccfd57525e0cd573a289cead0870b) @@ -15,5 +15,5 @@ [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d89d25b3a7f785676877cf198c9cc706308ab4a3")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+595d2e58cf322a776ba1d3cedcb86e9bb2ee8093")] [assembly: System.Reflection.AssemblyProductAttribute("KernelRecordsMVC.Web")] [assembly: System.Reflection.AssemblyTitleAttribute("KernelRecordsMVC.Web")] Index: KernelRecordsMVC.Web/obj/Debug/net8.0/KernelRecordsMVC.Web.AssemblyInfoInputs.cache =================================================================== --- KernelRecordsMVC.Web/obj/Debug/net8.0/KernelRecordsMVC.Web.AssemblyInfoInputs.cache (revision 595d2e58cf322a776ba1d3cedcb86e9bb2ee8093) +++ KernelRecordsMVC.Web/obj/Debug/net8.0/KernelRecordsMVC.Web.AssemblyInfoInputs.cache (revision 1dcdb2cfb56ccfd57525e0cd573a289cead0870b) @@ -1,1 +1,1 @@ -5c4ef787946962959a0ba14b7ffc3cd723d328624707161e0bc37e6293c6f25c +c4091efdfb2ea8a6937ee7bd732f81d58fc7a86e988c5b54f31b2dcc4f2f33d7 Index: KernelRecordsMVC.Web/obj/Debug/net8.0/KernelRecordsMVC.Web.sourcelink.json =================================================================== --- KernelRecordsMVC.Web/obj/Debug/net8.0/KernelRecordsMVC.Web.sourcelink.json (revision 595d2e58cf322a776ba1d3cedcb86e9bb2ee8093) +++ KernelRecordsMVC.Web/obj/Debug/net8.0/KernelRecordsMVC.Web.sourcelink.json (revision 1dcdb2cfb56ccfd57525e0cd573a289cead0870b) @@ -1,1 +1,1 @@ -{"documents":{"C:\\Users\\Marko\\RiderProjects\\KernelRecordsMVC\\*":"https://raw.githubusercontent.com/mmilevski/kernelrecords/d89d25b3a7f785676877cf198c9cc706308ab4a3/*"}} +{"documents":{"C:\\Users\\Marko\\RiderProjects\\KernelRecordsMVC\\*":"https://raw.githubusercontent.com/mmilevski/kernelrecords/595d2e58cf322a776ba1d3cedcb86e9bb2ee8093/*"}}