Code review comments addressed

Author: Kalyan Krishna

AppCreationScripts/Cleanup.ps1

@@ -56,7 +56,7 @@ This function removes the Azure AD applications for the sample. These applicatio
     {
         Remove-AzureADApplication -ObjectId $apps.ObjectId
     }
-    Get-AzureRmADServicePrincipal -SearchString "TodoListService-ManualJwt" | ForEach-Object {Remove-AzureRmADServicePrincipal -ObjectId $_.Id -Confirm:$false}
+    # Get-AzureRmADServicePrincipal -SearchString "TodoListService-ManualJwt" | ForEach-Object {Remove-AzureRmADServicePrincipal -ObjectId $_.Id -Confirm:$false}
     Write-Host "Removed TodoListService-ManualJwt."
 
     Write-Host "Removing 'client' (TodoListClient-ManualJwt) if needed"
@@ -66,7 +66,7 @@ This function removes the Azure AD applications for the sample. These applicatio
     {
         Remove-AzureADApplication -ObjectId $apps.ObjectId
     }
-    Get-AzureRmADServicePrincipal -SearchString "TodoListClient-ManualJwt" | ForEach-Object {Remove-AzureRmADServicePrincipal -ObjectId $_.Id -Confirm:$false}
+    # Get-AzureRmADServicePrincipal -SearchString "TodoListClient-ManualJwt" | ForEach-Object {Remove-AzureRmADServicePrincipal -ObjectId $_.Id -Confirm:$false}
     Write-Host "Removed TodoListClient-ManualJwt."
 
 }

AppCreationScripts/Configure.ps1

@@ -101,8 +101,6 @@ Function ConfigureApplications
    so that they are consistent with the Applications parameters
 #> 
 
-    $commonendpoint = "common"
-
     # $tenantId is the Active Directory Tenant. This is a GUID which represents the "Directory ID" of the AzureAD tenant
     # into which you want to create the apps. Look it up in the Azure portal in the "Properties" of the Azure AD.
 
@@ -150,8 +148,8 @@ Function ConfigureApplications
    $owner = Get-AzureADApplicationOwner -ObjectId $serviceAadApplication.ObjectId
    if ($owner -eq $null)
    { 
-        Add-AzureADApplicationOwner -ObjectId $serviceAadApplication.ObjectId -RefObjectId $user.ObjectId
-        Write-Host "'$($user.UserPrincipalName)' added as an application owner to app '$($serviceServicePrincipal.DisplayName)'"
+    Add-AzureADApplicationOwner -ObjectId $serviceAadApplication.ObjectId -RefObjectId $user.ObjectId
+    Write-Host "'$($user.UserPrincipalName)' added as an application owner to app '$($serviceServicePrincipal.DisplayName)'"
    }
 
    Write-Host "Done creating the service application (TodoListService-ManualJwt)"
@@ -174,8 +172,8 @@ Function ConfigureApplications
    $owner = Get-AzureADApplicationOwner -ObjectId $clientAadApplication.ObjectId
    if ($owner -eq $null)
    { 
-        Add-AzureADApplicationOwner -ObjectId $clientAadApplication.ObjectId -RefObjectId $user.ObjectId
-        Write-Host "'$($user.UserPrincipalName)' added as an application owner to app '$($clientServicePrincipal.DisplayName)'"
+    Add-AzureADApplicationOwner -ObjectId $clientAadApplication.ObjectId -RefObjectId $user.ObjectId
+    Write-Host "'$($user.UserPrincipalName)' added as an application owner to app '$($clientServicePrincipal.DisplayName)'"
    }
 
    Write-Host "Done creating the client application (TodoListClient-ManualJwt)"
@@ -212,7 +210,7 @@ Function ConfigureApplications
    ReplaceSetting -configFilePath $configFile -key "ida:ClientId" -newValue $clientAadApplication.AppId
    ReplaceSetting -configFilePath $configFile -key "todo:TodoListResourceId" -newValue $serviceIdentifierUri
    ReplaceSetting -configFilePath $configFile -key "todo:TodoListBaseAddress" -newValue $serviceAadApplication.HomePage
-  
+
    Add-Content -Value "</tbody></table></body></html>" -Path createdApps.html  
 }
 

AppCreationScripts/sample.json

@@ -1,6 +1,6 @@
 {
   "Sample": {
-    "Title": "How to manually validating a JWT access token using Microsoft identity platform (formerly Azure Active Directory for developers)",
+    "Title": "How to manually validate a JWT access token using Microsoft identity platform (formerly Azure Active Directory for developers)",
     "Level": 300,
     "Client": ".NET Desktop App (WPF)",
     "Service": "ASP.NET Web API",

README.md

@@ -7,13 +7,13 @@ client: .NET Desktop App (WPF)
 service: ASP.NET Web API
 endpoint: AAD v2.0
 ---
-# How to manually validating a JWT access token using Microsoft identity platform (formerly Azure Active Directory for developers)
+# How to manually validate a JWT access token using Microsoft identity platform (formerly Azure Active Directory for developers)
 
 ![Build badge](https://identitydivision.visualstudio.com/_apis/public/build/definitions/a7934fdd-dcde-4492-a406-7fad6ac00e17/18/badge)
 
 ## About this sample
 
-A Web API is secured by [validating the token](https://docs.microsoft.com/en-us/azure/active-directory/develop/access-tokens#validating-tokens) they receive from callers. When a developer generates a skeleton Web API code using [Visual Studio](https://aka.ms/vsdownload), token validation libraries and code to carry out basic token validation is automatically generated in the project. An example of the generated code using the [asp.net security middleware](https://github.com/aspnet/Security) and [Microsoft Identity Model Extension for .NET](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet) to validate tokens is provided below.
+A Web API that accepts bearer token is secured by [validating the token](https://docs.microsoft.com/en-us/azure/active-directory/develop/access-tokens#validating-tokens) they receive from callers. When a developer generates a skeleton Web API code using [Visual Studio](https://aka.ms/vsdownload), token validation libraries and code to carry out basic token validation is automatically generated in the project. An example of the generated code using the [asp.net security middleware](https://github.com/aspnet/Security) and [Microsoft Identity Model Extension for .NET](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet) to validate tokens is provided below.
 
     ```CSharp
     public void ConfigureAuth(IAppBuilder app)
@@ -29,7 +29,7 @@ A Web API is secured by [validating the token](https://docs.microsoft.com/en-us/
         }
     ```
 
-The code above will validate the issuer,  audience, and the signing tokens, but often the developer's requirements are more than what the defaults provide. Examples of these requirements can be:
+The code above will validate the issuer, audience, and the signing tokens, which is usually sufficient for most scenarios. But often the developer's requirements are more than what the defaults provide. Examples of these requirements can be:
 
 - Restricting the Web API to one or more Apps (App IDs)
 - Restricting the Web API to just one or more tenants (Issuers)
@@ -322,7 +322,7 @@ If you are using this sample with an Azure AD B2C custom policy, you might want
 
 Use [Stack Overflow](http://stackoverflow.com/questions/tagged/msal) to get support from the community.
 Ask your questions on Stack Overflow first and browse existing issues to see if someone has asked your question before.
-Make sure that your questions or comments are tagged with [`adal` `msal` `dotnet`].
+Make sure that your questions or comments are tagged with [`adal` `msal` `dotnet` `azure-active-directory`].
 
 If you find a bug in the sample, please raise the issue on [GitHub Issues](../../issues).
 

TodoListClient/App.config

@@ -9,6 +9,6 @@
     <add key="todo:TodoListResourceId" value="[Enter App ID URI of TodoListService-ManualJwt, e.g. api://{clientID}]" />
     <add key="ida:AADInstance" value="https://login.microsoftonline.com/{0}/v2.0" />
     <add key="todo:TodoListBaseAddress" value="https://localhost:44324" />
-    <add key="todo:TodoListScope" value="user_impersonation"/>
+    <add key="todo:TodoListScope" value="user_impersonation" />
   </appSettings>
 </configuration>

TodoListClient/MainWindow.xaml.cs

@@ -1,7 +1,7 @@
 /*
  The MIT License (MIT)
 
-Copyright (c) 2015 Microsoft Corporation
+Copyright (c) 2018 Microsoft Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -20,19 +20,18 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 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.
-*/
-
+ */
 
 using Microsoft.Identity.Client;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
+
 // The following using statements were added for this sample.
 using System.Globalization;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Runtime.InteropServices;
 using System.Web.Script.Serialization;
 using System.Windows;
 
@@ -51,25 +50,28 @@ public partial class MainWindow : Window
         // The Authority is the sign-in URL of the tenant.
         //
         private static string aadInstance = ConfigurationManager.AppSettings["ida:AADInstance"];
+
         private static string tenant = ConfigurationManager.AppSettings["ida:Tenant"];
         private static string clientId = ConfigurationManager.AppSettings["ida:ClientId"];
-        
+
         private static string authority = String.Format(CultureInfo.InvariantCulture, aadInstance, tenant);
 
         //
         // To authenticate to the To Do list service, the client needs to know the service's App ID URI.
         // To contact the To Do list service we need it's URL as well.
         //
         private static string todoListResourceId = ConfigurationManager.AppSettings["todo:TodoListResourceId"];
+
         private static string todoListBaseAddress = ConfigurationManager.AppSettings["todo:TodoListBaseAddress"];
-        public static string [] scopes = { $"{todoListResourceId}/{ConfigurationManager.AppSettings["todo:TodoListScope"]}" };
+        public static string[] scopes = { $"{todoListResourceId}/{ConfigurationManager.AppSettings["todo:TodoListScope"]}" };
 
         private HttpClient httpClient = new HttpClient();
         private readonly IPublicClientApplication _app;
 
         // Button strings
-        const string signInString = "Sign In";
-        const string clearCacheString = "Clear Cache";
+        private const string signInString = "Sign In";
+
+        private const string clearCacheString = "Clear Cache";
 
         public MainWindow()
         {
@@ -100,7 +102,7 @@ private async void GetTodoList(bool isAppStarting)
             // Get an access token to call the ToDo service.
             //
             AuthenticationResult result = null;
-           
+
             try
             {
                 result = await _app.AcquireTokenSilent(scopes, accounts.FirstOrDefault())
@@ -145,7 +147,6 @@ private async void GetTodoList(bool isAppStarting)
 
             if (response.IsSuccessStatusCode)
             {
-
                 // Read the response and databind to the GridView to display To Do items.
                 string s = await response.Content.ReadAsStringAsync();
                 JavaScriptSerializer serializer = new JavaScriptSerializer();
@@ -181,7 +182,7 @@ private async void AddTodoItem(object sender, RoutedEventArgs e)
                 MessageBox.Show("Please enter a value for the To Do item name");
                 return;
             }
-            
+
             //
             // Get an access token to call the To Do service.
             //
@@ -215,7 +216,6 @@ private async void AddTodoItem(object sender, RoutedEventArgs e)
                     MessageBox.Show("Unexpected error: " + message);
                 });
 
-
                 return;
             }
 
@@ -304,7 +304,6 @@ private async void SignIn(object sender = null, RoutedEventArgs args = null)
 
                 UserName.Content = Properties.Resources.UserNotSignedIn;
             }
-
         }
 
         // Set user name to text box
@@ -323,4 +322,4 @@ private void SetUserName(IAccount userInfo)
             UserName.Content = userName;
         }
     }
-}
+}

TodoListClient/TodoItem.cs

@@ -21,17 +21,12 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace TodoListClient
 {
-    class TodoItem
+    internal class TodoItem
     {
         public string Title { get; set; }
         public string Owner { get; set; }
     }
-}
+}

TodoListClient/TodoListClient-ManualJwt.csproj

@@ -108,9 +108,7 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Utils\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

TodoListClient/TokenCacheHelper.cs

@@ -25,15 +25,14 @@
 //
 //------------------------------------------------------------------------------
 
+using Microsoft.Identity.Client;
 using System.IO;
 using System.Security.Cryptography;
-using Microsoft.Identity.Client;
 
 namespace TodoListClient
 {
-    static class TokenCacheHelper
+    internal static class TokenCacheHelper
     {
- 
         /// <summary>
         /// Path to the token cache
         /// </summary>
@@ -62,17 +61,18 @@ private static void AfterAccessNotification(TokenCacheNotificationArgs args)
                 {
                     // reflect changes in the persistent store
                     File.WriteAllBytes(CacheFilePath,
-                                       ProtectedData.Protect(args.TokenCache.SerializeMsalV3(), 
-                                                             null, 
+                                       ProtectedData.Protect(args.TokenCache.SerializeMsalV3(),
+                                                             null,
                                                              DataProtectionScope.CurrentUser)
                                       );
                 }
             }
         }
+
         internal static void EnableSerialization(ITokenCache tokenCache)
         {
             tokenCache.SetBeforeAccess(BeforeAccessNotification);
             tokenCache.SetAfterAccess(AfterAccessNotification);
         }
     }
-}
+}

TodoListService-ManualJwt/Controllers/HomeController.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using System.Web.Mvc;
 
 namespace TodoListService_ManualJwt.Controllers
 {
@@ -15,4 +11,4 @@ public ActionResult Index()
             return View();
         }
     }
-}
+}