nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revise ClientToken use for multi-instanced MatterControl

Browse source 
- Add public const EnvironmentName for Services environment
- Remove GetSessionUsername method
- Remove ClearCachedCredentials
- Pull in AuthData type
- Add system to store and use ClientTokens
- Add using statements for common namespaces
This commit is contained in:
John Lewin 2016-09-28 11:20:54 -07:00
parent ecaf146d77
commit 87316dadff
7 changed files with 303 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

8
SlicerConfiguration/Settings/ProfileManager.cs
View file

@ -89,13 +89,13 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
get
{
string username = UserSettings.Instance.get("ActiveUserName");
string username = ApplicationController.Instance.GetSessionUsernameForFileSystem();
if (string.IsNullOrEmpty(username))
{
username = GuestDBPath;
// If ActiveUserName is empty or invalid and the credentials file exists, delete local credentials, resetting to unauthenticated guest mode
ApplicationController.ClearCachedCredentials();
AuthenticationData.Instance.ClearActiveSession();
}
else
{
@ -217,7 +217,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
get
{
string activeUserName = UserSettings.Instance.get("ActiveUserName");
string activeUserName = ApplicationController.Instance.GetSessionUsernameForFileSystem();
return UserSettings.Instance.get($"ActiveProfileID-{activeUserName}");
}
}
@ -231,7 +231,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public void SetLastProfile(string printerID)
{
string activeUserName = UserSettings.Instance.get("ActiveUserName");
string activeUserName = ApplicationController.Instance.GetSessionUsernameForFileSystem();
UserSettings.Instance.set($"ActiveProfileID-{activeUserName}", printerID);
}