Upgrading the sample to MSAL 2.0.0-preview

See https://aka.ms/msal-net-2-released for explanations about the breaking changes in MSAL.NET

Author: jmprieur

TodoListClient/MainWindow.xaml.cs

@@ -22,6 +22,7 @@
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Threading.Tasks;
 using System.Web.Script.Serialization;
 using System.Windows;
 
@@ -68,7 +69,8 @@ protected override async void OnInitialized(EventArgs e)
             // get a token for the user without showing a UI.
             try
             {
-                result = await app.AcquireTokenSilentAsync(Scopes, app.Users.FirstOrDefault());
+                var accounts = await app.GetAccountsAsync();
+                result = await app.AcquireTokenSilentAsync(Scopes, accounts.FirstOrDefault());
                 // If we got here, a valid token is in the cache - or MSAL was able to get a new oen via refresh token.
                 // Proceed to fetch the user's tasks from the TodoListService via the GetTodoList() method.
 
@@ -105,7 +107,7 @@ public MainWindow()
             InitializeComponent();
         }
 
-        private async void GetTodoList()
+        private async Task GetTodoList()
         {
 
             // Get a token from MSAL, and attach
@@ -118,8 +120,8 @@ private async void GetTodoList()
                 // Here, we try to get an access token to call the TodoListService
                 // without invoking any UI prompt.  AcquireTokenSilentAsync forces
                 // MSAL to throw an exception if it cannot get a token silently.
-
-                result = await app.AcquireTokenSilentAsync(Scopes, app.Users.FirstOrDefault());
+                var accounts = await app.GetAccountsAsync();
+                result = await app.AcquireTokenSilentAsync(Scopes, accounts.FirstOrDefault());
             }
             catch (MsalException ex)
             {
@@ -183,7 +185,8 @@ private async void AddTodoItem(object sender, RoutedEventArgs e)
             AuthenticationResult result = null;
             try
             {
-                result = await app.AcquireTokenSilentAsync(Scopes, app.Users.FirstOrDefault());
+                var accounts = await app.GetAccountsAsync();
+                result = await app.AcquireTokenSilentAsync(Scopes, accounts.FirstOrDefault());
             }
             catch (MsalException ex)
             {
@@ -226,11 +229,13 @@ private async void AddTodoItem(object sender, RoutedEventArgs e)
         /// Clears the cache
         /// </summary>
         /// <param name="app"></param>
-        private void ClearCache(IPublicClientApplication app)
+        private async Task ClearCache(IPublicClientApplication app)
         {
-            foreach(IUser user in app.Users.ToArray())
+            var accounts = await app.GetAccountsAsync();
+            while (accounts.Any())
             {
-                app.Remove(user);
+                await app.RemoveAsync(accounts.First());
+                accounts = await app.GetAccountsAsync();
             }
         }
         private async void SignIn(object sender = null, RoutedEventArgs args = null)
@@ -245,7 +250,7 @@ private async void SignIn(object sender = null, RoutedEventArgs args = null)
             if (SignInButton.Content.ToString() == "Clear Cache")
             {
                 TodoList.ItemsSource = string.Empty;
-                ClearCache(app);
+                await ClearCache(app);
                 SignInButton.Content = "Sign In";
                 return;
             }

TodoListClient/TodoListClient.csproj

@@ -34,15 +34,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Identity.Client, Version=1.1.2.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Identity.Client.1.1.2-preview0008\lib\net45\Microsoft.Identity.Client.dll</HintPath>
+    <Reference Include="Microsoft.Identity.Client, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Identity.Client.2.0.0-preview\lib\net45\Microsoft.Identity.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Security" />
     <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />

TodoListClient/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Identity.Client" version="1.1.2-preview0008" targetFramework="net45" />
+  <package id="Microsoft.Identity.Client" version="2.0.0-preview" targetFramework="net45" />
 </packages>