Working on BL Builders !

Working on making PPC work with builders..

1 files changed, 26 insertions, 15 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Authentication/DefaultAuthenticationProvider.cs
index 3dae9d05a..23761eb9b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Authentication/DefaultAuthenticationProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Authentication/DefaultAuthenticationProvider.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.BL;
+using Tango.BL.Builders;
 using Tango.BL.Entities;
 using Tango.Core;
 using Tango.Core.DI;
@@ -50,24 +51,34 @@ namespace Tango.PPC.UI.Authentication
         /// <param name="email">The email.</param>
         /// <param name="password">The password.</param>
         /// <returns></returns>
-        public User Login(string email, string password)
+        public Task<User> Login(string email, string password)
         {
-            String hash = User.GetPasswordHash(password);
-
-            LogManager.Log($"Logging in user {email}...");
-            CurrentUser = ObservablesStaticCollections.Instance.Users.SingleOrDefault(x => x.Email.ToLower() == email && x.Password == hash);
-            
-            if (CurrentUser != null)
-            {
-                LogManager.Log($"Current user is now: {CurrentUser.Contact.FullName}.");
-            }
-            else
+            return Task.Factory.StartNew<User>(() => 
             {
-                LogManager.Log("Login failed!");
-            }
+                String hash = User.GetPasswordHash(password);
 
-            CurrentUserChanged?.Invoke(this, CurrentUser);
-            return CurrentUser;
+                LogManager.Log($"Logging in user {email}...");
+
+                using (var db = ObservablesContext.CreateDefault())
+                {
+                    CurrentUser = new UserBuilder(db).Set(x => x.Email.ToLower() == email && x.Password == hash)
+                    .WithOrganization()
+                    .WithRolesAndPermissions()
+                    .Build();
+                }
+
+                if (CurrentUser != null)
+                {
+                    LogManager.Log($"Current user is now: {CurrentUser.Contact.FullName}.");
+                }
+                else
+                {
+                    LogManager.Log("Login failed!");
+                }
+
+                CurrentUserChanged?.Invoke(this, CurrentUser);
+                return CurrentUser;
+            });
         }
 
         /// <summary>