Sanitize JSON output before parsing in ClientAppValidator (#147)

Author: rahuldevikar761

src/Microsoft.Agents.A365.DevTools.Cli/Services/ClientAppValidator.cs

@@ -4,6 +4,7 @@
 using Microsoft.Agents.A365.DevTools.Cli.Constants;
 using Microsoft.Agents.A365.DevTools.Cli.Exceptions;
 using Microsoft.Agents.A365.DevTools.Cli.Helpers;
+using Microsoft.Agents.A365.DevTools.Cli.Services.Helpers;
 using Microsoft.Extensions.Logging;
 using System.Text.Json;
 using System.Text.Json.Nodes;
@@ -168,7 +169,8 @@ public async Task EnsureRedirectUrisAsync(
                 return;
             }
 
-            var response = JsonNode.Parse(appCheckResult.StandardOutput);
+            var sanitizedOutput = JsonDeserializationHelper.CleanAzureCliJsonOutput(appCheckResult.StandardOutput);
+            var response = JsonNode.Parse(sanitizedOutput);
             var apps = response?["value"]?.AsArray();
 
             if (apps == null || apps.Count == 0)
@@ -307,7 +309,8 @@ public async Task EnsureRedirectUrisAsync(
             }
         }
 
-        var appResponse = JsonNode.Parse(appCheckResult.StandardOutput);
+        var sanitizedOutput = JsonDeserializationHelper.CleanAzureCliJsonOutput(appCheckResult.StandardOutput);
+        var appResponse = JsonNode.Parse(sanitizedOutput);
         var apps = appResponse?["value"]?.AsArray();
 
         if (apps == null || apps.Count == 0)
@@ -409,7 +412,8 @@ private async Task<Dictionary<string, string>> ResolvePermissionIdsAsync(string
                 return permissionNameToIdMap;
             }
 
-            var graphSpResponse = JsonNode.Parse(graphSpResult.StandardOutput);
+            var sanitizedOutput = JsonDeserializationHelper.CleanAzureCliJsonOutput(graphSpResult.StandardOutput);
+            var graphSpResponse = JsonNode.Parse(sanitizedOutput);
             var graphSps = graphSpResponse?["value"]?.AsArray();
 
             if (graphSps == null || graphSps.Count == 0)
@@ -470,7 +474,8 @@ private async Task<HashSet<string>> GetConsentedPermissionsAsync(string clientAp
                 return consentedPermissions;
             }
 
-            var spResponse = JsonNode.Parse(spCheckResult.StandardOutput);
+            var sanitizedOutput = JsonDeserializationHelper.CleanAzureCliJsonOutput(spCheckResult.StandardOutput);
+            var spResponse = JsonNode.Parse(sanitizedOutput);
             var servicePrincipals = spResponse?["value"]?.AsArray();
 
             if (servicePrincipals == null || servicePrincipals.Count == 0)
@@ -499,7 +504,8 @@ private async Task<HashSet<string>> GetConsentedPermissionsAsync(string clientAp
                 return consentedPermissions;
             }
 
-            var grantsResponse = JsonNode.Parse(grantsResult.StandardOutput);
+            var sanitizedGrantsOutput = JsonDeserializationHelper.CleanAzureCliJsonOutput(grantsResult.StandardOutput);
+            var grantsResponse = JsonNode.Parse(sanitizedGrantsOutput);
             var grants = grantsResponse?["value"]?.AsArray();
 
             if (grants == null || grants.Count == 0)
@@ -549,7 +555,8 @@ private async Task<bool> ValidateAdminConsentAsync(string clientAppId, string gr
             return true; // Best-effort check - will be verified during first interactive authentication
         }
 
-        var spResponse = JsonNode.Parse(spCheckResult.StandardOutput);
+        var sanitizedOutput = JsonDeserializationHelper.CleanAzureCliJsonOutput(spCheckResult.StandardOutput);
+        var spResponse = JsonNode.Parse(sanitizedOutput);
         var servicePrincipals = spResponse?["value"]?.AsArray();
 
         if (servicePrincipals == null || servicePrincipals.Count == 0)
@@ -579,7 +586,8 @@ private async Task<bool> ValidateAdminConsentAsync(string clientAppId, string gr
             return true; // Best-effort check
         }
 
-        var grantsResponse = JsonNode.Parse(grantsCheckResult.StandardOutput);
+        var sanitizedGrantsOutput = JsonDeserializationHelper.CleanAzureCliJsonOutput(grantsCheckResult.StandardOutput);
+        var grantsResponse = JsonNode.Parse(sanitizedGrantsOutput);
         var grants = grantsResponse?["value"]?.AsArray();
 
         if (grants == null || grants.Count == 0)