[client][managed][offline] Allow relative URI in read and invokeapi

Azure · Oct 9, 2014 · 5b3c6b3 · 5b3c6b3
1 parent 53bc24f
commit 5b3c6b3
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 3 deletions.
diff --git a/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices/MobileServiceClient.cs b/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices/MobileServiceClient.cs
@@ -549,7 +549,7 @@ private async Task<string> InternalInvokeApiAsync(string apiName, string content
         /// <returns></returns>
         private string CreateAPIUriString(string apiName, IDictionary<string, string> parameters = null)
         {
-            string uriFragment = string.Format(CultureInfo.InvariantCulture, "api/{0}", apiName);
+            string uriFragment = apiName.StartsWith("/") ? apiName : string.Format(CultureInfo.InvariantCulture, "api/{0}", apiName);
             string queryString = MobileServiceUrlBuilder.GetQueryString(parameters, useTableAPIRules: false);
 
             return MobileServiceUrlBuilder.CombinePathAndQuery(uriFragment, queryString);

diff --git a/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices/Table/MobileServiceTable.Generic.cs b/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices/Table/MobileServiceTable.Generic.cs
@@ -95,7 +95,7 @@ public Task<IEnumerable<U>> ReadAsync<U>(IMobileServiceTableQuery<U> query)
         [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "Generic are not nested when used via async.")]
         public async Task<IEnumerable<U>> ReadAsync<U>(string query)
         {
-            QueryResult result = await base.ReadAsync(query, null, MobileServiceFeatures.TypedTable | MobileServiceFeatures.ReadWithLinkHeader);
+            QueryResult result = await base.ReadAsync(query, null, MobileServiceFeatures.TypedTable);
 
             return new QueryResultEnumerable<U>(
                 result.TotalCount,

diff --git a/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices/Table/MobileServiceTable.cs b/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices/Table/MobileServiceTable.cs
@@ -149,7 +149,12 @@ internal virtual async Task<QueryResult> ReadAsync(string query, IDictionary<str
 
             string uriPath;
             Uri uri;
-            if (Uri.TryCreate(query, UriKind.Absolute, out uri))
+            if (query.StartsWith("/") && Uri.TryCreate(this.MobileServiceClient.ApplicationUri, query, out uri))
+            {
+                uriPath = uri.GetComponents(UriComponents.Scheme | UriComponents.UserInfo | UriComponents.Host | UriComponents.Port | UriComponents.Path, UriFormat.UriEscaped);
+                query = uri.Query;
+            }
+            else if (Uri.TryCreate(query, UriKind.Absolute, out uri))
             {
                 features |= MobileServiceFeatures.ReadWithLinkHeader;
                 uriPath = uri.GetComponents(UriComponents.Scheme | UriComponents.UserInfo | UriComponents.Host | UriComponents.Port | UriComponents.Path, UriFormat.UriEscaped);

diff --git a/...ged/test/Microsoft.WindowsAzure.MobileServices.Test/UnitTests/MobileServiceClient.Test.cs b/...ged/test/Microsoft.WindowsAzure.MobileServices.Test/UnitTests/MobileServiceClient.Test.cs
@@ -425,6 +425,19 @@ public async Task InvokeCustomAPIGet()
             Assert.AreEqual(3, expected.Id);
         }
 
+        [AsyncTestMethod]
+        public async Task InvokeApiAsync_DoesNotAppendApiPath_IfApiStartsWithSlash()
+        {
+            TestHttpHandler hijack = new TestHttpHandler();
+            var service = new MobileServiceClient("http://www.test.com", "secret...", hijack);
+            hijack.SetResponseContent("{\"id\":3}");
+
+            await service.InvokeApiAsync<IntType>("/calculator/add?a=1&b=2", HttpMethod.Get, null);
+
+            Assert.AreEqual(hijack.Request.RequestUri.LocalPath, "/calculator/add");
+            Assert.Contains(hijack.Request.RequestUri.Query, "a=1&b=2");
+        }
+
         [AsyncTestMethod]
         public async Task InvokeCustomAPIGetJToken()
         {

diff --git a/...osoft.WindowsAzure.MobileServices.Test/UnitTests/Table/MobileServiceTable.Generic.Test.cs b/...osoft.WindowsAzure.MobileServices.Test/UnitTests/Table/MobileServiceTable.Generic.Test.cs
@@ -35,6 +35,40 @@ public async Task ReadAsync_WithAbsoluteUri_Generic()
             Assert.AreEqual("http://wwww.contoso.com/about?$filter=a eq b&$orderby=c", hijack.Request.RequestUri.ToString());
         }
 
+        [AsyncTestMethod]
+        public async Task ReadAsync_WithRelativeUri_Generic()
+        {
+            var data = new[]
+            {
+                new 
+                {
+                    ServiceUri = "http://www.test.com", 
+                    QueryUri = "/about?$filter=a eq b&$orderby=c", 
+                    RequestUri = "http://www.test.com/about?$filter=a eq b&$orderby=c"
+                },
+                new 
+                {
+                    ServiceUri = "http://www.test.com/", 
+                    QueryUri = "/about?$filter=a eq b&$orderby=c", 
+                    RequestUri = "http://www.test.com/about?$filter=a eq b&$orderby=c"
+                }
+            };
+
+            foreach (var item in data)
+            {
+                var hijack = new TestHttpHandler();
+                hijack.SetResponseContent("[{\"col1\":\"Hey\"}]");
+                IMobileServiceClient service = new MobileServiceClient(item.ServiceUri, "secret...", hijack);
+
+                IMobileServiceTable<ToDo> table = service.GetTable<ToDo>();
+
+                await table.ReadAsync<ToDo>(item.QueryUri);
+
+                Assert.AreEqual("TT", hijack.Request.Headers.GetValues("X-ZUMO-FEATURES").First());
+                Assert.AreEqual(item.RequestUri, hijack.Request.RequestUri.ToString());
+            }
+        }
+
         [AsyncTestMethod]
         public async Task ReadAsync_Returns_IQueryResultEnumerable()
         {

diff --git a/...est/Microsoft.WindowsAzure.MobileServices.Test/UnitTests/Table/MobileServiceTable.Test.cs b/...est/Microsoft.WindowsAzure.MobileServices.Test/UnitTests/Table/MobileServiceTable.Test.cs
@@ -236,6 +236,39 @@ public async Task ReadAsync_WithAbsoluteUri()
             Assert.AreEqual("http://wwww.contoso.com/about/?$filter=a eq b&$orderby=c", hijack.Request.RequestUri.ToString());
         }
 
+        [AsyncTestMethod]
+        public async Task ReadAsync_WithRelativeUri()
+        {
+            var data = new[]
+            {
+                new 
+                {
+                    ServiceUri = "http://www.test.com", 
+                    QueryUri = "/about?$filter=a eq b&$orderby=c", 
+                    RequestUri = "http://www.test.com/about?$filter=a eq b&$orderby=c"
+                },
+                new 
+                {
+                    ServiceUri = "http://www.test.com/", 
+                    QueryUri = "/about?$filter=a eq b&$orderby=c", 
+                    RequestUri = "http://www.test.com/about?$filter=a eq b&$orderby=c"
+                }
+            };
+
+            foreach (var item in data)
+            {
+                var hijack = new TestHttpHandler();
+                hijack.SetResponseContent("[{\"String\":\"Hey\"}]");
+                IMobileServiceClient service = new MobileServiceClient(item.ServiceUri, "secret...", hijack);
+
+                IMobileServiceTable table = service.GetTable("someTable");
+
+                await table.ReadAsync(item.QueryUri);
+
+                Assert.AreEqual(item.RequestUri, hijack.Request.RequestUri.ToString());
+            }
+        }
+
         [AsyncTestMethod]
         public async Task ReadAsyncWithStringIdFilter()
         {