update graph sample

Author: jennyf19

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/Views/Home/Profile.cshtml

@@ -28,7 +28,7 @@
             <th></th>
         </tr>
         @{
-            var user = ViewData["me"] as Microsoft.Graph.User;
+            var user = ViewData["me"] as Microsoft.Graph.Models.User;
             <tr>
                 <th>
                     ID

2-WebApp-graph-user/2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet-graph.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.12.1" />
+    <PackageReference Include="Microsoft.Identity.Web.GraphServiceClientBeta" Version="2.12.1" />
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.12.1" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.5" />
   </ItemGroup>