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

Merge pull request #1354 from jlewin/master

Browse source 
Clear cached credentials after acquiring new ClientToken
This commit is contained in:
johnlewin 2016-09-06 15:50:59 -07:00 • committed by GitHub
commit eff65ce2c1
4 changed files with 656 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
SlicerConfiguration/Settings/ProfileManager.cs
View file

@ -57,12 +57,14 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
private static object writeLock = new object();
private static EventHandler unregisterEvents;
private static readonly string userDataPath = ApplicationDataStorage.ApplicationUserDataPath;
/// <summary>
/// The user specific path to the Profiles directory
/// </summary>
private static string ProfilesPath
{
get
{
string path = Path.Combine(userDataPath, "Profiles");
// Determine username
string username = ApplicationController.Instance.GetSessionUsernameForFileSystem();
if (string.IsNullOrEmpty(username))
@ -71,7 +73,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
// Append userName to ProfilesPath
path = Path.Combine(path, username);
string path = Path.Combine(userDataPath, "Profiles", username);
// Ensure directory exists
Directory.CreateDirectory(path);
@ -95,11 +97,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
username = GuestDBPath;
// If ActiveUserName is empty or invalid and the credentials file exists, delete local credentials, resetting to unauthenticated guest mode
string sessionFilePath = Path.Combine(ApplicationDataStorage.ApplicationUserDataPath, "cache", "session.bin");
if(File.Exists(sessionFilePath))
{
File.Delete(sessionFilePath);
}
ApplicationController.ClearCachedCredentials();
}
else
{