Fixed login & auth

SeniorAssistant/Controllers/AccountController.cs

@@ -4,44 +4,14 @@ using SeniorAssistant.Models;
 using SeniorAssistant.Controllers;
 using LinqToDB;
 using System.Linq;
+using System.Collections.Generic;
 
 namespace IdentityDemo.Controllers
 {
-
     [ApiExplorerSettings(IgnoreApi = true)]
     [Route("[controller]/[action]")]
     public class AccountController : BaseController
     {
-        /*
-        private readonly UserManager<User> _userManager;
-        private readonly SignInManager<User> _signInManager;
-        private readonly ILogger _logger;
-
-        public AccountController(
-            UserManager<User> userManager,
-            SignInManager<User> signInManager,
-            ILogger<AccountController> logger)
-        {
-            _userManager = userManager;
-            _signInManager = signInManager;
-            _logger = logger;
-        }
-        /*
-        [TempData]
-        public string ErrorMessage { get; set; }
-
-        [HttpGet]
-        [AllowAnonymous]
-        public async Task<IActionResult> Login(string returnUrl = null)
-        {
-            // Clear the existing external cookie to ensure a clean login process
-            await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
-
-            ViewData["ReturnUrl"] = returnUrl;
-            return View();
-        }
-        */
-
         [HttpPost]
         public ActionResult _login(string username, string password)
         {
@@ -51,20 +21,22 @@ namespace IdentityDemo.Controllers
                 Message = "Username or password is invalid."
             };
 
-            var strunz = Db.GetTable<User>().Where(user => user.Username.Equals(username) && user.Password.Equals(password)).ToListAsync().Result;
+            var result = Db.GetTable<User>().Where(user => user.Username.Equals(username) && user.Password.Equals(password)).ToListAsync().Result;
 
-            if (strunz.Count == 1)
+            if (result.Count == 1)
             {
-                var loggedUser = HttpContext.Session.GetString("username");
+                var loggedUser = HttpContext.Session.GetString(Username);
                 if (loggedUser==null || !loggedUser.Equals(username))
                 {
-                    HttpContext.Session.SetString("username", username);
-                    HttpContext.Session.SetString("email", strunz.First().Email);
-                    HttpContext.Session.SetString("name", strunz.First().Name);
-                    HttpContext.Session.SetString("isdoc", strunz.First().Doctor?"true":"false");
-                    //HttpContext.Session.SetString("lastname", strunz.First().LastName);
+                    User user = result.First();
+                    HttpContext.Session.SetString(Username, username);
+                    HttpContext.Session.SetString("email", user.Email);
+                    HttpContext.Session.SetString("name", user.Name);
+                    HttpContext.Session.SetString("role", user.Role);
+                    //HttpContext.Session.SetString("lastname", user.LastName);
+
                     response.Success = true;
-                    response.Message = "";
+                    response.Message = Request.Query["ReturnUrl"];
                 }
                 else
                 {
@@ -82,24 +54,32 @@ namespace IdentityDemo.Controllers
         }
 
         [HttpPost]
-        public ActionResult _register(Register register)
+        public ActionResult _register(User user)
         {
+            JsonResponse response = new JsonResponse() { Success = true };
+
             if(ModelState.IsValid)
             {
-                User user = new User() { Username = register.Username, Email = register.Email, Password = register.Password};
                 try
                 {
                     Db.Insert(user);
+                    _login(user.Username, user.Password);
                 }
                 catch
                 {
-                    return Json(new JsonResponse() { Success = false, Message = "Username already exist" });
+                    response.Success = false;
+                    response.Message = "Username already exists";
                 }
-                _login(user.Username, user.Password);
-                return Json(new JsonResponse() { Success = true });
             }
-            return Json(new JsonResponse() { Success = false, Message = "Modello non valido" });
+            else
+            {
+                response.Success = false;
+                response.Message = "Modello non valido";
+            }
+
+            return Json(response);
         }
+
         internal class JsonResponse
         {
             public bool Success { get; internal set; }

SeniorAssistant/Controllers/HomeController.cs

@@ -1,17 +1,12 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace SeniorAssistant.Controllers
 {
     [ApiExplorerSettings(IgnoreApi = true)]
-    public class HomeController : Controller
+    public class HomeController : BaseController
     {
-        private readonly ISession session;
-        public HomeController(IHttpContextAccessor httpContextAccessor)
-        {
-            this.session = httpContextAccessor.HttpContext.Session;
-        }
-
         [Route("")]
         [Route("Home")]
         [Route("Index")]
@@ -23,33 +18,41 @@ namespace SeniorAssistant.Controllers
         [Route("Heartbeat")]
         public IActionResult Heartbeat()
         {
-            return View();
+            return CheckAuthorized("Heartbeat");
         }
 
         [Route("Sleep")]
         public IActionResult Sleep()
         {
-            return View();
+            return CheckAuthorized("Sleep");
         }
 
         [Route("Step")]
         public IActionResult Step()
         {
-            return View();
+            return CheckAuthorized("Step");
         }
 
         [Route("Users")]
         public IActionResult Users()
         {
-            return View();
+            return CheckAuthorized("Users");
         }
 
         [Route("User/{User}")]
         public IActionResult SingleUser(string user)
         {
-            if(session.GetString("username") == null)
-                return RedirectToAction("Index");
-            return View("data", user);
+            return CheckAuthorized("Data", user);
+        }
+
+        private IActionResult CheckAuthorized(string view, object model = null)
+        {
+            if (HttpContext.Session.GetString("username") == null)
+            {
+                model = "/" + view;
+                view = "Index";
+            }
+            return View(view, model);
         }
     }
 }

SeniorAssistant/Controllers/Services/BaseController.cs

@@ -1,10 +1,13 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SeniorAssistant.Data;
 
 namespace SeniorAssistant.Controllers
 {
     public abstract class BaseController : Controller
     {
+        protected static readonly string Username = "username";
+
         IDataContextFactory<SeniorDataContext> dbFactory;
         SeniorDataContext db;
 
@@ -20,5 +23,10 @@ namespace SeniorAssistant.Controllers
 
             base.Dispose(disposing);
         }
+
+        protected bool IsLogged()
+        {
+            return HttpContext.Session.GetString(Username) != null;
+        }
     }
 }