Merge pull request #239 from Azure-Samples/jmprieur/fixPca

Fix the PCAs

Author: jennyf19

1. Desktop app calls Web API/TodoListClient/MainWindow.xaml.cs

@@ -2,6 +2,8 @@
 // Licensed under the MIT License.
 
 using Microsoft.Identity.Client;
+using Microsoft.Identity.Client.Desktop;
+using Microsoft.Identity.Client.Extensions.Msal;
 using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Configuration;
@@ -62,12 +64,22 @@ private static string TodoListApiAddress
         public MainWindow()
         {
             InitializeComponent();
+
+            // Create the app
             _app = PublicClientApplicationBuilder.Create(ClientId)
                 .WithAuthority(Authority)
                 .WithRedirectUri("http://localhost") // needed only for the system browser
                 .Build();
 
-            TokenCacheHelper.EnableSerialization(_app.UserTokenCache);
+            // Add token cache serialization
+            var storageProperties =
+                new StorageCreationPropertiesBuilder(
+                    "ClientConsoleApp",
+                    Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location))
+                .Build();
+            var cacheHelper = MsalCacheHelper.CreateAsync(storageProperties).GetAwaiter().GetResult();
+            cacheHelper.RegisterCache(_app.UserTokenCache);
+
             GetTodoList();
         }
 

1. Desktop app calls Web API/TodoListClient/TodoListClient.csproj

@@ -2,13 +2,19 @@
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net5-windows10.0.17763.0</TargetFramework>
+		<TargetFramework>net472</TargetFramework>
 		<UseWPF>true</UseWPF>
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Microsoft.Identity.Client" Version="4.53.0" />
-	  <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="Microsoft.Identity.Client" Version="4.53.0" />
+		<PackageReference Include="Microsoft.Identity.Client.Desktop" Version="4.53.0" />
+		<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.29.0" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Reference Include="System.Configuration" />
 	</ItemGroup>
 
 	<ItemGroup>

1. Desktop app calls Web API/TodoListClient/TokenCacheHelper.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using Microsoft.Identity.Client;
+using Microsoft.Identity.Client.Extensions.Msal;
 using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Configuration;
@@ -65,7 +66,15 @@ public MainWindow()
                 .WithDefaultRedirectUri()
                 .Build();
 
-            TokenCacheHelper.EnableSerialization(_app.UserTokenCache);
+            // Add token cache serialization
+            var storageProperties =
+                new StorageCreationPropertiesBuilder(
+                    "ClientConsoleApp",
+                    Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location))
+                .Build();
+            var cacheHelper = MsalCacheHelper.CreateAsync(storageProperties).GetAwaiter().GetResult();
+            cacheHelper.RegisterCache(_app.UserTokenCache);
+
             GetTodoList();
         }
 

2. Web API now calls Microsoft Graph/TodoListClient/MainWindow.xaml.cs

@@ -64,7 +64,6 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="TodoItem.cs" />
-    <Compile Include="TokenCacheHelper.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -109,10 +108,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Identity.Client">
-      <Version>4.43.1</Version>
+      <Version>4.53.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Identity.Client.Extensions.Msal">
+      <Version>2.29.0</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.1</Version>
+      <Version>13.0.3</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />