Merge pull request #75 from Azure-Samples/jennyf/4.3

update to 4.3

Author: jennyf19

WebApp-OpenIDConnect-DotNet/Models/MSALSessionCache.cs

@@ -11,25 +11,22 @@ public class MSALSessionCache
         private static ReaderWriterLockSlim SessionLock = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);
         string UserId = string.Empty;
         string CacheId = string.Empty;
-        HttpContext httpContext = null;
-
-        ITokenCache cache;
+        private readonly HttpContext httpContext = null;
+        private ITokenCache cache;
 
         public MSALSessionCache(string userId, HttpContext httpcontext)
         {
             // not object, we want the SUB
             UserId = userId;
             CacheId = UserId + "_TokenCache";
             httpContext = httpcontext;
-            Load();
         }
 
         public ITokenCache EnablePersistence(ITokenCache cache)
         {
             this.cache = cache;
             cache.SetBeforeAccess(BeforeAccessNotification);
             cache.SetAfterAccess(AfterAccessNotification);
-            Load();
             return cache;
         }
 
@@ -47,31 +44,31 @@ public string ReadUserStateValue()
             SessionLock.ExitReadLock();
             return state;
         }
-        public void Load()
+        public void Load(TokenCacheNotificationArgs args)
         {
             SessionLock.EnterReadLock();
             byte[] blob = httpContext.Session.Get(CacheId);
             if(blob != null)
             {
-                cache.DeserializeMsalV3(blob);
+                args.TokenCache.DeserializeMsalV3(blob);
             }
             SessionLock.ExitReadLock();
         }
 
-        public void Persist()
+        public void Persist(TokenCacheNotificationArgs args)
         {
             SessionLock.EnterWriteLock();
 
             // Reflect changes in the persistent store
-            httpContext.Session.Set(CacheId, cache.SerializeMsalV3());
+            httpContext.Session.Set(CacheId, args.TokenCache.SerializeMsalV3());
             SessionLock.ExitWriteLock();
         }
 
         // Triggered right before MSAL needs to access the cache.
         // Reload the cache from the persistent store in case it changed since the last access.
         void BeforeAccessNotification(TokenCacheNotificationArgs args)
         {
-            Load();
+            Load(args);
         }
 
         // Triggered right after MSAL accessed the cache.
@@ -80,7 +77,7 @@ void AfterAccessNotification(TokenCacheNotificationArgs args)
             // if the access operation resulted in a cache update
             if (args.HasStateChanged)
             {
-                Persist();
+                Persist(args);
             }
         }
     }

WebApp-OpenIDConnect-DotNet/Models/StaticCache.cs

@@ -14,9 +14,8 @@ public class MSALStaticCache
         private static ReaderWriterLockSlim SessionLock = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);
         string UserId = string.Empty;
         string CacheId = string.Empty;
-        HttpContext httpContext = null;
-
-        ITokenCache cache;
+        private readonly HttpContext httpContext = null;
+        private ITokenCache cache;
 
         public MSALStaticCache(string userId, HttpContext httpcontext)
         {
@@ -31,35 +30,34 @@ public ITokenCache EnablePersistence(ITokenCache cache)
             this.cache = cache;
             cache.SetBeforeAccess(BeforeAccessNotification);
             cache.SetAfterAccess(AfterAccessNotification);
-            Load();
             return cache;
         }
 
-        public void Load()
+        public void Load(TokenCacheNotificationArgs args)
         {
             SessionLock.EnterReadLock();
             byte[] blob = staticCache.ContainsKey(CacheId) ? staticCache[CacheId] : null ;
             if(blob != null)
             {
-                cache.DeserializeMsalV3(blob);
+                args.TokenCache.DeserializeMsalV3(blob);
             }
             SessionLock.ExitReadLock();
         }
 
-        public void Persist()
+        public void Persist(TokenCacheNotificationArgs args)
         {
             SessionLock.EnterWriteLock();
 
             // Reflect changes in the persistent store
-            staticCache[CacheId] = cache.SerializeMsalV3();
+            staticCache[CacheId] = args.TokenCache.SerializeMsalV3();
             SessionLock.ExitWriteLock();
         }
 
         // Triggered right before MSAL needs to access the cache.
         // Reload the cache from the persistent store in case it changed since the last access.
         void BeforeAccessNotification(TokenCacheNotificationArgs args)
         {
-            Load();
+            Load(args);
         }
 
         // Triggered right after MSAL accessed the cache.
@@ -68,7 +66,7 @@ void AfterAccessNotification(TokenCacheNotificationArgs args)
             // if the access operation resulted in a cache update
             if (args.HasStateChanged)
             {
-                Persist();
+                Persist(args);
             }
         }
     }

WebApp-OpenIDConnect-DotNet/WebApp-OpenIDConnect-DotNet.csproj

@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <RootNamespace>WebApp_OpenIDConnect_DotNet</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Client" Version="3.0.3-preview" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.3.0" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.2.0" />