Merged PR 441: Fixed issue where test environment was overridden by p…

…roduction Fixed issue where test environment was overridden by production
I-Synergy · Nov 14, 2018 · 30b8be3 · 30b8be3
2 parents 3e62844 + 844d8cf
commit 30b8be3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/I-Synergy.Framework.Core/Context/IContext.cs b/src/I-Synergy.Framework.Core/Context/IContext.cs
@@ -14,8 +14,8 @@ public interface IContext
         string AccountUrl { get; }
         string WebUrl { get; }
         string MonitorUrl { get; }
-        string Client_Id { get; set; }
-        string Client_Secret { get; set; }
+        string Client_Id { get; }
+        string Client_Secret { get; }
         SoftwareEnvironments Environment { get; set; }
         bool Application_NormalScreen { get; set; }
         string TokenUrl { get; }

diff --git a/src/I-Synergy.Framework.Windows/Services/Base/LoginServiceBase.cs b/src/I-Synergy.Framework.Windows/Services/Base/LoginServiceBase.cs
@@ -57,7 +57,7 @@ public async Task LoginAsync(string username, string password)
                 Context.Environment = Enumerations.SoftwareEnvironments.Test;
             }
             // remove this prefix and set environment to local.
-            if (username.StartsWith(Constants.UsernamePrefixLocal, StringComparison.InvariantCultureIgnoreCase))
+            else if (username.StartsWith(Constants.UsernamePrefixLocal, StringComparison.InvariantCultureIgnoreCase))
             {
                 username = username.Replace(Constants.UsernamePrefixLocal, "", StringComparison.InvariantCultureIgnoreCase);
                 Context.Environment = Enumerations.SoftwareEnvironments.Local;