Revert "Hope it is fine"

1 files changed, 23 insertions, 3 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
index 3cc5e8b49..26938b203 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
@@ -90,13 +90,16 @@ namespace Tango.MachineStudio.UI.Authentication
         /// <param name="password">The password.</param>
         /// <returns></returns>
         /// <exception cref="AuthenticationException">Login failed for user " + email</exception>
-        public AuthenticationLoginResult Login(string email, string password, bool bypassVersionCheck = false)
+        public AuthenticationLoginResult Login(string email, string password, LoginMethod method, bool bypassVersionCheck = false, Action<String> logAction = null)
         {
             _refreshTokenTimer.Stop();
 
             var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
 
-            _client.Environment = settings.DeploymentSlot;
+            if (!App.StartupArgs.Contains("-webDebug"))
+            {
+                _client.Environment = settings.DeploymentSlot;
+            }
 
             var appVersion = AssemblyHelper.GetCurrentAssemblyVersion().ToString();
 
@@ -109,12 +112,15 @@ namespace Tango.MachineStudio.UI.Authentication
 
             try
             {
+                logAction?.Invoke("Logging in to machine service...");
+
                 response = _client.Login(new LoginRequest()
                 {
 
                     Email = email,
                     Password = password,
                     Version = appVersion,
+                    Method = method,
 
                 }).Result;
             }
@@ -141,9 +147,20 @@ namespace Tango.MachineStudio.UI.Authentication
                 };
             }
 
+            if (response.PasswordChangeRequired)
+            {
+                return new AuthenticationLoginResult()
+                {
+                    Response = response
+                };
+            }
+
             try
             {
-                ObservablesStaticCollections.Instance.Initialize();
+                ObservablesStaticCollections.Instance.Initialize((x) => 
+                {
+                    logAction.Invoke(x);
+                });
             }
             catch (Exception ex)
             {
@@ -152,6 +169,7 @@ namespace Tango.MachineStudio.UI.Authentication
 
             using (ObservablesContext db = ObservablesContext.CreateDefault())
             {
+                logAction.Invoke("Loading user permissions...");
                 User user = new UserBuilder(db).Set(x => x.Email.ToLower() == email.ToLower()).WithRolesAndPermissions().WithOrganization().Build();
 
                 if (user == null)
@@ -163,6 +181,8 @@ namespace Tango.MachineStudio.UI.Authentication
 
                 _refreshTokenTimer.Start();
 
+                logAction.Invoke("Starting application...");
+
                 return new AuthenticationLoginResult()
                 {
                     User = user,