Made corrections as per comment from reviewer

Author: timayabi2020

src/Authentication/Authentication/Helpers/EncodeUriPath.cs

@@ -15,17 +15,24 @@ public static class EncodeUriPaths
     {
         public static Uri EscapeDataStrings(this Uri uri)
         {
-            if(uri.Query.Length > 0)
-                return uri;
             int counter = 0;
             var pathSegments = uri.OriginalString.Split('/');
             StringBuilder sb = new StringBuilder();
-            foreach (var segment in pathSegments)
+            foreach (var s in pathSegments)
             {
+                var segment = s;
                 //Skips the left part of the uri i.e https://graph.microsoft.com
                 if (counter > 2)
                 {
                     sb.Append('/');
+                    if(s.Contains("?"))
+                    {
+                        var queryStringIndex = segment.IndexOf("?");
+                        string queryString = segment.Substring(queryStringIndex);
+                        segment = s.Substring(0, queryStringIndex);
+                        sb.Append(Uri.EscapeDataString(segment));
+                        sb.Append(queryString);
+                    }
                     sb.Append(Uri.EscapeDataString(segment));
                 }
                 counter++;