Merge pull request #48 from microsoftgraph/mmainer/extPagingIssue

Handle cases where a filter is applied to an expanded navigation prop…

Author: MIchaelMainer

src/Microsoft.Graph.Core/Requests/BaseRequest.cs

@@ -327,7 +327,16 @@ private string InitializeUrl(string requestUrl)
                 var queryOptions = queryString.Split('&').Select(
                         queryValue =>
                         {
-                            var segments = queryValue.Split('=');
+                            // We want to split on the first occurrence of = since there are scenarios where a query option can 
+                            // have 'sub-query' options on navigation properties for $expand scenarios. This way we can properly
+                            // split the query option name/value into the QueryOption object. Take this for example:
+                            // $expand=extensions($filter=Id%20eq%20'SMB'%20)
+                            // We want to get '$expand' as the name and 'extensions($filter=Id%20eq%20'SMB'%20)' as the value
+                            // for QueryOption object.
+                            // OData URL conventions 5.1.2 System Query Option $expand
+                            // http://docs.oasis-open.org/odata/odata/v4.0/errata03/os/complete/part2-url-conventions/odata-v4.0-errata03-os-part2-url-conventions-complete.html#_Toc453752359
+
+                            var segments = queryValue.Split(new[] { '=' }, 2);
                             return new QueryOption(
                                 segments[0],
                                 segments.Length > 1 ? segments[1] : string.Empty);

tests/Microsoft.Graph.Test/Microsoft.Graph.Test.csproj

@@ -89,6 +89,7 @@
     <Compile Include="Requests\Extensions\MailFolderMessagesCollectionRequestBuilderExtensionsTests.cs" />
     <Compile Include="Requests\Functional\GraphTestBase.cs" />
     <Compile Include="Requests\Functional\MailTests.cs" />
+    <Compile Include="Requests\Functional\ContactTests.cs" />
     <Compile Include="Requests\Functional\UsersTests.cs" />
     <Compile Include="Requests\Generated\EntityWithReferenceRequestTests.cs" />
     <Compile Include="Requests\Generated\EntityReferenceRequestTests.cs" />

tests/Microsoft.Graph.Test/Requests/Functional/ContactTests.cs

@@ -0,0 +1,52 @@
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace Microsoft.Graph.Test.Requests.Functional
+{
+    [Ignore]
+    [TestClass]
+    public class ContactTests : GraphTestBase
+    {
+        // OData URL convention test to make sure we handle 'sub-query option' on expanded navigation properties.
+        // OData URL conventions 5.1.2 System Query Option $expand
+        [TestMethod]
+        public async Task ContactsExpandExtensionsPaging()
+        {
+            try
+            {
+                IUserContactsCollectionPage page = await graphClient.Me.Contacts.Request().Expand($"extensions($filter=Id eq 'Microsoft.OutlookServices.OpenTypeExtension.Com.Contoso.Mainer')").GetAsync();
+
+                // When expanding extensions, a filter must be provided to specify which extensions to expand. For example $expand=Extensions($filter=Id eq 'Com.Insightly.CRMOpportunity').
+                while (page.NextPageRequest != null)
+                {
+                    page = await page.NextPageRequest.GetAsync();
+                }
+            }
+            catch (Microsoft.Graph.ServiceException e)
+            {
+                Assert.Fail("Something happened, check out a trace. Error code: {0}", e.Error.Code);
+            }
+        }
+
+        [TestMethod]
+        public async Task GetContactsPaging()
+        {
+            try
+            {
+                IUserContactsCollectionPage page = await graphClient.Me.Contacts.Request().GetAsync();
+
+                while (page.NextPageRequest != null)
+                {
+                    page = await page.NextPageRequest.GetAsync();
+                }
+            }
+            catch (Microsoft.Graph.ServiceException e)
+            {
+                Assert.Fail("Something happened, check out a trace. Error code: {0}", e.Error.Code);
+            }
+        }
+    }
+}