Merge pull request #112 from microsoftgraph/dependabot/nuget/src/Microsoft.Graph-6.8.0

Bump Microsoft.Graph from 5.55.0 to 6.8.0

Author: jasonjoh

src/GitHubConnector.csproj

@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Graph" Version="5.55.0" />
+    <PackageReference Include="Microsoft.Graph" Version="6.8.0" />
     <PackageReference Include="Octokit" Version="14.0.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Services/SearchConnectorService.cs

@@ -7,6 +7,7 @@
 using Microsoft.Graph;
 using Microsoft.Graph.External.Connections.Item.Items.Item.MicrosoftGraphExternalConnectorsAddActivities;
 using Microsoft.Graph.Models.ExternalConnectors;
+using Microsoft.Kiota.Abstractions.Serialization;
 using Microsoft.Kiota.Authentication.Azure;
 
 namespace GitHubConnector.Services;
@@ -149,10 +150,7 @@ public SearchConnectorService(AppSettings settings)
                     {
                         Id = itemType == "issues" ? "issueDisplay" : "repoDisplay",
                         Priority = 1,
-                        Layout = new()
-                        {
-                            AdditionalData = await GetResultTemplateAsync(resultCardJsonFile),
-                        },
+                        Layout = await GetResultTemplateAsync(resultCardJsonFile),
                     },
                 ],
             },
@@ -280,10 +278,32 @@ public Task<Identity> GetIdentityForGitHubUserAsync(string? gitHubLogin)
         });
     }
 
-    private static async Task<Dictionary<string, object>> GetResultTemplateAsync(string resultCardJsonFile)
+    private static async Task<UntypedNode> GetResultTemplateAsync(string resultCardJsonFile)
     {
         var cardContents = await File.ReadAllTextAsync(resultCardJsonFile);
-        return JsonSerializer.Deserialize<Dictionary<string, object>>(cardContents) ??
-            throw new Exception($"Could not deserialize contents of {resultCardJsonFile}");
+        using var cardJson = JsonDocument.Parse(cardContents);
+        return ToUntypedNode(cardJson.RootElement);
+    }
+
+    private static UntypedNode ToUntypedNode(JsonElement element)
+    {
+        return element.ValueKind switch
+        {
+            JsonValueKind.Object => new UntypedObject(element.EnumerateObject()
+                .ToDictionary(property => property.Name, property => ToUntypedNode(property.Value))),
+            JsonValueKind.Array => new UntypedArray(element.EnumerateArray().Select(ToUntypedNode)),
+            JsonValueKind.String => new UntypedString(element.GetString()!),
+            JsonValueKind.Number => element.TryGetInt32(out var intValue) ?
+                new UntypedInteger(intValue) :
+                element.TryGetInt64(out var longValue) ?
+                    new UntypedLong(longValue) :
+                    element.TryGetDecimal(out var decimalValue) ?
+                        new UntypedDecimal(decimalValue) :
+                        new UntypedDouble(element.GetDouble()),
+            JsonValueKind.True => new UntypedBoolean(true),
+            JsonValueKind.False => new UntypedBoolean(false),
+            JsonValueKind.Null => new UntypedNull(),
+            _ => throw new JsonException($"Unsupported JSON value: {element.ValueKind}"),
+        };
     }
 }