Merge pull request #2 from AzureADQuickStarts/desktopCallingAnotherV2WebApi

Updating the code to show a V2 application

Author: jmprieur

TodoListClient/App.config

@@ -5,6 +5,11 @@
     </startup>
   <appSettings>
     <add key="ida:ClientId" value="{Enter the Application Id that you copied from the App Registration Portal.}" />
+    <add key="todo:Scope" value="{Enter the scope of the Web API, as copied from the App Registration Portal, for instance api://[WebApi-AppId]/access_as_user where [WebApi-AppId] is a GUID" />
+    <!-- 
+       Note that the [WebAPI-AppId], which is the Application Id of the called Web API can be the same as the ida:ClientId 
+       as V2 apps enable several platforms for a same application. But this can also be a different applications
+       -->
     <add key="todo:TodoListBaseAddress" value="https://localhost:44321/" />
   </appSettings>
 </configuration>

TodoListClient/MainWindow.xaml.cs

@@ -43,15 +43,16 @@ public partial class MainWindow : Window
 
         // The todoListBaseAddress is the address of your Web API
         private static string todoListBaseAddress = ConfigurationManager.AppSettings["todo:TodoListBaseAddress"];
+        private static string todoListScope = ConfigurationManager.AppSettings["todo:Scope"];
 
         private HttpClient httpClient = new HttpClient();
         private PublicClientApplication app = null;
 
-        private string Scope
+        private string[] Scopes
         {
             get
             {
-                return $"api://{clientId}/access_as_user";
+                return new string[] { todoListScope };
             }
         }
         protected override async void OnInitialized(EventArgs e)
@@ -69,13 +70,17 @@ protected override async void OnInitialized(EventArgs e)
             // get a token for the user without showing a UI.
             try
             {
-                result = await app.AcquireTokenSilentAsync(new string[] { Scope }, app.Users.FirstOrDefault());
+                result = await app.AcquireTokenSilentAsync(Scopes, app.Users.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.
 
                 SignInButton.Content = "Clear Cache";
                 GetTodoList();
             }
+            catch (MsalUiRequiredException)
+            {
+                // The app should take no action and simply show the user the sign in button.
+            }
             catch (MsalException ex)
             {
                 if (ex.ErrorCode == "failed_to_acquire_token_silently")
@@ -116,7 +121,7 @@ private async void GetTodoList()
                 // without invoking any UI prompt.  AcquireTokenSilentAsync forces
                 // MSAL to throw an exception if it cannot get a token silently.
 
-                result = await app.AcquireTokenSilentAsync(new string[] { Scope }, app.Users.FirstOrDefault());
+                result = await app.AcquireTokenSilentAsync(Scopes, app.Users.FirstOrDefault());
             }
             catch (MsalException ex)
             {
@@ -180,7 +185,7 @@ private async void AddTodoItem(object sender, RoutedEventArgs e)
             AuthenticationResult result = null;
             try
             {
-                result = await app.AcquireTokenSilentAsync(new string[] { Scope }, app.Users.FirstOrDefault());
+                result = await app.AcquireTokenSilentAsync(Scopes, app.Users.FirstOrDefault());
             }
             catch (MsalException ex)
             {
@@ -255,7 +260,7 @@ private async void SignIn(object sender = null, RoutedEventArgs args = null)
             AuthenticationResult result = null;
             try
             {
-                result = await app.AcquireTokenAsync(new string[] { Scope });
+                result = await app.AcquireTokenAsync(Scopes);
                 SignInButton.Content = "Clear Cache";
                 GetTodoList();
             }