Prechádzať zdrojové kódy

NULL-Logins nicht mehr möglich!

Arne Diekmann 8 rokov pred
rodič
commit
35bee33b25

+ 3 - 1
GreenTree.Nachtragsmanagement.Web/Controllers/HomeController.cs

@@ -46,7 +46,9 @@ namespace GreenTree.Nachtragsmanagement.Web.Controllers
             var cookieUser = _userHelper.FromCookies();
             var dbUser = _userService.GetUserById(cookieUser.Id);
 
-            if (dbUser.CurrentRole == null || dbUser.CurrentRole.Id != cookieUser.CurrentRole.Id)
+            if (dbUser == null) return new RedirectResult("~/login");
+
+            if (dbUser.CurrentRole == null || (dbUser.CurrentRole != null && dbUser.CurrentRole.Id != cookieUser.CurrentRole.Id))
                 dbUser.CurrentRole = cookieUser.CurrentRole;
 
             var userFunctions = dbUser.CurrentRole.Functions

+ 1 - 1
GreenTree.Nachtragsmanagement.Web/Controllers/LoginController.cs

@@ -32,7 +32,7 @@ namespace GreenTree.Nachtragsmanagement.Web.Controllers
         {
             var user = _userHelper.FromCookies();
 
-            if (user != null)
+            if (user != null && user.Id != 0)
                 return RedirectToAction("Index", "Home");
 
             return View("~/Views/Login/Index.cshtml");