Merge pull request #26 from microsoftgraph/feature/sdk-payload-support

Feature/sdk payload support

Author: baywet

src/GraphWebhooks-Core/Controllers/NotificationController.cs

@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections.Generic;
-using Newtonsoft.Json;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -21,6 +20,8 @@
 using Microsoft.Extensions.Options;
 using System.IO;
 using GraphWebhooks_Core.Infrastructure;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace GraphWebhooks_Core.Controllers
 {
@@ -78,11 +79,15 @@ public async Task<IActionResult> Listen([FromQuery]string validationToken = null
                 {
                     // Parse the received notifications.
                     var plainNotifications = new Dictionary<string, ChangeNotification>();
-                    using var inputStream = new StreamReader(Request.Body);
-                    var collection = JsonConvert.DeserializeObject<NotificationCollection>(await inputStream.ReadToEndAsync());
+                    var options = new JsonSerializerOptions
+                    {
+                        PropertyNameCaseInsensitive = true
+                    };
+                    options.Converters.Add(new JsonStringEnumConverter(JsonNamingPolicy.CamelCase));
+                    var collection = await JsonSerializer.DeserializeAsync<ChangeNotificationCollection>(Request.Body, options);
                     foreach (var notification in collection.Value.Where(x => x.EncryptedContent == null))
                     {
-                        SubscriptionStore subscription = subscriptionStore.GetSubscriptionInfo(notification.SubscriptionId);
+                        SubscriptionStore subscription = subscriptionStore.GetSubscriptionInfo(notification.SubscriptionId.Value);
 
                         // Verify the current client state matches the one that was sent.
                         if (notification.ClientState == subscription.ClientState)
@@ -151,7 +156,7 @@ private async Task GetChangedMessagesAsync(IEnumerable<ChangeNotification> notif
             List<NotificationViewModel> notificationsToDisplay = new List<NotificationViewModel>();
             foreach (var notification in notifications)
             {
-                SubscriptionStore subscription = subscriptionStore.GetSubscriptionInfo(notification.SubscriptionId);
+                SubscriptionStore subscription = subscriptionStore.GetSubscriptionInfo(notification.SubscriptionId.Value);
 
                 // Set the claims for ObjectIdentifier and TenantId, and              
                 // use the above claims for the current HttpContext

src/GraphWebhooks-Core/Controllers/SubscriptionController.cs

@@ -118,7 +118,7 @@ private async Task<Subscription> CreateSubscription(string userId, string tenant
             // This sample temporarily stores the subscription data, but production apps will likely use some method of persistent storage.
             // This sample stores the client state to validate the subscription, the tenant ID to reuse tokens, and the user ID to filter
             // messages to display by user.
-            subscriptionStore.SaveSubscriptionInfo(newSubscription.Id,
+            subscriptionStore.SaveSubscriptionInfo(Guid.Parse(newSubscription.Id),
                 newSubscription.ClientState,
                 userId,
                 tenantId);

src/GraphWebhooks-Core/GraphWebhooks-Core.csproj

@@ -32,7 +32,7 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="3.1.3" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Graph.Beta" Version="0.14.0-preview" />
+    <PackageReference Include="Microsoft.Graph.Beta" Version="0.17.0-preview" />
     <PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-preview" />
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />

src/GraphWebhooks-Core/Helpers/Interfaces/ISubscriptionStore.cs

@@ -3,12 +3,14 @@
  *  See LICENSE in the source repository root for complete license information.
  */
 
+using System;
+
 namespace GraphWebhooks_Core.Helpers.Interfaces
 {
     public interface ISubscriptionStore
     {
-        void SaveSubscriptionInfo(string subscriptionId, string clientState, string userId, string tenantId);
+        void SaveSubscriptionInfo(Guid subscriptionId, string clientState, string userId, string tenantId);
 
-        SubscriptionStore GetSubscriptionInfo(string subscriptionId);
+        SubscriptionStore GetSubscriptionInfo(Guid subscriptionId);
     }
 }

src/GraphWebhooks-Core/Helpers/SubscriptionStore.cs

@@ -13,7 +13,7 @@ public class SubscriptionStore : ISubscriptionStore
     {
         private readonly IMemoryCache memoryCache;
 
-        public string SubscriptionId { get; set; }
+        public Guid SubscriptionId { get; set; }
         public string ClientState { get; set; }
         public string UserId { get; set; }
         public string TenantId { get; set; }
@@ -24,7 +24,7 @@ public SubscriptionStore(IMemoryCache memoryCache)
             this.memoryCache = memoryCache;
         }
 
-        private SubscriptionStore(string subscriptionId, Tuple<string, string, string> parameters)
+        private SubscriptionStore(Guid subscriptionId, Tuple<string, string, string> parameters)
         {
             SubscriptionId = subscriptionId;
             ClientState = parameters.Item1;
@@ -36,14 +36,14 @@ private SubscriptionStore(string subscriptionId, Tuple<string, string, string> p
         // This info is required so the NotificationController can validate the subscription, retrieve an access token from the cache, and filter 
         // the messages this sample displays to the user.
         // Production apps typically use some method of persistent storage.
-        public void SaveSubscriptionInfo(string subscriptionId, string clientState, string userId, string tenantId)
+        public void SaveSubscriptionInfo(Guid subscriptionId, string clientState, string userId, string tenantId)
         {
             memoryCache.Set("subscriptionId_" + subscriptionId,
                 Tuple.Create(clientState, userId, tenantId),
                 new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(24)));
         }
 
-        public SubscriptionStore GetSubscriptionInfo(string subscriptionId)
+        public SubscriptionStore GetSubscriptionInfo(Guid subscriptionId)
         {
             Tuple<string, string, string> subscriptionParams = memoryCache.Get("subscriptionId_" + subscriptionId) as Tuple<string, string, string>;
             return new SubscriptionStore(subscriptionId, subscriptionParams);