Merge pull request #568 from microsoftgraph/bethpan/aspnetcore-sample

Update aspnet core sample with latest

Author: beth-panx

samples/proxy-provider-asp-net-core/.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "wwwroot/lib"
+}

samples/proxy-provider-asp-net-core/Controllers/HomeController.cs

@@ -6,25 +6,22 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using MicrosoftGraphAspNetCoreConnectSample.Helpers;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Graph;
 using Microsoft.AspNetCore.Hosting;
 using System.Security.Claims;
+using MicrosoftGraphAspNetCoreConnectSample.Services;
 
 namespace MicrosoftGraphAspNetCoreConnectSample.Controllers
 {
     public class HomeController : Controller
     {
-        private readonly IConfiguration _configuration;
-        private readonly IHostingEnvironment _env;
-        private readonly IGraphSdkHelper _graphSdkHelper;
+        private readonly IWebHostEnvironment _env;
+        private readonly IGraphServiceClientFactory _graphServiceClientFactory;
 
-        public HomeController(IConfiguration configuration, IHostingEnvironment hostingEnvironment, IGraphSdkHelper graphSdkHelper)
+        public HomeController(IWebHostEnvironment hostingEnvironment, IGraphServiceClientFactory graphServiceClientFactory)
         {
-            _configuration = configuration;
             _env = hostingEnvironment;
-            _graphSdkHelper = graphSdkHelper;
+            _graphServiceClientFactory = graphServiceClientFactory;
         }
 
         [AllowAnonymous]
@@ -34,11 +31,11 @@ public async Task<IActionResult> Index(string email)
             if (User.Identity.IsAuthenticated)
             {
                 // Get users's email.
-                email = email ?? User.FindFirst("preferred_username")?.Value;
+                email ??= User.FindFirst("preferred_username")?.Value;
                 ViewData["Email"] = email;
 
                 // Initialize the GraphServiceClient.
-                var graphClient = _graphSdkHelper.GetAuthenticatedClient((ClaimsIdentity)User.Identity);
+                var graphClient = _graphServiceClientFactory.GetAuthenticatedGraphClient((ClaimsIdentity)User.Identity);
 
                 ViewData["Response"] = await GraphService.GetUserJson(graphClient, email, HttpContext);
 
@@ -62,7 +59,7 @@ public async Task<IActionResult> SendEmail(string recipients)
             try
             {
                 // Initialize the GraphServiceClient.
-                var graphClient = _graphSdkHelper.GetAuthenticatedClient((ClaimsIdentity)User.Identity);
+                var graphClient = _graphServiceClientFactory.GetAuthenticatedGraphClient((ClaimsIdentity)User.Identity);
 
                 // Send the email.
                 await GraphService.SendEmail(graphClient, _env, recipients, HttpContext);
@@ -78,10 +75,16 @@ public async Task<IActionResult> SendEmail(string recipients)
             }
         }
 
+        [AllowAnonymous]
         public IActionResult Messages()
         {
             return View();
         }
+        
+        public IActionResult Privacy()
+        {
+            return View();
+        }
 
         [AllowAnonymous]
         public IActionResult Error()

samples/proxy-provider-asp-net-core/Controllers/ProxyController.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -9,60 +10,63 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Primitives;
 using Microsoft.Graph;
-using MicrosoftGraphAspNetCoreConnectSample.Helpers;
+using MicrosoftGraphAspNetCoreConnectSample.Services;
 
 namespace MicrosoftGraphAspNetCoreConnectSample.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
     public class ProxyController : ControllerBase
     {
-        private readonly IGraphSdkHelper _graphSdkHelper;
+        private readonly IWebHostEnvironment _env;
+        private readonly IGraphServiceClientFactory _graphServiceClientFactory;
 
-        public ProxyController(IConfiguration configuration, IHostingEnvironment hostingEnvironment, IGraphSdkHelper graphSdkHelper)
+        public ProxyController(IWebHostEnvironment hostingEnvironment, IGraphServiceClientFactory graphServiceClientFactory)
         {
-            _graphSdkHelper = graphSdkHelper;
+            _env = hostingEnvironment;
+            _graphServiceClientFactory = graphServiceClientFactory;
         }
 
         [HttpGet]
         [Route("{*all}")]
-        public async Task<HttpResponseMessage> GetAsync(string all)
+        public async Task<IActionResult> GetAsync(string all)
         {
             return await ProcessRequestAsync("GET", all, null).ConfigureAwait(false);
         }
 
         [HttpPost]
         [Route("{*all}")]
-        public async Task<HttpResponseMessage> PostAsync(string all, [FromBody]object body)
+        public async Task<IActionResult> PostAsync(string all, [FromBody] object body)
         {
             return await ProcessRequestAsync("POST", all, body).ConfigureAwait(false);
         }
 
         [HttpDelete]
         [Route("{*all}")]
-        public async Task<HttpResponseMessage> DeleteAsync(string all)
+        public async Task<IActionResult> DeleteAsync(string all)
         {
             return await ProcessRequestAsync("DELETE", all, null).ConfigureAwait(false);
         }
 
         [HttpPut]
         [Route("{*all}")]
-        public async Task<HttpResponseMessage> PutAsync(string all, [FromBody]object body)
+        public async Task<IActionResult> PutAsync(string all, [FromBody] object body)
         {
             return await ProcessRequestAsync("PUT", all, body).ConfigureAwait(false);
         }
 
         [HttpPatch]
         [Route("{*all}")]
-        public async Task<HttpResponseMessage> PatchAsync(string all, [FromBody]object body)
+        public async Task<IActionResult> PatchAsync(string all, [FromBody] object body)
         {
             return await ProcessRequestAsync("PATCH", all, body).ConfigureAwait(false);
         }
 
-        private async Task<HttpResponseMessage> ProcessRequestAsync(string method, string all, object content)
+        private async Task<IActionResult> ProcessRequestAsync(string method, string all, object content)
         {
-            var graphClient = _graphSdkHelper.GetAuthenticatedClient((ClaimsIdentity)User.Identity);
+            var graphClient = _graphServiceClientFactory.GetAuthenticatedGraphClient((ClaimsIdentity)User.Identity);
 
             var qs = HttpContext.Request.QueryString;
             var url = $"{GetBaseUrlWithoutVersion(graphClient)}/{all}{qs.ToUriComponent()}";
@@ -93,12 +97,12 @@ private async Task<HttpResponseMessage> ProcessRequestAsync(string method, strin
                     contentType = contentTypes?.FirstOrDefault() ?? contentType;
 
                     var byteArrayContent = await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
-                    return ReturnHttpResponseMessage(HttpStatusCode.OK, contentType, new ByteArrayContent(byteArrayContent));
+                    return new HttpResponseMessageResult(ReturnHttpResponseMessage(HttpStatusCode.OK, contentType, new ByteArrayContent(byteArrayContent)));
                 }
             }
             catch (ServiceException ex)
             {
-                return ReturnHttpResponseMessage(ex.StatusCode, contentType, new StringContent(ex.Error.ToString()));
+                return new HttpResponseMessageResult(ReturnHttpResponseMessage(ex.StatusCode, contentType, new StringContent(ex.Error.ToString())));
             }
         }
 
@@ -127,5 +131,34 @@ private string GetBaseUrlWithoutVersion(GraphServiceClient graphClient)
             var index = baseUrl.LastIndexOf('/');
             return baseUrl.Substring(0, index);
         }
+
+        public class HttpResponseMessageResult : IActionResult
+        {
+            private readonly HttpResponseMessage _responseMessage;
+
+            public HttpResponseMessageResult(HttpResponseMessage responseMessage)
+            {
+                _responseMessage = responseMessage; // could add throw if null
+            }
+
+            public async Task ExecuteResultAsync(ActionContext context)
+            {
+                context.HttpContext.Response.StatusCode = (int)_responseMessage.StatusCode;
+
+                foreach (var header in _responseMessage.Headers)
+                {
+                    context.HttpContext.Response.Headers.TryAdd(header.Key, new StringValues(header.Value.ToArray()));
+                }
+
+                context.HttpContext.Response.ContentType = _responseMessage.Content.Headers.ContentType.ToString();
+
+                using (var stream = await _responseMessage.Content.ReadAsStreamAsync())
+                {
+                    await stream.CopyToAsync(context.HttpContext.Response.Body);
+                    await context.HttpContext.Response.Body.FlushAsync();
+                }
+            }
+        }
+
     }
-}
+}

samples/proxy-provider-asp-net-core/Extensions/AzureAdAuthenticationBuilderExtensions.cs

@@ -6,7 +6,7 @@
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Microsoft.IdentityModel.Tokens;
-using MicrosoftGraphAspNetCoreConnectSample.Helpers;
+using MicrosoftGraphAspNetCoreConnectSample.Services;
 
 namespace MicrosoftGraphAspNetCoreConnectSample.Extensions
 {

samples/proxy-provider-asp-net-core/Program.cs

@@ -1,10 +1,11 @@
-/* 
+/* 
 *  Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. 
 *  See LICENSE in the source repository root for complete license information. 
 */
 
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Logging;
 
 namespace MicrosoftGraphAspNetCoreConnectSample
 {
@@ -17,6 +18,11 @@ public static void Main(string[] args)
 
         public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
+                .ConfigureLogging((hostingContext, logging) =>
+                {
+                    logging.AddConsole();
+                    logging.AddDebug();
+                })
                 .UseStartup<Startup>();
     }
 }

samples/proxy-provider-asp-net-core/Properties/launchSettings.json

@@ -1,4 +1,4 @@
-{
+{
   "iisSettings": {
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
@@ -22,7 +22,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://localhost:60761"
+      "applicationUrl": "http://localhost:44334"
     }
   }
 }