diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-12-26 14:04:34 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-12-26 14:04:34 +0200 |
| commit | 3e71ab50870db524f7e17aa9d2042da52b15ad63 (patch) | |
| tree | e1bee015a2ce129316bbc30a0ff6466f239b33fd /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication | |
| parent | a756bdd61609c9bd093e81d1e2a9edf6bd912882 (diff) | |
| download | Tango-3e71ab50870db524f7e17aa9d2042da52b15ad63.tar.gz Tango-3e71ab50870db524f7e17aa9d2042da52b15ad63.zip | |
Implemented integration IJobRunsLogger.
Implemented DEBUG/RELEASE JsonController.
Implemented Local/Remote machine studio setting.
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(); |