diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-12-27 12:16:09 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-12-27 12:16:09 +0200 |
| commit | dd1117090f6ea7fea56ae56569a69c8e67cac7b9 (patch) | |
| tree | 41183f856ddbc0204caa71c82a937e3f14cba553 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication | |
| parent | 2769e72857ebc543d8f40a3cbca218f2f010a77d (diff) | |
| parent | 894d05d59c0e1612903f1adbf908914f2df67ccc (diff) | |
| download | Tango-dd1117090f6ea7fea56ae56569a69c8e67cac7b9.tar.gz Tango-dd1117090f6ea7fea56ae56569a69c8e67cac7b9.zip | |
merge
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs | 6 |
1 files changed, 5 insertions, 1 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 4acc76c25..19192020e 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs @@ -54,6 +54,7 @@ namespace Tango.MachineStudio.UI.Authentication { var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>(); + IWebTransportClient service = new WebTransportClient(); var response = service.PostJson<LoginRequest, LoginResponse>(settings.MachineServiceAddress + "/api/MachineStudio/Login", new LoginRequest() { @@ -65,7 +66,10 @@ namespace Tango.MachineStudio.UI.Authentication AccessToken = response.Token; - ObservablesContext.OverrideSettingsDataSource(response.DataSource); + if (settings.Environment == MachineStudioSettings.WorkingEnvironment.Remote) + { + ObservablesContext.OverrideSettingsDataSource(response.DataSource); + } ObservablesStaticCollections.Instance.Initialize(); |