merge conflicts

jennyf19 · jennyf19 · commit 069893e1b5e2 · 2023-06-14T19:54:27.000-07:00
diff --git a/2-WebApp-graph-user/2-1-Call-MSGraph/README-incremental-instructions.md b/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"))
diff --git a/2-WebApp-graph-user/2-1-Call-MSGraph/README.md b/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"))
diff --git a/2-WebApp-graph-user/2-1-Call-MSGraph/ReadmeFiles/CAE.md b/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"))
diff --git a/2-WebApp-graph-user/2-1-Call-MSGraph/ReadmeFiles/ExploreSample.md b/2-WebApp-graph-user/2-1-Call-MSGraph/ReadmeFiles/ExploreSample.md
@@ -10,7 +10,7 @@
 
 ## 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 :
 
@@ -60,13 +60,13 @@
    [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);
diff --git a/2-WebApp-graph-user/2-2-TokenCache/Controllers/HomeController.cs b/2-WebApp-graph-user/2-2-TokenCache/Controllers/HomeController.cs
@@ -32,7 +32,7 @@ public HomeController(ILogger<HomeController> logger,
         [AuthorizeForScopes(ScopeKeySection = "DownstreamApi:Scopes")]
         public async Task<IActionResult> Index()
         {
-            var user = await _graphServiceClient.Me.Request().GetAsync();
+            var user = await _graphServiceClient.Me.GetAsync();
             ViewData["ApiResult"] = user.DisplayName;
             var encodedCachedTimeUTC = await _cache.GetAsync("cachedTimeUTC");
 
@@ -42,13 +42,13 @@ public async Task<IActionResult> Index()
         [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);
diff --git a/2-WebApp-graph-user/2-2-TokenCache/Views/Home/Profile.cshtml b/2-WebApp-graph-user/2-2-TokenCache/Views/Home/Profile.cshtml
@@ -26,7 +26,7 @@
         </td>
     </tr>
     @{       
-        var me = ViewData["me"] as Microsoft.Graph.User;
+        var me = ViewData["me"] as Microsoft.Graph.Models.User;
         var properties = me.GetType().GetProperties();
         foreach (var child in properties)
         {
diff --git a/2-WebApp-graph-user/2-2-TokenCache/WebApp-OpenIDConnect-DotNet.csproj b/2-WebApp-graph-user/2-2-TokenCache/WebApp-OpenIDConnect-DotNet.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="3.1.8" />
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.0" />
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.12.2" />
-    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.12.2" />
+    <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.12.2" />
   </ItemGroup>
   
 
diff --git a/2-WebApp-graph-user/2-4-Sovereign-Call-MSGraph/Controllers/HomeController.cs b/2-WebApp-graph-user/2-4-Sovereign-Call-MSGraph/Controllers/HomeController.cs
@@ -28,7 +28,7 @@ public HomeController(ILogger<HomeController> logger,
         [AuthorizeForScopes(ScopeKeySection = "DownstreamApi:Scopes")]
         public async Task<IActionResult> Index()
         {
-            var user = await _graphServiceClient.Me.Request().GetAsync();
+            var user = await _graphServiceClient.Me.GetAsync();
             ViewData["ApiResult"] = user.DisplayName;
 
             return View();
@@ -37,13 +37,13 @@ public async Task<IActionResult> Index()
         [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);
diff --git a/2-WebApp-graph-user/2-4-Sovereign-Call-MSGraph/Views/Home/Profile.cshtml b/2-WebApp-graph-user/2-4-Sovereign-Call-MSGraph/Views/Home/Profile.cshtml
@@ -26,7 +26,7 @@
         </td>
     </tr>
     @{       
-        var me = ViewData["me"] as Microsoft.Graph.User;
+        var me = ViewData["me"] as Microsoft.Graph.Models.User;
         var properties = me.GetType().GetProperties();
         foreach (var child in properties)
         {
diff --git a/2-WebApp-graph-user/2-4-Sovereign-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj b/2-WebApp-graph-user/2-4-Sovereign-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.12.2" />
-	  <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.12.2" />
+	  <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.12.2" />
   </ItemGroup>
 
 </Project>
diff --git a/2-WebApp-graph-user/2-5-HybridFlow/2-5-HybridFlow.csproj b/2-WebApp-graph-user/2-5-HybridFlow/2-5-HybridFlow.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Identity.Web" Version="2.12.2" />
-    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.12.2" />
+    <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.12.2" />
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.12.2" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.3" />
   </ItemGroup>
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/CallGraphBFF.csproj b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/CallGraphBFF.csproj
@@ -15,9 +15,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.9.0" />
-    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.9.0" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.9.0" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.12.1" />
+    <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.12.1" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.12.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Controllers/ProfileController.cs b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Controllers/ProfileController.cs
@@ -4,6 +4,7 @@
 using Microsoft.Identity.Client;
 using Microsoft.Identity.Web;
 using Microsoft.Graph;
+using Microsoft.Graph.Models;
 
 namespace TodoListBFF.Controllers;
 
@@ -25,7 +26,6 @@ public async Task<ActionResult<User>> GetProfile()
         try
         {
             User profile = await _graphServiceClient.Me
-                .Request()
                 .GetAsync();
 
             return Ok(profile);
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Program.cs b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Program.cs
@@ -16,7 +16,8 @@
 // Add Microsoft.Identity.Web services to the container.
 builder.Services.AddMicrosoftIdentityWebAppAuthentication(builder.Configuration)
     .EnableTokenAcquisitionToCallDownstreamApi(builder.Configuration.GetSection("DownstreamApi:Scopes").Value!.Split(' '))
-    .AddMicrosoftGraph(builder.Configuration.GetValue<string>("DownstreamApi:BaseUrl")!, builder.Configuration.GetValue<string>("DownstreamApi:Scopes")!)
+    .AddMicrosoftGraph(builder.Configuration.GetValue<string>("DownstreamApi:BaseUrl")!, 
+                       builder.Configuration.GetValue<string>("DownstreamApi:Scopes")!.Split(' '))
     .AddInMemoryTokenCaches();
 
 // Add session for sharing non-sensitive strings between routes.
diff --git a/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj b/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.12.2" />
-    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.12.2" />
+    <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.12.2" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.1" />
   </ItemGroup>
 
diff --git a/4-WebApp-your-API/4-3-AnyOrg/TodoListService/Controllers/TodoListController.cs b/4-WebApp-your-API/4-3-AnyOrg/TodoListService/Controllers/TodoListController.cs
@@ -229,20 +229,23 @@ private async Task<List<string>> CallGraphApiOnBehalfOfUser()
             try
             {
                 // Call the Graph API and retrieve the user's profile.
-                IGraphServiceUsersCollectionPage users =
+                var users =
                 await CallGraphWithCAEFallback(
                     async () =>
                     {
-                        return await _graphServiceClient.Users.Request()
-                                                              .Filter($"accountEnabled eq true")
-                                                              .Select("id, userPrincipalName")
-                                                              .GetAsync();
+                        return await _graphServiceClient.Users.GetAsync(r =>
+                                                              {
+                                                                  r.QueryParameters.Filter = "accountEnabled eq true";
+                                                                  r.QueryParameters.Select = new string[] { "id", "userPrincipalName" };
+                                                              }
+                                                              );
+
                     }
                 );
 
                 if (users != null)
                 {
-                    return users.Select(x => x.UserPrincipalName).ToList();
+                    return users.Value.Select(x => x.UserPrincipalName).ToList();
                 }
                 throw new Exception();
             }
diff --git a/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj b/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj
@@ -14,7 +14,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.12.2" />
+    <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.12.2" />
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.12.2" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.1" Condition="'$(Configuration)' == 'Debug'" />
diff --git a/5-WebApp-AuthZ/5-2-Groups/Controllers/UserProfileController.cs b/5-WebApp-AuthZ/5-2-Groups/Controllers/UserProfileController.cs
@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Graph;
+using Microsoft.Graph.Models;
 using Microsoft.Identity.Client;
 using Microsoft.Identity.Web;
 using System;
@@ -33,10 +34,10 @@ public async Task<IActionResult> Index()
         {
             try
             {
-                User me = await _graphServiceClient.Me.Request().GetAsync();
+                User me = await _graphServiceClient.Me.GetAsync();
                 ViewData["Me"] = me;
 
-                var photo = await _graphServiceClient.Me.Photo.Request().GetAsync();
+                var photo = await _graphServiceClient.Me.Photo.GetAsync();
                 ViewData["Photo"] = photo;
             }
             // Catch CAE exception from Graph SDK
@@ -53,7 +54,7 @@ public async Task<IActionResult> Index()
                     _consentHandler.HandleException(ex2);
                 }
             }
-            catch (ServiceException svcex) when (svcex.Error.Code == "ImageNotFound")
+            catch (ServiceException svcex) when (svcex.IsMatch("ImageNotFound"))
             {
                 //swallow
             }
diff --git a/5-WebApp-AuthZ/5-2-Groups/README-incremental-instructions.md b/5-WebApp-AuthZ/5-2-Groups/README-incremental-instructions.md
@@ -403,10 +403,10 @@ public async Task<IActionResult> Index()
 {
     try
     {
-        User me = await _graphServiceClient.Me.Request().GetAsync();
+        User me = await _graphServiceClient.Me.GetAsync();
         ViewData["Me"] = me;
 
-        var photo = await _graphServiceClient.Me.Photo.Request().GetAsync();
+        var photo = await _graphServiceClient.Me.Photo.GetAsync();
         ViewData["Photo"] = photo;
     }
     // See 'Optional - Handle Continuous Access Evaluation (CAE) challenge from Microsoft Graph' for more information.
@@ -502,16 +502,16 @@ 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
-    User me = await _graphServiceClient.Me.Request().GetAsync();
+    User me = 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
     {
-        User me = await _graphServiceClient.Me.Request().GetAsync();
+        User me = await _graphServiceClient.Me.GetAsync();
         ViewData["Me"] = me;
 
-        var photo = await _graphServiceClient.Me.Photo.Request().GetAsync();
+        var photo = await _graphServiceClient.Me.Photo.GetAsync();
         ViewData["Photo"] = photo;
     }
     // Catch CAE exception from Graph SDK
diff --git a/5-WebApp-AuthZ/5-2-Groups/README.md b/5-WebApp-AuthZ/5-2-Groups/README.md
diff --git a/5-WebApp-AuthZ/5-2-Groups/ReadmeFiles/AboutTheCode.md b/5-WebApp-AuthZ/5-2-Groups/ReadmeFiles/AboutTheCode.md
diff --git a/5-WebApp-AuthZ/5-2-Groups/Services/GraphHelper.cs b/5-WebApp-AuthZ/5-2-Groups/Services/GraphHelper.cs
diff --git a/5-WebApp-AuthZ/5-2-Groups/Views/UserProfile/Index.cshtml b/5-WebApp-AuthZ/5-2-Groups/Views/UserProfile/Index.cshtml
diff --git a/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj b/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`## About The code`
`12`	`12`
`13`		-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.
	`13`	+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.
`14`	`14`
`15`	`15`	`2. Starting with the Startup.cs file :`
`16`	`16`
`@@ -60,13 +60,13 @@`
`60`	`60`	`[AuthorizeForScopes(ScopeKeySection = "DownstreamApi:Scopes")]`
`61`	`61`	`public async Task<IActionResult> Profile()`
`62`	`62`	`{`
`63`		`- var me = await _graphServiceClient.Me.Request().GetAsync();`
	`63`	`+ var me = await _graphServiceClient.Me.GetAsync();`
`64`	`64`	`ViewData["Me"] = me;`
`65`	`65`
`66`	`66`	`try`
`67`	`67`	`{`
`68`	`68`	`// Get user photo`
`69`		`- using (var photoStream = await _graphServiceClient.Me.Photo.Content.Request().GetAsync())`
	`69`	`+ using (var photoStream = await _graphServiceClient.Me.Photo.Content.GetAsync())`
`70`	`70`	`{`
`71`	`71`	`byte[] photoByte = ((MemoryStream)photoStream).ToArray();`
`72`	`72`	`ViewData["Photo"] = Convert.ToBase64String(photoByte);`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public HomeController(ILogger<HomeController> logger,`
`32`	`32`	`[AuthorizeForScopes(ScopeKeySection = "DownstreamApi:Scopes")]`
`33`	`33`	`public async Task<IActionResult> Index()`
`34`	`34`	`{`
`35`		`- var user = await _graphServiceClient.Me.Request().GetAsync();`
	`35`	`+ var user = await _graphServiceClient.Me.GetAsync();`
`36`	`36`	`ViewData["ApiResult"] = user.DisplayName;`
`37`	`37`	`var encodedCachedTimeUTC = await _cache.GetAsync("cachedTimeUTC");`
`38`	`38`
`@@ -42,13 +42,13 @@ public async Task<IActionResult> Index()`
`42`	`42`	`[AuthorizeForScopes(ScopeKeySection = "DownstreamApi:Scopes")]`
`43`	`43`	`public async Task<IActionResult> Profile()`
`44`	`44`	`{`
`45`		`- var me = await _graphServiceClient.Me.Request().GetAsync();`
	`45`	`+ var me = await _graphServiceClient.Me.GetAsync();`
`46`	`46`	`ViewData["Me"] = me;`
`47`	`47`
`48`	`48`	`try`
`49`	`49`	`{`
`50`	`50`	`// Get user photo`
`51`		`- using (var photoStream = await _graphServiceClient.Me.Photo.Content.Request().GetAsync())`
	`51`	`+ using (var photoStream = await _graphServiceClient.Me.Photo.Content.GetAsync())`
`52`	`52`	`{`
`53`	`53`	`byte[] photoByte = ((MemoryStream)photoStream).ToArray();`
`54`	`54`	`ViewData["Photo"] = Convert.ToBase64String(photoByte);`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`</td>`
`27`	`27`	`</tr>`
`28`	`28`	`@{`
`29`		`- var me = ViewData["me"] as Microsoft.Graph.User;`
	`29`	`+ var me = ViewData["me"] as Microsoft.Graph.Models.User;`
`30`	`30`	`var properties = me.GetType().GetProperties();`
`31`	`31`	`foreach (var child in properties)`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public HomeController(ILogger<HomeController> logger,`
`28`	`28`	`[AuthorizeForScopes(ScopeKeySection = "DownstreamApi:Scopes")]`
`29`	`29`	`public async Task<IActionResult> Index()`
`30`	`30`	`{`
`31`		`- var user = await _graphServiceClient.Me.Request().GetAsync();`
	`31`	`+ var user = await _graphServiceClient.Me.GetAsync();`
`32`	`32`	`ViewData["ApiResult"] = user.DisplayName;`
`33`	`33`
`34`	`34`	`return View();`
`@@ -37,13 +37,13 @@ public async Task<IActionResult> Index()`
`37`	`37`	`[AuthorizeForScopes(ScopeKeySection = "DownstreamApi:Scopes")]`
`38`	`38`	`public async Task<IActionResult> Profile()`
`39`	`39`	`{`
`40`		`- var me = await _graphServiceClient.Me.Request().GetAsync();`
	`40`	`+ var me = await _graphServiceClient.Me.GetAsync();`
`41`	`41`	`ViewData["Me"] = me;`
`42`	`42`
`43`	`43`	`try`
`44`	`44`	`{`
`45`	`45`	`// Get user photo`
`46`		`- using (var photoStream = await _graphServiceClient.Me.Photo.Content.Request().GetAsync())`
	`46`	`+ using (var photoStream = await _graphServiceClient.Me.Photo.Content.GetAsync())`
`47`	`47`	`{`
`48`	`48`	`byte[] photoByte = ((MemoryStream)photoStream).ToArray();`
`49`	`49`	`ViewData["Photo"] = Convert.ToBase64String(photoByte);`