Changeset fa0fbaf for KernelRecordsMVC.Web/Controllers/AccountController.cs

Timestamp:

09/01/26 06:11:34 (4 weeks ago)

Author:

mmilevski <markomilevski3@…>

Branches:

main

Children:

d2eccb3

Parents:

08aefc6

Message:

Added major improvements.

File:

• KernelRecordsMVC.Web/Controllers/AccountController.cs (modified) (10 diffs)

KernelRecordsMVC.Web/Controllers/AccountController.cs

@@ -1 @@
-using Microsoft.AspNetCore.Mvc;
-using KernelRecordsMVC.Data;
+using System.Security.Claims;
+using KernelRecordsMVC.Application.ViewModels;
+using KernelRecordsMVC.Infrastructure.Data;
 using KernelRecordsMVC.Models;
-using KernelRecordsMVC.Application.ViewModels;
-using Microsoft.AspNetCore.Http;
-
-namespace KernelRecordsMVC.Controllers;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+
+namespace KernelRecordsMVC.Web.Controllers;
 
 public class AccountController : Controller
@@ -16 +18 @@
     }
 
-    // ==============================
+
+    // =========================================================
     // REGISTER - GET
-    // ==============================
+    // =========================================================
 
     [HttpGet]
@@ -27 +30 @@
 
 
-    // ==============================
+    // =========================================================
     // REGISTER - POST
-    // ==============================
+    // =========================================================
 
     [HttpPost]
@@ -61 +64 @@
             Username = model.Username,
 
-            // We'll replace this with proper password hashing
-            // in the security cleanup section.
+            // TODO:
+            // Replace with password hashing later.
             Password = model.Password,
 
@@ -74 +77 @@
         _context.SaveChanges();
 
+
         // Every normal registered user is a Consumer.
         var consumer = new Consumer
@@ -89 +93 @@
 
 
-    // ==============================
+    // =========================================================
     // LOGIN - GET
-    // ==============================
+    // =========================================================
 
     [HttpGet]
@@ -100 +104 @@
 
 
-    // ==============================
+    // =========================================================
     // LOGIN - POST
-    // ==============================
+    // =========================================================
 
     [HttpPost]
     [ValidateAntiForgeryToken]
-    public IActionResult Login(LoginViewModel model)
+    public async Task<IActionResult> Login(
+        LoginViewModel model)
     {
         if (!ModelState.IsValid)
@@ -125 +130 @@
         }
 
+
+        // =====================================================
+        // DETERMINE ACCOUNT TYPE
+        // =====================================================
+
+        var admin = _context.Admins
+            .FirstOrDefault(x => x.UserId == user.UserId);
+
+        string role;
+
+        if (admin != null)
+        {
+            role = "Admin";
+        }
+        else
+        {
+            role = "Consumer";
+        }
+
+
+        // =====================================================
+        // CREATE CLAIMS
+        // =====================================================
+
+        var claims = new List<Claim>
+        {
+            new Claim(
+                ClaimTypes.NameIdentifier,
+                user.UserId.ToString()),
+
+            new Claim(
+                ClaimTypes.Name,
+                user.Username),
+
+            new Claim(
+                ClaimTypes.Email,
+                user.Email),
+
+            new Claim(
+                ClaimTypes.Role,
+                role)
+        };
+
+
+        if (admin != null)
+        {
+            claims.Add(
+                new Claim(
+                    "AdminType",
+                    admin.Type.ToString()));
+        }
+
+
+        var identity = new ClaimsIdentity(
+            claims,
+            "Cookies");
+
+        var principal =
+            new ClaimsPrincipal(identity);
+
+
+        // =====================================================
+        // SIGN IN
+        // =====================================================
+
+        await HttpContext.SignInAsync(
+            "Cookies",
+            principal);
+
+
+        // =====================================================
+        // KEEP SESSION FOR EXISTING CODE
+        // =====================================================
+
         HttpContext.Session.SetInt32(
             "UserId",
@@ -133 +212 @@
             user.Username);
 
-        // Determine account type from the actual
-        // ADMINS / CONSUMERS tables.
-        var admin = _context.Admins
-            .FirstOrDefault(x => x.UserId == user.UserId);
+        HttpContext.Session.SetString(
+            "Role",
+            role);
 
         if (admin != null)
         {
-            HttpContext.Session.SetString(
-                "Role",
-                "Admin");
-
             HttpContext.Session.SetString(
                 "AdminType",
                 admin.Type.ToString());
         }
-        else
-        {
-            HttpContext.Session.SetString(
-                "Role",
-                "Consumer");
-        }
+
 
         return RedirectToAction(
@@ -161 +230 @@
 
 
-    // ==============================
+    // =========================================================
+    // PROFILE - GET
+    // =========================================================
+
+    [HttpGet]
+    public IActionResult Profile()
+    {
+        // Get logged-in user's ID from authentication claims.
+        var userIdClaim = User.FindFirst(
+            ClaimTypes.NameIdentifier);
+
+        if (userIdClaim == null)
+            return RedirectToAction(nameof(Login));
+
+        if (!long.TryParse(
+                userIdClaim.Value,
+                out var userId))
+        {
+            return RedirectToAction(nameof(Login));
+        }
+
+
+        // Load user + consumer information.
+        var user = _context.Users
+            .Include(x => x.Consumer)
+            .FirstOrDefault(x =>
+                x.UserId == userId);
+
+        if (user == null)
+            return NotFound();
+
+
+        var model = new ProfileViewModel
+        {
+            UserId = user.UserId,
+
+            Username = user.Username,
+
+            Email = user.Email,
+
+            TelephoneNumber =
+                user.TelephoneNumber,
+
+            ShippingAddress =
+                user.ShippingAddress,
+
+            DateCreated =
+                user.DateCreated,
+
+            PointsCollected =
+                user.Consumer?.PointsCollected ?? 0
+        };
+
+
+        return View(model);
+    }
+
+
+    // =========================================================
+    // PROFILE - POST
+    // =========================================================
+
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> Profile(
+        ProfileViewModel model)
+    {
+        // Get the currently authenticated user.
+        var userIdClaim = User.FindFirst(
+            ClaimTypes.NameIdentifier);
+
+        if (userIdClaim == null)
+            return RedirectToAction(nameof(Login));
+
+        if (!long.TryParse(
+                userIdClaim.Value,
+                out var userId))
+        {
+            return RedirectToAction(nameof(Login));
+        }
+
+
+        if (!ModelState.IsValid)
+            return View(model);
+
+
+        var user = _context.Users
+            .FirstOrDefault(x =>
+                x.UserId == userId);
+
+        if (user == null)
+            return NotFound();
+
+
+        // =====================================================
+        // CHECK EMAIL
+        // =====================================================
+
+        var emailExists = _context.Users.Any(x =>
+            x.Email == model.Email &&
+            x.UserId != userId);
+
+        if (emailExists)
+        {
+            ModelState.AddModelError(
+                nameof(model.Email),
+                "This email is already registered.");
+
+            return View(model);
+        }
+
+
+        // =====================================================
+        // UPDATE USER
+        // =====================================================
+
+        user.Email = model.Email;
+
+        user.TelephoneNumber =
+            model.TelephoneNumber;
+
+        user.ShippingAddress =
+            model.ShippingAddress;
+
+
+        _context.SaveChanges();
+
+
+        TempData["Success"] =
+            "Your profile has been updated successfully.";
+
+
+        // =====================================================
+        // REFRESH EMAIL CLAIM
+        // =====================================================
+
+        var claims = new List<Claim>
+        {
+            new Claim(
+                ClaimTypes.NameIdentifier,
+                user.UserId.ToString()),
+
+            new Claim(
+                ClaimTypes.Name,
+                user.Username),
+
+            new Claim(
+                ClaimTypes.Email,
+                user.Email),
+
+            new Claim(
+                ClaimTypes.Role,
+                User.IsInRole("Admin")
+                    ? "Admin"
+                    : "Consumer")
+        };
+
+
+        var identity = new ClaimsIdentity(
+            claims,
+            "Cookies");
+
+        var principal =
+            new ClaimsPrincipal(identity);
+
+
+        await HttpContext.SignInAsync(
+            "Cookies",
+            principal);
+
+
+        // Keep session synchronized.
+        HttpContext.Session.SetString(
+            "Username",
+            user.Username);
+
+
+        return RedirectToAction(nameof(Profile));
+    }
+
+
+    // =========================================================
     // LOGOUT
-    // ==============================
-
-    public IActionResult Logout()
-    {
+    // =========================================================
+
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> Logout()
+    {
+        await HttpContext.SignOutAsync("Cookies");
+
         HttpContext.Session.Clear();