Update to Microsoft.Graph SDK (#86)

* Adding Microsoft.Graph lib. and factory class for creating authenticated Graph clients
* Using SDK to retrieve user info. and photo
* Code fix to display Generic type property values for user info.
* Code fix for fetching user photo from Graph.
* Removing redundant code
* Re-adding the Graph Service back to the project
* Updating README to include updated GraphApiUrl

Author: irvinesunday

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

@@ -1,25 +1,28 @@
-using System.Diagnostics;
+using System;
+using System.Diagnostics;
+using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
 using Microsoft.Identity.Web.Client;
 using WebApp_OpenIDConnect_DotNet.Infrastructure;
 using WebApp_OpenIDConnect_DotNet.Models;
-using WebApp_OpenIDConnect_DotNet.Services.GraphOperations;
+using WebApp_OpenIDConnect_DotNet.Services;
 
 namespace WebApp_OpenIDConnect_DotNet.Controllers
 {
     [Authorize]
     public class HomeController : Controller
     {
         readonly         ITokenAcquisition   tokenAcquisition;
-        private readonly IGraphApiOperations graphApiOperations;
+        readonly         WebOptions          webOptions;
 
         public HomeController(ITokenAcquisition   tokenAcquisition,
-                              IGraphApiOperations graphApiOperations)
+                              IOptions<WebOptions> webOptionValue)
         {
             this.tokenAcquisition   = tokenAcquisition;
-            this.graphApiOperations = graphApiOperations;
+            this.webOptions = webOptionValue.Value;
         }
 
         public IActionResult Index()
@@ -30,14 +33,29 @@ public IActionResult Index()
         [MsalUiRequiredExceptionFilter(Scopes = new[] {Constants.ScopeUserRead})]
         public async Task<IActionResult> Profile()
         {
-            var accessToken =
-                await tokenAcquisition.GetAccessTokenOnBehalfOfUser(HttpContext, new[] {Constants.ScopeUserRead});
-
-            var me = await graphApiOperations.GetUserInformation(accessToken);
-            var photo = await graphApiOperations.GetPhotoAsBase64Async(accessToken);
+            // Initialize the GraphServiceClient.   
+            var graphClient = await GraphServiceClientFactory.GetAuthenticatedGraphClient(async () =>
+            {
+                string result = await tokenAcquisition.GetAccessTokenOnBehalfOfUser(
+                       HttpContext, new[] { Constants.ScopeUserRead });
+                return result;
+            }, webOptions.GraphApiUrl);
 
+            // Get user profile info.
+            var me = await graphClient.Me.Request().GetAsync();
             ViewData["Me"] = me;
-            ViewData["Photo"] = photo;
+
+            try
+            {
+                // Get user photo
+                var photoStream = await graphClient.Me.Photo.Content.Request().GetAsync();
+                byte[] photoByte = ((MemoryStream)photoStream).ToArray();
+                ViewData["Photo"] = Convert.ToBase64String(photoByte);
+            }
+            catch (System.Exception)
+            {
+                ViewData["Photo"] = null;
+            }                       
 
             return View();
         }

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

@@ -65,7 +65,7 @@ Go to the `"2-WebApp-graph-user\2-1-Call-MSGraph"` folder
 - In case you want to deploy your app in Sovereign or national clouds, ensure the `GraphApiUrl` option matches the one you want. By default this is Microsoft Graph in the Azure public cloud
 
   ```JSon
-   "GraphApiUrl": "https://graph.microsoft.com"
+   "GraphApiUrl": "https://graph.microsoft.com/v1.0"
   ```
 
 ### Step 3: Run the sample

2-WebApp-graph-user/2-1-Call-MSGraph/Services/Bootstrapper.cs

@@ -0,0 +1,13 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace WebApp_OpenIDConnect_DotNet.Services
+{
+    public static class Bootstrapper
+    {
+        public static void AddGraphService(this IServiceCollection services, IConfiguration configuration)
+        {
+            services.Configure<WebOptions>(configuration);
+        }
+    }
+}

2-WebApp-graph-user/2-1-Call-MSGraph/Services/GraphServiceClientFactory.cs

@@ -0,0 +1,27 @@
+using Microsoft.Graph;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+
+namespace WebApp_OpenIDConnect_DotNet.Services
+{
+    public class GraphServiceClientFactory
+    {
+        public static async Task<GraphServiceClient> GetAuthenticatedGraphClient(Func<Task<string>> acquireAccessToken, 
+                                                                                 string baseUrl = null)
+        {
+            // Fetch the access token
+            string accessToken = await acquireAccessToken.Invoke();
+
+            return new GraphServiceClient(baseUrl, new DelegateAuthenticationProvider(
+                    async (requestMessage) =>
+                    {
+                        // Append the access token to the request.
+                        requestMessage.Headers.Authorization = new AuthenticationHeaderValue(
+                            Infrastructure.Constants.BearerAuthorizationScheme, accessToken);
+                    }));
+        }
+    }
+}

2-WebApp-graph-user/2-1-Call-MSGraph/Services/MicrosoftGraph-Rest/Bootstrapper.cs

@@ -1,7 +1,7 @@
-namespace WebApp_OpenIDConnect_DotNet.Services.GraphOperations
+namespace WebApp_OpenIDConnect_DotNet.Services
 {
     public class WebOptions
     {
         public string GraphApiUrl { get; set; }
     }
-}
+}

2-WebApp-graph-user/2-1-Call-MSGraph/Services/MicrosoftGraph-Rest/GraphApiOperationService.cs

@@ -8,9 +8,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Identity.Web;
 using Microsoft.Identity.Web.Client.TokenCacheProviders;
-using System;
 using WebApp_OpenIDConnect_DotNet.Infrastructure;
-using WebApp_OpenIDConnect_DotNet.Services.GraphOperations;
+using WebApp_OpenIDConnect_DotNet.Services;
 
 namespace WebApp_OpenIDConnect_DotNet
 {

2-WebApp-graph-user/2-1-Call-MSGraph/Services/MicrosoftGraph-Rest/IGraphApiOperations.cs

@@ -26,15 +26,28 @@
             }
         </td>
     </tr>
-    @{
-        var me = ViewData["me"] as JObject;
-        var children = me.Properties();
-        foreach (var child in children)
+    @{       
+        var me = ViewData["me"] as Microsoft.Graph.User;
+        var properties = me.GetType().GetProperties();
+        foreach (var child in properties)
         {
+            object value = child.GetValue(me);
+            string stringRepresentation;
+            if (!(value is string) && value is IEnumerable<string>)
+            {
+                stringRepresentation = "["
+                    + string.Join(", ", (value as IEnumerable<string>).OfType<object>().Select(c => c.ToString()))
+                    + "]";
+            }
+            else
+            {
+                stringRepresentation = value?.ToString();
+            }
+
             <tr>
-                <td>@child.Name</td>
-                <td>@child.Value</td>
+                <td> @child.Name </td>
+                <td> @stringRepresentation </td>
             </tr>
-        }
+        }      
     }
 </table>