Merge pull request #53 from Azure-Samples/jmprieur/updateToMsal2

Update for MSAL 2.
Azure-Samples · Aug 29, 2018 · 03e2f42 · 03e2f42
2 parents 85effe8 + 77a37d6
commit 03e2f42
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/WebApp-OpenIDConnect-DotNet/Controllers/HomeController.cs b/WebApp-OpenIDConnect-DotNet/Controllers/HomeController.cs
@@ -45,9 +45,12 @@ public async Task<IActionResult> Api()
                 var scope = AzureAdB2COptions.ApiScopes.Split(' ');
                 string signedInUserID = HttpContext.User.FindFirst(ClaimTypes.NameIdentifier).Value;
                 TokenCache userTokenCache = new MSALSessionCache(signedInUserID, this.HttpContext).GetMsalCacheInstance();
+
                 ConfidentialClientApplication cca = new ConfidentialClientApplication(AzureAdB2COptions.ClientId, AzureAdB2COptions.Authority, AzureAdB2COptions.RedirectUri, new ClientCredential(AzureAdB2COptions.ClientSecret), userTokenCache, null);
 
-                AuthenticationResult result = await cca.AcquireTokenSilentAsync(scope, cca.Users.FirstOrDefault(), AzureAdB2COptions.Authority, false);
+
+                var accounts = await cca.GetAccountsAsync();
+                AuthenticationResult result = await cca.AcquireTokenSilentAsync(scope, accounts.FirstOrDefault(), AzureAdB2COptions.Authority, false);
 
                 HttpClient client = new HttpClient();
                 HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, AzureAdB2COptions.ApiUrl);

diff --git a/WebApp-OpenIDConnect-DotNet/Models/MSALSessionCache.cs b/WebApp-OpenIDConnect-DotNet/Models/MSALSessionCache.cs
@@ -48,7 +48,11 @@ public string ReadUserStateValue()
         public void Load()
         {
             SessionLock.EnterReadLock();
-            cache.Deserialize(httpContext.Session.Get(CacheId));
+            byte[] blob = httpContext.Session.Get(CacheId);
+            if (blob !=null)
+            {
+                cache.Deserialize(blob);
+            }
             SessionLock.ExitReadLock();
         }
 

diff --git a/WebApp-OpenIDConnect-DotNet/WebApp-OpenIDConnect-DotNet.csproj b/WebApp-OpenIDConnect-DotNet/WebApp-OpenIDConnect-DotNet.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <RootNamespace>WebApp_OpenIDConnect_DotNet</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Client" Version="1.1.0-preview" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="2.0.0-preview" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.0.0" />