Merge branch 'main' of https://github.com/microsoftgraph/microsoft-graph-toolkit into main

Author: beth-panx

packages/providers/mgt-msal2-provider/package.json

@@ -41,7 +41,7 @@
   "dependencies": {
     "@microsoft/mgt-element": "*",
     "@microsoft/microsoft-graph-client": "^2.2.1",
-    "@azure/msal-browser": "^2.14.2"
+    "@azure/msal-browser": "^2.16.1"
   },
   "publishConfig": {
     "directory": "dist"

packages/providers/mgt-teams-msal2-provider/package.json

@@ -45,7 +45,7 @@
     "@microsoft/mgt-element": "*",
     "@microsoft/mgt-msal2-provider": "*",
     "@microsoft/microsoft-graph-client": "^2.2.1",
-    "@azure/msal-browser": "^2.14.2"
+    "@azure/msal-browser": "^2.16.1"
   },
   "publishConfig": {
     "directory": "dist"

samples/angular-app/package.json

@@ -19,8 +19,8 @@
     "@angular/platform-browser": "~9.1.6",
     "@angular/platform-browser-dynamic": "~9.1.6",
     "@angular/router": "~9.1.6",
-    "@azure/msal-angular": "^2.0.0",
-    "@azure/msal-browser": "^2.14.2",
+    "@azure/msal-angular": "^2.0.2",
+    "@azure/msal-browser": "^2.16.1",
     "@microsoft/mgt": "*",
     "rxjs": "~6.5.4",
     "tslib": "^1.10.0",

samples/angular-app/src/environments/environment.msal.ts

@@ -7,7 +7,7 @@ const isIE = window.navigator.userAgent.indexOf('MSIE ') > -1 || window.navigato
 
 export const MsalConfig: Configuration = {
   auth: {
-    clientId: 'a974dfa0-9f57-49b9-95db-90f04ce2111a',
+    clientId: '2dfea037-938a-4ed8-9b35-c05708a1b241',
     authority: 'https://login.microsoftonline.com/common/',
     redirectUri: 'http://localhost:4200/',
     postLogoutRedirectUri: 'http://localhost:4200/',
@@ -23,7 +23,6 @@ const consentScopes = ['user.read', 'openid', 'profile'];
 const protectedResourceMap = new Map<string, Array<string>>();
 protectedResourceMap.set('https://graph.microsoft.com/v1.0/', consentScopes);
 
-
 export const MsalInterceptorConfig: MsalInterceptorConfiguration = {
   interactionType: !isIE ? InteractionType.Popup : InteractionType.Redirect,
   protectedResourceMap

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

@@ -33,38 +33,38 @@ public ProxyController(IWebHostEnvironment hostingEnvironment, IGraphServiceClie
         [Route("{*all}")]
         public async Task<IActionResult> GetAsync(string all)
         {
-            return await ProcessRequestAsync("GET", all, null).ConfigureAwait(false);
+            return await ProcessRequestAsync(Microsoft.Graph.HttpMethods.GET, all, null).ConfigureAwait(false);
         }
 
         [HttpPost]
         [Route("{*all}")]
         public async Task<IActionResult> PostAsync(string all, [FromBody] object body)
         {
-            return await ProcessRequestAsync("POST", all, body).ConfigureAwait(false);
+            return await ProcessRequestAsync(Microsoft.Graph.HttpMethods.POST, all, body).ConfigureAwait(false);
         }
 
         [HttpDelete]
         [Route("{*all}")]
         public async Task<IActionResult> DeleteAsync(string all)
         {
-            return await ProcessRequestAsync("DELETE", all, null).ConfigureAwait(false);
+            return await ProcessRequestAsync(Microsoft.Graph.HttpMethods.DELETE, all, null).ConfigureAwait(false);
         }
 
         [HttpPut]
         [Route("{*all}")]
         public async Task<IActionResult> PutAsync(string all, [FromBody] object body)
         {
-            return await ProcessRequestAsync("PUT", all, body).ConfigureAwait(false);
+            return await ProcessRequestAsync(Microsoft.Graph.HttpMethods.PUT, all, body).ConfigureAwait(false);
         }
 
         [HttpPatch]
         [Route("{*all}")]
         public async Task<IActionResult> PatchAsync(string all, [FromBody] object body)
         {
-            return await ProcessRequestAsync("PATCH", all, body).ConfigureAwait(false);
+            return await ProcessRequestAsync(Microsoft.Graph.HttpMethods.PATCH, all, body).ConfigureAwait(false);
         }
 
-        private async Task<IActionResult> ProcessRequestAsync(string method, string all, object content)
+        private async Task<IActionResult> ProcessRequestAsync(Microsoft.Graph.HttpMethods method, string all, object content)
         {
             var graphClient = _graphServiceClientFactory.GetAuthenticatedGraphClient((ClaimsIdentity)User.Identity);
 

samples/proxy-provider-asp-net-core/Views/Home/Index.cshtml

@@ -1,4 +1,4 @@
-<!--  Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
+<!--  Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
         See LICENSE in the source repository root for complete license information. -->
 
 @{
@@ -14,5 +14,5 @@
 }
 @if (User.Identity.IsAuthenticated)
 {
-    <mgt-person person-details="@ViewData["Response"]" person-image="@ViewData["Picture"]" show-presence view="twoLines" person-card="hover"></mgt-person>
-}
+    <mgt-people></mgt-people>
+}

samples/proxy-provider-asp-net-core/mgt-netcore.csproj

@@ -9,8 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.5" />
-    <PackageReference Include="Microsoft.Graph" Version="3.8.0" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.16.1" />
+    <PackageReference Include="Microsoft.Graph" Version="4.3.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.35.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 

samples/proxy-provider-asp-net-mvc/graph-tutorial/Controllers/GraphProxyController.cs

@@ -1,4 +1,4 @@
-using graph_tutorial.Helpers;
+using graph_tutorial.Helpers;
 using Microsoft.Graph;
 using System;
 using System.Collections;
@@ -22,38 +22,38 @@ public class GraphProxyController : ApiController
         [Route("{*all}")]
         public async Task<HttpResponseMessage> GetAsync(string all)
         {
-            return await ProcessRequestAsync("GET", all, null).ConfigureAwait(false);
+            return await ProcessRequestAsync(HttpMethods.GET, all, null).ConfigureAwait(false);
         }
 
         [HttpPost]
         [Route("{*all}")]
         public async Task<HttpResponseMessage> PostAsync(string all, [FromBody]object body)
         {
-            return await ProcessRequestAsync("POST", all, body).ConfigureAwait(false);
+            return await ProcessRequestAsync(HttpMethods.POST, all, body).ConfigureAwait(false);
         }
 
         [HttpDelete]
         [Route("{*all}")]
         public async Task<HttpResponseMessage> DeleteAsync(string all)
         {
-            return await ProcessRequestAsync("DELETE", all, null).ConfigureAwait(false);
+            return await ProcessRequestAsync(HttpMethods.DELETE, all, null).ConfigureAwait(false);
         }
 
         [HttpPut]
         [Route("{*all}")]
         public async Task<HttpResponseMessage> PutAsync(string all, [FromBody]object body)
         {
-            return await ProcessRequestAsync("PUT", all, body).ConfigureAwait(false);
+            return await ProcessRequestAsync(HttpMethods.PUT, all, body).ConfigureAwait(false);
         }
 
         [HttpPatch]
         [Route("{*all}")]
         public async Task<HttpResponseMessage> PatchAsync(string all, [FromBody]object body)
         {
-            return await ProcessRequestAsync("PATCH", all, body).ConfigureAwait(false);
+            return await ProcessRequestAsync(HttpMethods.PATCH, all, body).ConfigureAwait(false);
         }
 
-        private async Task<HttpResponseMessage> ProcessRequestAsync(string method, string all, object content)
+        private async Task<HttpResponseMessage> ProcessRequestAsync(HttpMethods method, string all, object content)
         {
             var graphClient = GraphHelper.GetAuthenticatedClient();
 
@@ -77,7 +77,7 @@ private async Task<HttpResponseMessage> ProcessRequestAsync(string method, strin
 
             try
             {
-                using (var response = await request.SendRequestAsync(content, CancellationToken.None, HttpCompletionOption.ResponseContentRead).ConfigureAwait(false))
+                using (var response = await request.SendRequestAsync(content?.ToString(), CancellationToken.None, HttpCompletionOption.ResponseContentRead).ConfigureAwait(false))
                 {
                     response.Content.Headers.TryGetValues("content-type", out var contentTypes);