Merge pull request #2361 from microsoftgraph/2280-get-mggroup-filter-with-special-characters-doesnt-work

timayabi2020 · web-flow · commit 993813769867 · 2023-11-03T08:56:14.000+03:00
Fix escaping of filter values with displayName
diff --git a/tools/Custom/PSCmdletExtensions.cs b/tools/Custom/PSCmdletExtensions.cs
@@ -14,6 +14,7 @@ namespace NamespacePrefixPlaceholder.PowerShell
     using System.Net.Http;
     using System.Threading;
     using System.Threading.Tasks;
+    using System.Text.RegularExpressions;
 
     internal static class PSCmdletExtensions
     {
@@ -28,7 +29,7 @@ internal static string UnescapeString(this PSCmdlet cmdlet, string value)
             try
             {
                 var unescapedString = Uri.UnescapeDataString(value);
-                return unescapedString.Replace('+', ' ');
+                return value.EndsWith("'") ? unescapedString: unescapedString.Replace('+', ' ');
             }
             catch (UriFormatException ex)
             {

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ namespace NamespacePrefixPlaceholder.PowerShell`
`14`	`14`	`using System.Net.Http;`
`15`	`15`	`using System.Threading;`
`16`	`16`	`using System.Threading.Tasks;`
	`17`	`+ using System.Text.RegularExpressions;`
`17`	`18`
`18`	`19`	`internal static class PSCmdletExtensions`
`19`	`20`	`{`
`@@ -28,7 +29,7 @@ internal static string UnescapeString(this PSCmdlet cmdlet, string value)`
`28`	`29`	`try`
`29`	`30`	`{`
`30`	`31`	`var unescapedString = Uri.UnescapeDataString(value);`
`31`		`- return unescapedString.Replace('+', ' ');`
	`32`	`+ return value.EndsWith("'") ? unescapedString: unescapedString.Replace('+', ' ');`
`32`	`33`	`}`
`33`	`34`	`catch (UriFormatException ex)`
`34`	`35`	`{`