Merge pull request #58 from Azure-Samples/jennyf/b2c

upgrade to MSAL 4.15 and use new `GetAccounts(userflow)`

Author: jennyf19

active-directory-b2c-wpf/App.xaml.cs

@@ -1,4 +1,7 @@
-using System.IO;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System.IO;
 using System.Text;
 using System.Windows;
 using Microsoft.Identity.Client;
@@ -32,7 +35,7 @@ static App()
             PublicClientApp = PublicClientApplicationBuilder.Create(ClientId)
                 .WithB2CAuthority(AuthoritySignUpSignIn)
                 .WithRedirectUri(RedirectUri)
-                .WithLogging(Log, LogLevel.Verbose, false) //PiiEnabled set to false
+                .WithLogging(Log, LogLevel.Info, false) // don't log PII details on a regular basis
                 .Build();
 
             TokenCacheHelper.Bind(PublicClientApp.UserTokenCache);

active-directory-b2c-wpf/MainWindow.xaml.cs

@@ -1,4 +1,7 @@
-using Microsoft.Identity.Client;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.Identity.Client;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -22,17 +25,6 @@ public MainWindow()
         {
             InitializeComponent();
         }
-        
-        private IAccount GetAccountByPolicy(IEnumerable<IAccount> accounts, string policy)
-        {
-            foreach (var account in accounts)
-            {
-                string accountIdentifier = account.HomeAccountId.ObjectId.Split('.')[0];
-                if (accountIdentifier.EndsWith(policy.ToLower())) return account;
-            }
-
-            return null;
-        }
 
         private async void SignInButton_Click(object sender, RoutedEventArgs e)
         {
@@ -41,7 +33,7 @@ private async void SignInButton_Click(object sender, RoutedEventArgs e)
             try
             {
                 ResultText.Text = "";
-                authResult = await (app as PublicClientApplication).AcquireTokenInteractive(App.ApiScopes)
+                authResult = await app.AcquireTokenInteractive(App.ApiScopes)
                     .WithParentActivityOrWindow(new WindowInteropHelper(this).Handle)
                     .ExecuteAsync();
 
@@ -54,7 +46,7 @@ private async void SignInButton_Click(object sender, RoutedEventArgs e)
                 {
                     if (ex.Message.Contains("AADB2C90118"))
                     {
-                        authResult = await (app as PublicClientApplication).AcquireTokenInteractive(App.ApiScopes)
+                        authResult = await app.AcquireTokenInteractive(App.ApiScopes)
                             .WithParentActivityOrWindow(new WindowInteropHelper(this).Handle)
                             .WithPrompt(Prompt.SelectAccount)
                             .WithB2CAuthority(App.AuthorityResetPassword)
@@ -74,6 +66,8 @@ private async void SignInButton_Click(object sender, RoutedEventArgs e)
             {
                 ResultText.Text = $"Error Acquiring Token:{Environment.NewLine}{ex}";
             }
+
+            DisplayUserInfo(authResult);
         }
 
         private async void EditProfileButton_Click(object sender, RoutedEventArgs e)
@@ -83,10 +77,10 @@ private async void EditProfileButton_Click(object sender, RoutedEventArgs e)
             {
                 ResultText.Text = $"Calling API:{App.AuthorityEditProfile}";
 
-                AuthenticationResult authResult = await (app as PublicClientApplication).AcquireTokenInteractive(App.ApiScopes)
+                AuthenticationResult authResult = await app.AcquireTokenInteractive(App.ApiScopes)
                             .WithParentActivityOrWindow(new WindowInteropHelper(this).Handle)
                             .WithB2CAuthority(App.AuthorityEditProfile)
-                            .WithPrompt(Prompt.NoPrompt)
+                            .WithPrompt(Prompt.NoPrompt) 
                             .ExecuteAsync(new System.Threading.CancellationToken());
 
                 DisplayUserInfo(authResult);
@@ -101,10 +95,10 @@ private async void CallApiButton_Click(object sender, RoutedEventArgs e)
         {
             AuthenticationResult authResult = null;
             var app = App.PublicClientApp;
-            IEnumerable<IAccount> accounts = await App.PublicClientApp.GetAccountsAsync();
+            var accounts = await app.GetAccountsAsync(App.PolicySignUpSignIn);
             try
             {
-                authResult = await app.AcquireTokenSilent(App.ApiScopes, GetAccountByPolicy(accounts, App.PolicySignUpSignIn))
+                authResult = await app.AcquireTokenSilent(App.ApiScopes, accounts.FirstOrDefault())
                     .ExecuteAsync();
             }
             catch (MsalUiRequiredException ex)
@@ -170,6 +164,7 @@ public async Task<string> GetHttpContentWithToken(string url, string token)
 
         private async void SignOutButton_Click(object sender, RoutedEventArgs e)
         {
+            // SingOut will remove tokens from the token cache from ALL accounts, irrespective of user flow
             IEnumerable<IAccount> accounts = await App.PublicClientApp.GetAccountsAsync();
             try
             {
@@ -192,10 +187,9 @@ private async void Window_Loaded(object sender, RoutedEventArgs e)
             try
             {
                 var app = App.PublicClientApp;
-                IEnumerable<IAccount> accounts = await App.PublicClientApp.GetAccountsAsync();
+                var accounts = await app.GetAccountsAsync(App.PolicySignUpSignIn);
 
-                AuthenticationResult authResult = await app.AcquireTokenSilent(App.ApiScopes,
-                                                                               GetAccountByPolicy(accounts, App.PolicySignUpSignIn))
+                AuthenticationResult authResult = await app.AcquireTokenSilent(App.ApiScopes, accounts.FirstOrDefault())
                     .ExecuteAsync();
 
                 DisplayUserInfo(authResult);
@@ -237,11 +231,11 @@ private void UpdateSignInState(bool signedIn)
 
         private void DisplayUserInfo(AuthenticationResult authResult)
         {
-            TokenInfoText.Text = "";
             if (authResult != null)
             {
                 JObject user = ParseIdToken(authResult.IdToken);
 
+                TokenInfoText.Text = "";
                 TokenInfoText.Text += $"Name: {user["name"]?.ToString()}" + Environment.NewLine;
                 TokenInfoText.Text += $"User Identifier: {user["oid"]?.ToString()}" + Environment.NewLine;
                 TokenInfoText.Text += $"Street Address: {user["streetAddress"]?.ToString()}" + Environment.NewLine;

active-directory-b2c-wpf/TokenCacheHelper.cs

@@ -1,33 +1,8 @@
-//------------------------------------------------------------------------------
-//
-// Copyright (c) Microsoft Corporation.
-// All rights reserved.
-//
-// This code is licensed under the MIT License.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files(the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions :
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 using System.IO;
 using System.Security.Cryptography;
-using System.Windows.Controls;
 using Microsoft.Identity.Client;
 
 namespace active_directory_b2c_wpf

active-directory-b2c-wpf/active-directory-b2c-wpf.csproj

@@ -35,8 +35,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Identity.Client, Version=4.13.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Identity.Client.4.13.0\lib\net45\Microsoft.Identity.Client.dll</HintPath>
+    <Reference Include="Microsoft.Identity.Client, Version=4.15.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Identity.Client.4.15.0\lib\net45\Microsoft.Identity.Client.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -107,4 +107,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

active-directory-b2c-wpf/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Identity.Client" version="4.13.0" targetFramework="net472" />
+  <package id="Microsoft.Identity.Client" version="4.15.0" targetFramework="net472" />
   <package id="Microsoft.NETCore.Platforms" version="1.1.1" targetFramework="net452" />
   <package id="Microsoft.NETCore.Targets" version="1.1.3" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net452" />
   <package id="System.Private.Uri" version="4.3.2" targetFramework="net452" />
-</packages>
+</packages>