Fix loading issues with disk based token cache

markcowl · markcowl · commit d0f5b7d53144 · 2017-06-17T23:23:28.000-07:00
diff --git a/src/Common/Commands.Common.Authentication/Authentication/ProtectedFileTokenCache.cs b/src/Common/Commands.Common.Authentication/Authentication/ProtectedFileTokenCache.cs
@@ -49,6 +49,8 @@ public byte[] CacheData
             set
             {
                 Deserialize(value);
+                HasStateChanged = true;
+                EnsureStateSaved();
             }
         }
 
diff --git a/src/Common/Commands.Common.Authentication/AzureSessionInitializer.cs b/src/Common/Commands.Common.Authentication/AzureSessionInitializer.cs
@@ -74,8 +74,7 @@ static IAzureSession CreateInstance(IDataStore dataStore = null)
                 FileUtilities.DataStore = session.DataStore;
                 FileUtilities.EnsureDirectoryExists(session.ProfileDirectory);
                 var cacheFile = Path.Combine(session.ProfileDirectory, session.TokenCacheFile);
-                var contents = new byte[0];
-                session.TokenCache = new ProtectedFileTokenCache(cacheFile, dataStore);
+                session.TokenCache = new ProtectedFileTokenCache(cacheFile, session.DataStore);
             }
             catch
             {

Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,7 @@ static IAzureSession CreateInstance(IDataStore dataStore = null)`
`74`	`74`	`FileUtilities.DataStore = session.DataStore;`
`75`	`75`	`FileUtilities.EnsureDirectoryExists(session.ProfileDirectory);`
`76`	`76`	`var cacheFile = Path.Combine(session.ProfileDirectory, session.TokenCacheFile);`
`77`		`- var contents = new byte[0];`
`78`		`- session.TokenCache = new ProtectedFileTokenCache(cacheFile, dataStore);`
	`77`	`+ session.TokenCache = new ProtectedFileTokenCache(cacheFile, session.DataStore);`
`79`	`78`	`}`
`80`	`79`	`catch`
`81`	`80`	`{`