fix build errors

jennyf19 · jennyf19 · commit e0da46fb5b57 · 2020-04-13T21:28:45.000-07:00
diff --git a/2. Web API now calls Microsoft Graph/TodoListService/Controllers/TodoListController.cs b/2. Web API now calls Microsoft Graph/TodoListService/Controllers/TodoListController.cs
@@ -92,7 +92,7 @@ public async Task<string> CallGraphApiOnBehalfOfUser()
             // we use MSAL.NET to get a token to call the API On Behalf Of the current user
             try
             {
-                string accessToken = await _tokenAcquisition.GetAccessTokenOnBehalfOfUserAsync(scopes);
+                string accessToken = await _tokenAcquisition.GetAccessTokenForUserAsync(scopes);
                 dynamic me = await CallGraphApiOnBehalfOfUser(accessToken);
                 return me.userPrincipalName;
             }
diff --git a/2. Web API now calls Microsoft Graph/TodoListService/Startup.cs b/2. Web API now calls Microsoft Graph/TodoListService/Startup.cs
@@ -24,7 +24,7 @@ public Startup(IConfiguration configuration)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddProtectedWebApi(Configuration)
-                    .AddProtectedApiCallsWebApis(Configuration)
+                    .AddProtectedWebApiCallsProtectedWebApi(Configuration)
                     .AddInMemoryTokenCaches();
             services.AddControllers();
         }
diff --git a/3.-Web-api-call-Microsoft-graph-for-personal-accounts/TodoListService/Controllers/TodoListController.cs b/3.-Web-api-call-Microsoft-graph-for-personal-accounts/TodoListService/Controllers/TodoListController.cs
@@ -92,7 +92,7 @@ public async Task<string> CallGraphApiOnBehalfOfUser()
             // we use MSAL.NET to get a token to call the API On Behalf Of the current user
             try
             {
-                string accessToken = await _tokenAcquisition.GetAccessTokenOnBehalfOfUserAsync(scopes);
+                string accessToken = await _tokenAcquisition.GetAccessTokenForUserAsync(scopes);
                 dynamic me = await CallGraphApiOnBehalfOfUser(accessToken);
                 return me.userPrincipalName;
             }
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)
+                    .AddProtectedWebApiCallsProtectedWebApi(Configuration)
                     .AddInMemoryTokenCaches();
             services.AddControllers();
         }
diff --git a/4.-Console-app-calls-web-API-with-PoP/TodoListService/Startup.cs b/4.-Console-app-calls-web-API-with-PoP/TodoListService/Startup.cs
@@ -24,7 +24,7 @@ public Startup(IConfiguration configuration)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddProtectedWebApi(Configuration)
-                    .AddProtectedApiCallsWebApis(Configuration)
+                    .AddProtectedWebApiCallsProtectedWebApi(Configuration)
                     .AddPop(Configuration)
                     .AddInMemoryTokenCaches();
             services.AddControllers();
diff --git a/Microsoft.Identity.Web/Microsoft.Identity.Web.Future.csproj b/Microsoft.Identity.Web/Microsoft.Identity.Web.Future.csproj
@@ -82,7 +82,7 @@
     <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.3" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.10.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.11.0" />
     <PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.SignedHttpRequest" Version="6.5.0" />
     <PackageReference Include="System.Collections" Version="4.3.0" />
diff --git a/Microsoft.Identity.Web/WebApiServiceCollectionExtensions.cs b/Microsoft.Identity.Web/WebApiServiceCollectionExtensions.cs
@@ -48,10 +48,6 @@ public static IServiceCollection AddPop(
                 {
                     options.ClientId, $"api://{options.ClientId}"
                 };
-
-                // Instead of using the default validation (validating against a single tenant, as we do in line of business apps),
-                // we inject our own multi-tenant validation logic (which even accepts both v1.0 and v2.0 tokens)
-                options.AccessTokenValidationParameters.IssuerValidator = AadIssuerValidator.GetIssuerValidator(options.Authority).Validate;
             });
                 
             return services;

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public async Task<string> CallGraphApiOnBehalfOfUser()`
`92`	`92`	`// we use MSAL.NET to get a token to call the API On Behalf Of the current user`
`93`	`93`	`try`
`94`	`94`	`{`
`95`		`- string accessToken = await _tokenAcquisition.GetAccessTokenOnBehalfOfUserAsync(scopes);`
	`95`	`+ string accessToken = await _tokenAcquisition.GetAccessTokenForUserAsync(scopes);`
`96`	`96`	`dynamic me = await CallGraphApiOnBehalfOfUser(accessToken);`
`97`	`97`	`return me.userPrincipalName;`
`98`	`98`	`}`
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)`
	`27`	`+ .AddProtectedWebApiCallsProtectedWebApi(Configuration)`
`28`	`28`	`.AddInMemoryTokenCaches();`
`29`	`29`	`services.AddControllers();`
`30`	`30`	`}`