1. Sync Microsoft.Identity.Web from the Web App incremental tutorial (#121)

jmprieur · web-flow · commit 01d1d1311cf2 · 2020-01-17T11:58:47.000Z
2. Move the sample to ASP.NET Core 3.1
diff --git a/1. Desktop app calls Web API/TodoListClient/TodoListClient.csproj b/1. Desktop app calls Web API/TodoListClient/TodoListClient.csproj
@@ -109,7 +109,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Identity.Client">
-      <Version>4.6.0</Version>
+      <Version>4.7.1</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>11.0.2</Version>
diff --git a/1. Desktop app calls Web API/TodoListService/Properties/launchSettings.json b/1. Desktop app calls Web API/TodoListService/Properties/launchSettings.json
@@ -23,7 +23,8 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://localhost:1040/"
+      "applicationUrl": "https://localhost:44351/",
+      "sslPort": 44351
     }
   }
 }
diff --git a/1. Desktop app calls Web API/TodoListService/TodoListService.csproj b/1. Desktop app calls Web API/TodoListService/TodoListService.csproj
@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UserSecretsId>aspnet-TodoListService-03230DB1-5145-408C-A48B-BE3DAFC56C30</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.0" Condition="'$(Configuration)' == 'Debug'" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/2. Web API now calls Microsoft Graph/TodoListClient/TodoListClient.csproj b/2. Web API now calls Microsoft Graph/TodoListClient/TodoListClient.csproj
@@ -109,7 +109,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Identity.Client">
-      <Version>4.6.0</Version>
+      <Version>4.7.1</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>11.0.2</Version>
diff --git a/2. Web API now calls Microsoft Graph/TodoListService/TodoListService.csproj b/2. Web API now calls Microsoft Graph/TodoListService/TodoListService.csproj
@@ -1,13 +1,15 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UserSecretsId>aspnet-TodoListService-03230DB1-5145-408C-A48B-BE3DAFC56C30</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.0" />
+    <!--<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.1" Condition="'$(Configuration)' == 'Debug'" />-->
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/3.-Web-api-call-Microsoft-graph-for-personal-accounts/TodoListClient/TodoListClient.csproj b/3.-Web-api-call-Microsoft-graph-for-personal-accounts/TodoListClient/TodoListClient.csproj
@@ -109,7 +109,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Identity.Client">
-      <Version>4.6.0</Version>
+      <Version>4.7.1</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>11.0.2</Version>
diff --git a/3.-Web-api-call-Microsoft-graph-for-personal-accounts/TodoListService/Startup.cs b/3.-Web-api-call-Microsoft-graph-for-personal-accounts/TodoListService/Startup.cs
@@ -24,7 +24,7 @@ public Startup(IConfiguration configuration)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddProtectedWebApi(Configuration)
-                    .AddProtectedApiCallsWebApis(Configuration, new string[] { "user.read", "offline_access" })
+                    .AddProtectedApiCallsWebApis(Configuration)
                     .AddInMemoryTokenCaches();
             services.AddControllers();
         }
diff --git a/3.-Web-api-call-Microsoft-graph-for-personal-accounts/TodoListService/TodoListService.csproj b/3.-Web-api-call-Microsoft-graph-for-personal-accounts/TodoListService/TodoListService.csproj
@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UserSecretsId>aspnet-TodoListService-03230DB1-5145-408C-A48B-BE3DAFC56C30</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.0" Condition="'$(Configuration)' == 'Debug'" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Microsoft.Identity.Web.Test/Microsoft.Identity.Web.Test.csproj b/Microsoft.Identity.Web.Test/Microsoft.Identity.Web.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/Microsoft.Identity.Web/ITokenAcquisition.cs b/Microsoft.Identity.Web/ITokenAcquisition.cs
@@ -67,7 +67,7 @@ public interface ITokenAcquisition
         /// <summary>
         /// Used in Web APIs (which therefore cannot have an interaction with the user). 
         /// Replies to the client through the HttpReponse by sending a 403 (forbidden) and populating wwwAuthenticateHeaders so that
-        /// the client can trigger an iteraction with the user so that the user consents to more scopes
+        /// the client can trigger an interaction with the user so that the user consents to more scopes
         /// </summary>
         /// <param name="scopes">Scopes to consent to</param>
         /// <param name="msalSeviceException"><see cref="MsalUiRequiredException"/> triggering the challenge</param>
diff --git a/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj b/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj
@@ -34,12 +34,12 @@
   </ItemGroup>
 
   <ItemGroup Label="Build Tools" Condition="$([MSBuild]::IsOsPlatform('Windows'))">
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   
@@ -53,9 +53,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.6.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.7.1" />
   </ItemGroup>
 </Project>
diff --git a/Microsoft.Identity.Web/README.md b/Microsoft.Identity.Web/README.md
@@ -267,7 +267,6 @@ For web apps that calls web apis, and web APIs that call downstream APIs, the co
 | Extension Method | Microsoft.Identity.Web sub Namespace | Description  |
 | ---------------- | --------- | ------------ |  
 | `AddInMemoryTokenCaches` | `TokenCacheProviders.InMemory` | In memory token cache serialization. This implementation is great in samples. It's also good in production applications provided you don't mind if the token cache is lost when the web app is restarted. `AddInMemoryTokenCaches` takes an optional parameter of type `MsalMemoryTokenCacheOptions` that enables you to specify the duration after which the cache entry will expire unless it's used.
-| `AddSqlTokenCaches` | `TokenCacheProviders.Sql` | The token cache maintained in a SQL database. This implementation is ideal for production applications that need to keep their token caches. AddSqlTokenCaches takes a parameter of type `MsalSqlTokenCacheOptions` that let you specify the SQL connection string  
 | `AddSessionTokenCaches` | `TokenCacheProviders.Session` | The token cache is bound to the user session. This option isn't ideal if the ID token is too large because it contains too many claims as the cookie would be too large.
 | `AddDistributedTokenCaches` | `TokenCacheProviders.Distributed` | The token cache is an adapter against the ASP.NET Core `IDistributedCache` implementation, therefore enabling you to choose between a distributed memory cache, a Redis cache, or a SQL Server cache. For details about the IDistributedCache` implementations, see https://docs.microsoft.com/aspnet/core/performance/caching/distributed?view=aspnetcore-2.2#distributed-memory-cache.
 
diff --git a/Microsoft.Identity.Web/TokenCacheProviders/IMsalTokenCacheProvider .cs b/Microsoft.Identity.Web/TokenCacheProviders/IMsalTokenCacheProvider .cs
@@ -15,8 +15,6 @@ public interface IMsalTokenCacheProvider
         /// Initializes a token cache (which can be a user token cache or an app token cache)
         /// </summary>
         /// <param name="tokenCache">Token cache for which to initialize the serialization</param>
-        /// <param name="isAppTokenCache">Is the token cache an App token cache or
-        /// a user token cache</param>
         /// <returns></returns>
         Task InitializeAsync(ITokenCache tokenCache);
 
diff --git a/Microsoft.Identity.Web/WebApiServiceCollectionExtensions.cs b/Microsoft.Identity.Web/WebApiServiceCollectionExtensions.cs
@@ -102,23 +102,17 @@ public static IServiceCollection AddProtectedWebApi(
         /// </summary>
         /// <param name="services">Service collection to which to add authentication</param>
         /// <param name="configuration">Configuration</param>
-        /// <param name="scopes">Optional parameters. If not specified, the token used to call the protected API
-        /// will be kept with the user's claims until the API calls a downstream API. Otherwise the account for the
-        /// user is immediately added to the token cache</param>
         /// <returns></returns>
         public static IServiceCollection AddProtectedApiCallsWebApis(
             this IServiceCollection services,
             IConfiguration configuration,
-            IEnumerable<string> scopes = null,
             string configSectionName = "AzureAd")
         {
             services.AddTokenAcquisition();
             services.AddHttpContextAccessor();
             services.Configure<ConfidentialClientApplicationOptions>(options => configuration.Bind(configSectionName, options));
             services.Configure<JwtBearerOptions>(AzureADDefaults.JwtBearerAuthenticationScheme, options =>
             {
-                // If you don't pre-provide scopes when adding calling AddProtectedApiCallsWebApis, the On behalf of
-                // flow will be delayed (lazy construction of MSAL's application
                 options.Events.OnTokenValidated = async context =>
                 {
                     context.HttpContext.StoreTokenUsedToCallWebAPI(context.SecurityToken as JwtSecurityToken);

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@`
`23`	`23`	`"environmentVariables": {`
`24`	`24`	`"ASPNETCORE_ENVIRONMENT": "Development"`
`25`	`25`	`},`
`26`		`- "applicationUrl": "http://localhost:1040/"`
	`26`	`+ "applicationUrl": "https://localhost:44351/",`
	`27`	`+ "sslPort": 44351`
`27`	`28`	`}`
`28`	`29`	`}`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public Startup(IConfiguration configuration)`
`24`	`24`	`public void ConfigureServices(IServiceCollection services)`
`25`	`25`	`{`
`26`	`26`	`services.AddProtectedWebApi(Configuration)`
`27`		`- .AddProtectedApiCallsWebApis(Configuration, new string[] { "user.read", "offline_access" })`
	`27`	`+ .AddProtectedApiCallsWebApis(Configuration)`
`28`	`28`	`.AddInMemoryTokenCaches();`
`29`	`29`	`services.AddControllers();`
`30`	`30`	`}`