Merge pull request #711 from Azure-Samples/jennyf/2.12.1

update to 2.12.1

Author: jennyf19

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -11,7 +11,7 @@ body:
   attributes:
     label: Microsoft.Identity.Web version
     description: "Please enter the latest version this issue can be reproduced in. "
-    placeholder: "2.11.1"
+    placeholder: "2.12.2"
   validations:
     required: true
 
@@ -106,7 +106,7 @@ body:
   attributes:
     label: Regression
     description: "If this behavior worked before, please enter the last working version(s)."
-    placeholder: "Id Web 2.11.1"
+    placeholder: "Id Web 2.12.2"
 
 - type: textarea
   attributes:

1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj

@@ -24,8 +24,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.11.1" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.11.1" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.12.2" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.12.2" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
   </ItemGroup>
 

1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj

@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.11.1" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.11.1" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.12.2" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.12.2" />
   </ItemGroup>
 
 </Project>

1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj

@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.11.1" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.11.1" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.12.2" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.12.2" />
   </ItemGroup>
 
 </Project>

1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj

@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.11.1" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.11.1" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.12.2" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.12.2" />
   </ItemGroup>
 
 </Project>

1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj

@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.11.1" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.11.1" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.12.2" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.12.2" />
   </ItemGroup>
 
 </Project>

2-WebApp-graph-user/2-1-Call-MSGraph/Controllers/HomeController.cs

@@ -6,6 +6,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Microsoft.Graph;
+using Microsoft.Graph.Models;
 using Microsoft.Identity.Client;
 using Microsoft.Identity.Web;
 using System;
@@ -25,7 +26,7 @@ public class HomeController : Controller
 
         private readonly MicrosoftIdentityConsentAndConditionalAccessHandler _consentHandler;
 
-        private string[] _graphScopes;
+        private readonly string[] _graphScopes;
 
         public HomeController(ILogger<HomeController> logger,
                             IConfiguration configuration,
@@ -34,7 +35,7 @@ public HomeController(ILogger<HomeController> logger,
         {
             _logger = logger;
             _graphServiceClient = graphServiceClient;
-            this._consentHandler = consentHandler;
+            _consentHandler = consentHandler;
 
             // Capture the Scopes for Graph that were used in the original request for an Access token (AT) for MS Graph as
             // they'd be needed again when requesting a fresh AT for Graph during claims challenge processing
@@ -54,7 +55,7 @@ public async Task<IActionResult> Profile()
 
             try
             {
-                currentUser = await _graphServiceClient.Me.Request().GetAsync();
+                currentUser = await _graphServiceClient.Me.GetAsync();
             }
             // Catch CAE exception from Graph SDK
             catch (ServiceException svcex) when (svcex.Message.Contains("Continuous access evaluation resulted in claims challenge"))
@@ -75,7 +76,7 @@ public async Task<IActionResult> Profile()
             try
             {
                 // Get user photo
-                using (var photoStream = await _graphServiceClient.Me.Photo.Content.Request().GetAsync())
+                using (var photoStream = await _graphServiceClient.Me.Photo.Content.GetAsync())
                 {
                     byte[] photoByte = ((MemoryStream)photoStream).ToArray();
                     ViewData["Photo"] = Convert.ToBase64String(photoByte);

2-WebApp-graph-user/2-1-Call-MSGraph/README-incremental-instructions.md

@@ -122,7 +122,7 @@ The two new lines of code:
 
 ### Add additional files to call Microsoft Graph
 
-Add the `Microsoft.Identity.Web.MicrosoftGraph` package, to use [Microsoft Graph SDK](https://github.com/microsoftgraph/msgraph-sdk-dotnet/blob/dev/docs/overview.md).
+Add the `Microsoft.Identity.Web.GraphServiceClient` package, to use [Microsoft Graph SDK](https://github.com/microsoftgraph/msgraph-sdk-dotnet/blob/dev/docs/overview.md).
 
 ### Update the `Startup.cs` file to enable the Microsoft Graph custom service
 
@@ -160,13 +160,13 @@ public HomeController(ILogger<HomeController> logger,
 [AuthorizeForScopes(ScopeKeySection = "DownstreamApi:Scopes")]
 public async Task<IActionResult> Profile()
 {
-    var me = await _graphServiceClient.Me.Request().GetAsync();
+    var me = await _graphServiceClient.Me.GetAsync();
     ViewData["Me"] = me;
 
     try
     {
         // Get user photo
-        using (var photoStream = await _graphServiceClient.Me.Photo.Content.Request().GetAsync())
+        using (var photoStream = await _graphServiceClient.Me.Photo.Content.GetAsync())
         {
             byte[] photoByte = ((MemoryStream)photoStream).ToArray();
             ViewData["Photo"] = Convert.ToBase64String(photoByte);
@@ -290,15 +290,15 @@ To process the CAE challenge from Microsoft Graph, the controller actions need t
     1. Catch a Microsoft Graph SDK's `ServiceException` and extract the required `claims`. This is done by wrapping the call to Microsoft Graph into a try/catch block that processes the challenge:
 
     ```CSharp
-    currentUser = await _graphServiceClient.Me.Request().GetAsync();
+    currentUser = await _graphServiceClient.Me.GetAsync();
     ```
 
     1. Then redirect the user back to Azure AD with the new requested `claims`. Azure AD will use this `claims` payload to discern what or if any additional processing is required, example being the user needs to sign-in again or do multi-factor authentication.
 
   ```CSharp
     try
     {
-        currentUser = await _graphServiceClient.Me.Request().GetAsync();
+        currentUser = await _graphServiceClient.Me.GetAsync();
     }
     // Catch CAE exception from Graph SDK
     catch (ServiceException svcex) when (svcex.Message.Contains("Continuous access evaluation resulted in claims challenge"))

2-WebApp-graph-user/2-1-Call-MSGraph/README.md

@@ -193,7 +193,7 @@ Open the project in your IDE (like Visual Studio or Visual Studio Code) to confi
 
 ## About The code
 
-1. In this aspnetcore web project, first the packages `Microsoft.Identity.Web`,  `Microsoft.Identity.Web.UI` and `Microsoft.Identity.Web.MicrosoftGraph` were added from NuGet. These libraries are used to simplify the process of signing-in a user and acquiring tokens for Microsoft Graph.
+1. In this aspnetcore web project, first the packages `Microsoft.Identity.Web`,  `Microsoft.Identity.Web.UI` and `Microsoft.Identity.Web.GraphServiceClient` were added from NuGet. These libraries are used to simplify the process of signing-in a user and acquiring tokens for Microsoft Graph.
 
 2. Starting with the **Startup.cs** file :
 
@@ -242,13 +242,13 @@ Open the project in your IDE (like Visual Studio or Visual Studio Code) to confi
    [AuthorizeForScopes(ScopeKeySection = "DownstreamApi:Scopes")]
    public async Task<IActionResult> Profile()
    {
-    var me = await _graphServiceClient.Me.Request().GetAsync();
+    var me = await _graphServiceClient.Me.GetAsync();
     ViewData["Me"] = me;
 
     try
     {
         // Get user photo
-        using (var photoStream = await _graphServiceClient.Me.Photo.Content.Request().GetAsync())
+        using (var photoStream = await _graphServiceClient.Me.Photo.Content.GetAsync())
         {
             byte[] photoByte = ((MemoryStream)photoStream).ToArray();
             ViewData["Photo"] = Convert.ToBase64String(photoByte);
@@ -509,13 +509,13 @@ To process the CAE challenge from Microsoft Graph, the controller actions need t
 1. The process to handle CAE challenges from MS Graph comprises of the following steps:
     1. Catch a Microsoft Graph SDK's `ServiceException` and extract the required `claims`. This is done by wrapping the call to Microsoft Graph into a try/catch block that processes the challenge:
     ```CSharp
-    currentUser = await _graphServiceClient.Me.Request().GetAsync();
+    currentUser = await _graphServiceClient.Me.GetAsync();
     ```
     1. Then redirect the user back to Azure AD with the new requested `claims`. Azure AD will use this `claims` payload to discern what or if any additional processing is required, example being the user needs to sign-in again or do multi-factor authentication.
   ```CSharp
     try
     {
-        currentUser = await _graphServiceClient.Me.Request().GetAsync();
+        currentUser = await _graphServiceClient.Me.GetAsync();
     }
     // Catch CAE exception from Graph SDK
     catch (ServiceException svcex) when (svcex.Message.Contains("Continuous access evaluation resulted in claims challenge"))

2-WebApp-graph-user/2-1-Call-MSGraph/ReadmeFiles/CAE.md

@@ -29,13 +29,13 @@ To process the CAE challenge from Microsoft Graph, the controller actions need t
 1. The process to handle CAE challenges from MS Graph comprises of the following steps:
     1. Catch a Microsoft Graph SDK's `ServiceException` and extract the required `claims`. This is done by wrapping the call to Microsoft Graph into a try/catch block that processes the challenge:
     ```CSharp
-    currentUser = await _graphServiceClient.Me.Request().GetAsync();
+    currentUser = await _graphServiceClient.Me.GetAsync();
     ```
     1. Then redirect the user back to Azure AD with the new requested `claims`. Azure AD will use this `claims` payload to discern what or if any additional processing is required, example being the user needs to sign-in again or do multi-factor authentication.
   ```CSharp
     try
     {
-        currentUser = await _graphServiceClient.Me.Request().GetAsync();
+        currentUser = await _graphServiceClient.Me.GetAsync();
     }
     // Catch CAE exception from Graph SDK
     catch (ServiceException svcex) when (svcex.Message.Contains("Continuous access evaluation resulted in claims challenge"))