Merge pull request #1730 from microsoftgraph/dev

Merge dev into master
microsoftgraph · Aug 23, 2023 · 9103728 · 9103728
2 parents 5e280f5 + 2e74ed4
commit 9103728
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 45 deletions.
diff --git a/CodeSnippetsReflection.OpenAPI.Test/GraphCliGeneratorTests.cs b/CodeSnippetsReflection.OpenAPI.Test/GraphCliGeneratorTests.cs
@@ -253,8 +253,8 @@ public void GeneratesSnippetsForCommandWithConflictingPathAndHeaderParameterName
     }
 
     [Theory]
-    [InlineData("?$select=name", " --select name")]
-    [InlineData("?$filter=test&$select=name", " --filter test --select name")]
+    [InlineData("?$select=name", " --select \"name\"")]
+    [InlineData("?$filter=test&$select=name", " --filter \"test\" --select \"name\"")]
     public async Task GeneratesSnippetsForCommandWithODataParameters(string queryString, string commandOptions)
     {
         // Given
@@ -306,7 +306,7 @@ public void GeneratesSnippetsForCommandWithQueryParameters()
 
         // Then
         // TODO: What should happen to the query parameter?
-        Assert.Equal(notice + Environment.NewLine + "mgc tests get --id 10", result);
+        Assert.Equal(notice + Environment.NewLine + "mgc tests get --id \"10\"", result);
     }
 
     [Theory]
@@ -494,7 +494,7 @@ public async Task GeneratesSnippetsWithExpandQueryOptions()
         var result = _generator.GenerateCodeSnippet(snippetModel);
 
         // Then
-        Assert.Equal(notice + Environment.NewLine + "mgc users messages get --user-id {user-id} --message-id {message-id} --expand \"singleValueExtendedProperties(`$filter=id eq 'XXXX')\"", result);
+        Assert.Equal(notice + Environment.NewLine + "mgc users messages get --user-id {user-id} --message-id {message-id} --expand \"singleValueExtendedProperties(\\$filter=id eq 'XXXX')\"", result);
     }
     [Fact]
     public async Task GeneratesSnippetsWithFilterQueryOptions()
@@ -523,6 +523,6 @@ public async Task GeneratesSnippetsForHttpSnippetsWithUrlEncodedValuesForSystemQ
         var result = _generator.GenerateCodeSnippet(snippetModel);
 
         // Then
-        Assert.Equal(notice + Environment.NewLine + "mgc teams members list --team-id {team-id} --filter \"(microsoft.graph.aadUserConversationMember/displayName eq 'Harry Johnson' or microsoft.graph.aadUserConversationMember/email eq '[email protected]')\"", result);
+        Assert.Equal(notice + Environment.NewLine + "mgc teams members list --team-id {team-id} --filter \"(microsoft.graph.aadUserConversationMember/displayName%20eq%20'Harry%20Johnson'%20or%20microsoft.graph.aadUserConversationMember/email%20eq%20'[email protected]')\"", result);
     }
 }
diff --git a/CodeSnippetsReflection.OpenAPI.Test/PhpGeneratorTests.cs b/CodeSnippetsReflection.OpenAPI.Test/PhpGeneratorTests.cs
@@ -1,4 +1,5 @@
-using System.Net.Http;
+using System;
+using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using CodeSnippetsReflection.OpenAPI.LanguageGenerators;
@@ -144,8 +145,8 @@ public async Task GenerateForGroupPostTestSpacing()
         };
         var snippetModel = new SnippetModel(requestPayload, ServiceRootUrl, await GetV1SnippetMetadata());
         var result = _generator.GenerateCodeSnippet(snippetModel);
-        Assert.Contains("$requestBody = new Group();\n" +
-                        "$requestBody->setDescription('Self help community for library');\n" +
+        Assert.Contains($"$requestBody = new Group();{Environment.NewLine}" +
+                        $"$requestBody->setDescription('Self help community for library');{Environment.NewLine}" +
                         "$requestBody->setDisplayName('Library Assist');", result);
     }
     [Fact]
@@ -874,7 +875,7 @@ public async Task GenerateWithComplexArray()
         };
         var snippetModel = new SnippetModel(requestPayload, ServiceRootUrl, await GetV1SnippetMetadata());
         var result = _generator.GenerateCodeSnippet(snippetModel);
-        Assert.Contains("'[email protected]' => [\n"+
+        Assert.Contains($"'[email protected]' => [{Environment.NewLine}"+
         "'https://graph.microsoft.com/v1.0/users/26be1845-4119-4801-a799-aea79d09f1a2', ],", result);
     }
 }
diff --git a/CodeSnippetsReflection.OpenAPI/LanguageGenerators/GraphCliGenerator.cs b/CodeSnippetsReflection.OpenAPI/LanguageGenerators/GraphCliGenerator.cs
@@ -17,8 +17,7 @@ public partial class GraphCliGenerator : ILanguageGenerator<SnippetModel, OpenAp
     private static readonly Regex overloadedBoundedFunctionWithSingleOrMultipleParameters = new(@"\w+\([a-zA-Z,={}'-]+\)", RegexOptions.Compiled, TimeSpan.FromSeconds(5));
     private static readonly Regex overloadedBoundedHyphenatedFunctionWithSingleOrMultipleParameters = new(@"(?:\w+-)+\w+\([a-zA-Z,={}'-]+\)", RegexOptions.Compiled, TimeSpan.FromSeconds(5));
     private static readonly Regex unBoundFunctionRegex = new(@"^[0-9a-zA-Z\- \/_?:.,\s]+\(\)", RegexOptions.Compiled, TimeSpan.FromSeconds(5));
-    private static readonly Regex systemQueryOptionRegex = new(@"\w*=\w*\(\D*|\d*\)", RegexOptions.Compiled, TimeSpan.FromSeconds(5));
-
+
     private const string PathItemsKey = "default";
 
     public string GenerateCodeSnippet(SnippetModel snippetModel)
@@ -185,8 +184,8 @@ private static void FetchOverLoadedBoundFunctions(List<string> commandSegments,
     /// <param name="segment"></param>
     /// <param name="operation"></param>
     /// <returns></returns>
-    private static (string,string) ProcessOverloadedBoundFunctions(string segment, string operation)
-    {   
+    private static (string, string) ProcessOverloadedBoundFunctions(string segment, string operation)
+    {
         StringBuilder parameterBuilder = new StringBuilder();
         StringBuilder SegmentBuilder = new StringBuilder();
         var functionItems = segment.Split("(");
@@ -198,8 +197,8 @@ private static (string,string) ProcessOverloadedBoundFunctions(string segment, s
         foreach (var parameter in parameters)
         {
             var parameterValue = parameter.Split("=")[0];
-            var updateSegmentDetails = !parameterValue.Contains("-id")? parameterValue + " {" + parameterValue + "-id}" : parameterValue + " {" + parameterValue + "}";
-            parameterBuilder.Append(parameters.Length>1?$"--{updateSegmentDetails} ": $"--{updateSegmentDetails}");
+            var updateSegmentDetails = !parameterValue.Contains("-id") ? parameterValue + " {" + parameterValue + "-id}" : parameterValue + " {" + parameterValue + "}";
+            parameterBuilder.Append(parameters.Length > 1 ? $"--{updateSegmentDetails} " : $"--{updateSegmentDetails}");
             var updatedSegment = $"-with-{parameterValue}";
             SegmentBuilder.Append(updatedSegment);
         }
@@ -231,32 +230,36 @@ private static IDictionary<string, string> ProcessHeaderParameters([NotNull] in
     private static IDictionary<string, string> ProcessQueryParameters([NotNull] in SnippetModel snippetModel)
     {
         IDictionary<string, string> splitQueryString = new Dictionary<string, string>();
+
         if (!string.IsNullOrWhiteSpace(snippetModel.QueryString))
         {
-            if (systemQueryOptionRegex.IsMatch(snippetModel.QueryString))
-            {
-                string pattern = "\\?\\$\\w*=";
-                string[] splittedQueryString = Regex.Split(snippetModel.QueryString, pattern, RegexOptions.Compiled, TimeSpan.FromSeconds(5));
-                string queryOptionFunction = HttpUtility.UrlDecode(splittedQueryString[1]);
-                var match = Regex.Match(snippetModel.QueryString, pattern, RegexOptions.Compiled, TimeSpan.FromSeconds(5));
-                string queryOption = match.Groups[0].Value.Replace("?", string.Empty, StringComparison.OrdinalIgnoreCase).Replace("=", string.Empty, StringComparison.OrdinalIgnoreCase);
-                queryOptionFunction = queryOptionFunction.Replace("$", "`$", StringComparison.OrdinalIgnoreCase);
-                queryOptionFunction = queryOptionFunction.Replace(queryOptionFunction, "\"" + queryOptionFunction + "\"", StringComparison.Ordinal);
-                splitQueryString.Add(queryOption, queryOptionFunction);
-            }
-            else
-            {
-                splitQueryString = snippetModel.QueryString
-                        .Remove(0, 1)
-                        .Split('&')
-                        .Select(static q =>
+            splitQueryString = snippetModel.QueryString
+                    .Remove(0, 1)
+                    .Split('&')
+                    .Select(static q =>
+                    {
+                        if (q.Contains("("))
                         {
-                            var x = q.Split('=');
-                            return x.Length > 1 ? (x[0], x[1]) : (x[0], string.Empty);
-                        })
-                        .Where(static t => !string.IsNullOrWhiteSpace(t.Item2))
-                        .ToDictionary(static t => t.Item1, static t => t.Item2);
-            }
+                            var qs = q;
+                            int fl = q.Length;
+                            qs = qs.Substring(0, qs.IndexOf("("));
+                            int isl = qs.Length;
+                            StringBuilder sb = new();
+                            for (int i = isl; i < fl; i++)
+                            {
+                                sb.Append(q[i]);
+                            }
+                            var xs = qs.Split("=");
+                            return xs.Length > 1 ? (xs[0], xs[1] + sb.Replace("$", "\\$")) : (xs[0], string.Empty);
+
+                        }
+
+                        var x = q.Split('=');
+                        return x.Length > 1 ? (x[0], x[1]) : (x[0], string.Empty);
+                    })
+                    .Where(static t => !string.IsNullOrWhiteSpace(t.Item2))
+                    .ToDictionary(static t => t.Item1, static t => t.Item2);
+
         }
 
         return splitQueryString;
@@ -394,7 +397,7 @@ private static void AddParameterToDictionary([NotNull] ref Dictionary<string, st
         }
         else
         {
-            parameters.Add(key, paramValue);
+            parameters.Add(key, !paramValue.Contains("{") ? $"\"{paramValue}\"" : paramValue);
         }
     }
 
@@ -456,7 +459,7 @@ private static string NormalizeToOption(in string input)
         return result.ToLower();
     }
 
-    [GeneratedRegex("(?<=[a-z])([A-Z])", RegexOptions.Compiled)]
+    [GeneratedRegex("(?<=[0-9a-z])([A-Z])", RegexOptions.Compiled)]
     private static partial Regex CamelCaseRegex();
 
     [GeneratedRegex("(?<=[a-z])[-_\\.]+([A-Za-z])", RegexOptions.Compiled)]

diff --git a/PermissionsService/Services/PermissionsStore.cs b/PermissionsService/Services/PermissionsStore.cs
@@ -353,6 +353,7 @@ await Parallel.ForEachAsync(uniqueRequests, async (request, _) =>
                             RequestUrl = request.RequestUrl,
                             Message = exception.Message
                         });
+                        _telemetryClient?.TrackException(exception);
                     }
                 });
 

diff --git a/UriMatchService/UriTemplateMatcher.cs b/UriMatchService/UriTemplateMatcher.cs
@@ -74,7 +74,7 @@ public TemplateMatch Match(Uri uri)
                 {
                     if (parameters.Count == 0)
                         return new TemplateMatch() { Key = template.Key, Template = template.Value }; // exact match, no ids
-                    else 
+                    else if (!templateMatches.ContainsKey(template))
                         templateMatches.Add(template, parameters.Count);
                 }
             }
@@ -112,13 +112,18 @@ private IDictionary<string, string> GetParameters(Uri uri, string template)
         {
             Regex parameterRegex = null;
 
-            if (parameterRegex == null)
+            int count = 0;
+            template = placeholderRegex.Replace(template, m => $"{{{++count}}}");
+            var matchingRegex = CreateMatchingRegex(template);
+
+            try
             {
-                int count = 0;
-                template = placeholderRegex.Replace(template, m => $"{{{++count}}}");
-                var matchingRegex = CreateMatchingRegex(template);
                 parameterRegex = new Regex(matchingRegex, RegexOptions.None, TimeSpan.FromSeconds(5));
             }
+            catch (Exception)
+            {
+                return null;
+            }
 
             var match = parameterRegex.Match(uri.OriginalString);
             var parameters = new Dictionary<string, string>();
-Original file line number
+Diff line change
@@ Expand Up @@
                                 RequestUrl = request.RequestUrl,
                                 Message = exception.Message
                             });
+                            _telemetryClient?.TrackException(exception);
                         }
                     });
@@ Expand Down @@