Merge pull request #52708 from andretms/andret-Ignite-2018-Win-Desktop-v2-Quickstart

Andret Ignite 2018 win desktop v2 quickstart

Author: ktoliver

articles/active-directory/develop/tutorial-v2-windows-desktop.md

@@ -14,7 +14,7 @@ ms.devlang: na
 ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: identity
-ms.date: 04/09/2018
+ms.date: 09/19/2018
 ms.author: andret
 ms.custom: aaddev 
 ---

includes/active-directory-develop-guidedsetup-windesktop-setup.md

@@ -13,7 +13,7 @@ ms.devlang: na
 ms.topic: include
 ms.tgt_pltfrm: na
 ms.workload: identity
-ms.date: 04/19/2018
+ms.date: 09/19/2018
 ms.author: andret
 ms.custom: include file 
 
@@ -30,27 +30,26 @@ The application that you create with this guide displays a button that's used to
 >
 
 To create your application, do the following:
+
 1. In Visual Studio, select **File** > **New** > **Project**.
 2. Under **Templates**, select **Visual C#**.
-3. Select **WPF App** or **WPF Application**, depending on the version of Visual Studio version you're using.
+3. Select **WPF App (.NET Framework)**, depending on the version of Visual Studio version you're using.
 
 ## Add MSAL to your project
+
 1. In Visual Studio, select **Tools** > **NuGet Package Manager**> **Package Manager Console**.
 2. In the Package Manager Console window, paste the following Azure PowerShell command:
 
     ```powershell
-    Install-Package Microsoft.Identity.Client -Pre -Version 1.1.4-preview0002
+    Install-Package Microsoft.Identity.Client -Pre
     ```
 
     > [!NOTE] 
-    > This command installs Microsoft Authentication Library. MSAL handles acquiring, caching, and refreshing user tokens that are used to access the APIs that are protected by Azure Active Directory v2.
+    > This command installs Microsoft Authentication Library. MSAL handles acquiring, caching, and refreshing user tokens that are used to access the APIs that are protected by Azure Active Directory v2.0
     >
 
-    > [!NOTE]
-    > This quickstart does not use yet the latest version of MSAL.NET, but we are working on updating it
-    > 
-
 ## Add the code to initialize MSAL
+
 In this step, you create a class to handle interaction with MSAL, such as handling of tokens.
 
 1. Open the *App.xaml.cs* file, and then add the reference for MSAL to the class:
@@ -94,4 +93,3 @@ A *MainWindow.xaml* file should automatically be created as a part of your proje
     </StackPanel>
 </Grid>
 ```
-

includes/active-directory-develop-guidedsetup-windesktop-use.md

@@ -1,3 +1,23 @@
+---
+title: include file
+description: include file
+services: active-directory
+documentationcenter: dev-center-name
+author: andretms
+manager: mtillman
+editor: ''
+
+ms.assetid: 820acdb7-d316-4c3b-8de9-79df48ba3b06
+ms.service: active-directory
+ms.devlang: na
+ms.topic: include
+ms.tgt_pltfrm: na
+ms.workload: identity
+ms.date: 09/18/2018
+ms.author: andret
+ms.custom: include file 
+
+---
 
 ## Use MSAL to get a token for the Microsoft Graph API
 
@@ -8,7 +28,6 @@ In this section, you use MSAL to get a token for the Microsoft Graph API.
     ```csharp
     using Microsoft.Identity.Client;
     ```
-<!-- Workaround for Docs conversion bug -->
 
 2. Replace the `MainWindow` class code with the following:
 
@@ -33,9 +52,15 @@ In this section, you use MSAL to get a token for the Microsoft Graph API.
         {
             AuthenticationResult authResult = null;
 
+            var app = App.PublicClientApp;
+            ResultText.Text = string.Empty;
+            TokenInfoText.Text = string.Empty;
+
+            var accounts = await app.GetAccountsAsync();
+
             try
             {
-                authResult = await App.PublicClientApp.AcquireTokenSilentAsync(_scopes, App.PublicClientApp.Users.FirstOrDefault());
+                authResult = await app.AcquireTokenSilentAsync(_scopes, accounts.FirstOrDefault());
             }
             catch (MsalUiRequiredException ex)
             {
@@ -69,17 +94,22 @@ In this section, you use MSAL to get a token for the Microsoft Graph API.
 
 <!--start-collapse-->
 ### More information
+
 #### Get a user token interactively
+
 Calling the `AcquireTokenAsync` method results in a window that prompts  users to sign in. Applications usually require users to sign in interactively the first time they need to access a protected resource. They might also need to sign in when a silent operation to acquire a token fails (for example, when a user’s password is expired).
 
 #### Get a user token silently
+
 The `AcquireTokenSilentAsync` method handles token acquisitions and renewals without any user interaction. After `AcquireTokenAsync` is executed for the first time, `AcquireTokenSilentAsync` is the usual method to use to obtain tokens that access protected resources for subsequent calls, because calls to request or renew tokens are made silently.
 
 Eventually, the `AcquireTokenSilentAsync` method will fail. Reasons for failure might be that the user has either signed out or changed their password on another device. When MSAL detects that the issue can be resolved by requiring an interactive action, it fires an `MsalUiRequiredException` exception. Your application can handle this exception in two ways:
 
 * It can make a call against `AcquireTokenAsync` immediately. This call results in prompting the user to sign in. This pattern is usually used in online applications where there is no available offline content for the user. The sample generated by this guided setup follows this pattern, which you can see in action the first time you execute the sample. 
-    * Because no user has used the application, `PublicClientApp.Users.FirstOrDefault()` contains a null value, and an `MsalUiRequiredException` exception is thrown. 
-    * The code in the sample then handles the exception by calling `AcquireTokenAsync`, which results in prompting the user to sign in.
+
+* Because no user has used the application, `PublicClientApp.Users.FirstOrDefault()` contains a null value, and an `MsalUiRequiredException` exception is thrown. 
+
+* The code in the sample then handles the exception by calling `AcquireTokenAsync`, which results in prompting the user to sign in.
 
 * It can instead present a visual indication to users that an interactive sign-in is required, so that they can select the right time to sign in. Or the application can retry `AcquireTokenSilentAsync` later. This pattern is frequently used when users can use other application functionality without disruption--for example, when offline content is available in the application. In this case, users can decide when they want to sign in to either access the protected resource or refresh the outdated information. Alternatively, the application can decide to retry `AcquireTokenSilentAsync` when the network is restored after having been temporarily unavailable.
 <!--end-collapse-->
@@ -114,6 +144,7 @@ public async Task<string> GetHttpContentWithToken(string url, string token)
     }
 }
 ```
+
 <!--start-collapse-->
 ### More information about making a REST call against a protected API
 
@@ -128,13 +159,15 @@ To sign out a user, add the following method to your `MainWindow.xaml.cs` file:
 /// <summary>
 /// Sign out the current user
 /// </summary>
-private void SignOutButton_Click(object sender, RoutedEventArgs e)
+private async void SignOutButton_Click(object sender, RoutedEventArgs e)
 {
-    if (App.PublicClientApp.Users.Any())
+    var accounts = await App.PublicClientApp.GetAccountsAsync(); 
+
+    if (accounts.Any())
     {
         try
         {
-            App.PublicClientApp.Remove(App.PublicClientApp.Users.FirstOrDefault());
+            await App.PublicClientApp.RemoveAsync(accounts.FirstOrDefault()); 
             this.ResultText.Text = "User has signed-out";
             this.CallGraphButton.Visibility = Visibility.Visible;
             this.SignOutButton.Visibility = Visibility.Collapsed;
@@ -146,6 +179,7 @@ private void SignOutButton_Click(object sender, RoutedEventArgs e)
     }
 }
 ```
+
 <!--start-collapse-->
 ### More information about user sign-out
 
@@ -167,13 +201,13 @@ private void DisplayBasicTokenInfo(AuthenticationResult authResult)
     TokenInfoText.Text = "";
     if (authResult != null)
     {
-        TokenInfoText.Text += $"Name: {authResult.User.Name}" + Environment.NewLine;
-        TokenInfoText.Text += $"Username: {authResult.User.DisplayableId}" + Environment.NewLine;
+        TokenInfoText.Text += $"Username: {authResult.Account.Username}" + Environment.NewLine;
         TokenInfoText.Text += $"Token Expires: {authResult.ExpiresOn.ToLocalTime()}" + Environment.NewLine;
         TokenInfoText.Text += $"Access Token: {authResult.AccessToken}" + Environment.NewLine;
     }
 }
 ```
+
 <!--start-collapse-->
 ### More information