Przeglądaj źródła

Fehler behoben, der einen NULL-User zurückgegeben hat, wenn der GridViewSettingsHelper vor dem UserContext aufgerufen wird!

Arne Diekmann 8 lat temu
rodzic
commit
1764365137

+ 22 - 2
GreenTree.Nachtragsmanagement.Core/Authentication/UserContext.cs

@@ -1,4 +1,5 @@
-using GreenTree.Nachtragsmanagement.Core.Domain.User;
+using Autofac;
+using GreenTree.Nachtragsmanagement.Core.Domain.User;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,6 +10,25 @@ namespace GreenTree.Nachtragsmanagement.Core.Authentication
 {
     public class UserContext
     {
-        public User CurrentUser { get; set; }
+        private User _currentUser;
+        public User CurrentUser
+        {
+            get
+            {
+                if (_currentUser == null)
+                {
+                    var container = Singleton<Autofac.IContainer>.Instance;
+                    var userHelper = container.Resolve<IUserHelper>();
+
+                    _currentUser = userHelper.FromCookies();
+                }
+
+                return _currentUser;
+            }
+            set
+            {
+                _currentUser = value;
+            }
+        }
     }
 }