Merge pull request #60 from Azure-Samples/jmprieur/msal4-20

Demonstrate usage of WAM (and update to MSAL 4.23)

Author: jmprieur

active-directory-wpf-msgraph-v2/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
-</configuration>
+</configuration>

active-directory-wpf-msgraph-v2/App.xaml.cs

@@ -1,21 +1,33 @@
 using Microsoft.Identity.Client;
+using System.Linq.Expressions;
 using System.Windows;
 
 namespace active_directory_wpf_msgraph_v2
 {
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>
-    
+
     // To change from Microsoft public cloud to a national cloud, use another value of AzureCloudInstance
     public partial class App : Application
     {
         static App()
         {
-            _clientApp = PublicClientApplicationBuilder.Create(ClientId)
+            CreateApplication(true);
+        }
+
+        public static void CreateApplication(bool useWam)
+        {
+            var builder = PublicClientApplicationBuilder.Create(ClientId)
                 .WithAuthority($"{Instance}{Tenant}")
-                .WithDefaultRedirectUri()
-                .Build();
+                .WithDefaultRedirectUri();
+
+            if (useWam)
+            {
+                builder.WithExperimentalFeatures();
+                builder.WithBroker(true);  // Requires redirect URI "ms-appx-web://microsoft.aad.brokerplugin/{client_id}" in app registration
+            }
+            _clientApp = builder.Build();
             TokenCacheHelper.EnableSerialization(_clientApp.UserTokenCache);
         }
 
@@ -32,7 +44,7 @@ static App()
         // Note: Tenant is important for the quickstart.
         private static string Tenant = "common";
         private static string Instance = "https://login.microsoftonline.com/";
-        private static IPublicClientApplication _clientApp ;
+        private static IPublicClientApplication _clientApp;
 
         public static IPublicClientApplication PublicClientApp { get { return _clientApp; } }
     }

active-directory-wpf-msgraph-v2/MainWindow.xaml

@@ -5,10 +5,15 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:active_directory_wpf_msgraph_v2"
         mc:Ignorable="d"
-        Title="MainWindow" Height="Auto" Width="525" SizeToContent="Height">
+        Title="MainWindow" Height="Auto" Width="600" SizeToContent="Height">
     <Grid>
         <StackPanel Background="Azure">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                <ComboBox x:Name="howToSignIn" SelectedIndex="0" SelectionChanged="UseWam_Changed" VerticalAlignment="Center">
+                    <ComboBoxItem>Use account used to signed-in in Windows (WAM)</ComboBoxItem>
+                    <ComboBoxItem>Use one of the Accounts known by Windows (WAM)</ComboBoxItem>
+                    <ComboBoxItem>Use any account (Azure AD)</ComboBoxItem>
+                </ComboBox>
                 <Button x:Name="CallGraphButton" Content="Call Microsoft Graph API" HorizontalAlignment="Right" Padding="5" Click="CallGraphButton_Click" Margin="5" FontFamily="Segoe Ui"/>
                 <Button x:Name="SignOutButton" Content="Sign-Out" HorizontalAlignment="Right" Padding="5" Click="SignOutButton_Click" Margin="5" Visibility="Collapsed" FontFamily="Segoe Ui"/>
             </StackPanel>

active-directory-wpf-msgraph-v2/MainWindow.xaml.cs

@@ -37,8 +37,30 @@ private async void CallGraphButton_Click(object sender, RoutedEventArgs e)
             ResultText.Text = string.Empty;
             TokenInfoText.Text = string.Empty;
 
-            var accounts = await app.GetAccountsAsync();
-            var firstAccount = accounts.FirstOrDefault();
+            IAccount firstAccount;
+
+            switch(howToSignIn.SelectedIndex)
+            {
+                // 0: Use account used to signed-in in Windows (WAM)
+                case 0:
+                    // WAM will always get an account in the cache. So if we want
+                    // to have a chance to select the accounts interactively, we need to
+                    // force the non-account
+                    firstAccount = PublicClientApplication.OperatingSystemAccount;
+                    break;
+
+                //  1: Use one of the Accounts known by Windows(WAM)
+                case 1:
+                    // We force WAM to display the dialog with the accounts
+                    firstAccount = null;
+                    break;
+
+                //  Use any account(Azure AD). It's not using WAM
+                default:
+                    var accounts = await app.GetAccountsAsync();
+                    firstAccount = accounts.FirstOrDefault();
+                    break;
+            }
 
             try
             {
@@ -137,5 +159,11 @@ private void DisplayBasicTokenInfo(AuthenticationResult authResult)
                 TokenInfoText.Text += $"Token Expires: {authResult.ExpiresOn.ToLocalTime()}" + Environment.NewLine;
             }
         }
+
+        private void UseWam_Changed(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
+        {
+            SignOutButton_Click(sender, e);
+            App.CreateApplication(howToSignIn.SelectedIndex != 2); // Not Azure AD accounts (that is use WAM accounts)
+        }
     }
 }

active-directory-wpf-msgraph-v2/Properties/Resources.Designer.cs

@@ -8,11 +8,12 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>active_directory_wpf_msgraph_v2</RootNamespace>
     <AssemblyName>active_directory_wpf_msgraph_v2</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -100,8 +101,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Identity.Client">
-      <Version>4.22.0</Version>
+      <Version>4.23.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>