diff --git a/AppServiceClient.cs b/AppServiceClient.cs index 3d706a5..db890e1 100644 --- a/AppServiceClient.cs +++ b/AppServiceClient.cs @@ -37,7 +37,7 @@ public AppServiceTable GetTable(string tableName) where E : class { string url = ApiUrl(apiName); Debug.Log(httpMethod.ToString() + " custom API Request Url: " + url); ZumoRequest request = new ZumoRequest(url, httpMethod, true, User); - yield return request.Request.Send(); + yield return request.Request.SendWebRequest(); request.ParseJson(callback); } @@ -49,7 +49,7 @@ public AppServiceTable GetTable(string tableName) where E : class { Debug.Log(httpMethod.ToString() + " custom API Request Url: " + url); ZumoRequest request = new ZumoRequest(url, httpMethod, true, User); request.AddBody(body); - yield return request.Request.Send(); + yield return request.Request.SendWebRequest(); request.ParseJson(callback); } diff --git a/ZumoClient.cs b/ZumoClient.cs index d233050..7242a12 100644 --- a/ZumoClient.cs +++ b/ZumoClient.cs @@ -38,7 +38,7 @@ public IEnumerator LoginWithTwitter(string accessToken, string accessTokenSecret string url = AppServiceAuthenticationProviderUrl(AuthenticationProvider.Twitter); var request = new ZumoRequest(url, Method.POST, false); request.AddBodyAccessTokenSecret(accessToken, accessTokenSecret); - yield return request.Request.Send(); + yield return request.Request.SendWebRequest(); LoggedIn(request, callback); } @@ -49,7 +49,7 @@ public IEnumerator LoginWithGoogle(string accessToken, string idToken, Action> callback = null) { } string url = string.Format("{0}/.auth/logout", Url); var request = new ZumoRequest(url, Method.POST, false, User); - yield return request.Request.Send(); + yield return request.Request.SendWebRequest(); if (callback == null) { yield break; } diff --git a/table/AppServiceTable.cs b/table/AppServiceTable.cs index 304372b..35d5e31 100644 --- a/table/AppServiceTable.cs +++ b/table/AppServiceTable.cs @@ -25,25 +25,25 @@ public override string ToString() { public IEnumerator Insert(T item, Action> callback = null) where T : new() { string url = TableUrl(_name); ZumoRequest request = new ZumoRequest(url, Method.POST, true, _client.User); - Debug.Log("Insert Request: " + url); + //Debug.Log("Insert Request: " + url); request.AddBody(item); - yield return request.Request.Send(); + yield return request.Request.SendWebRequest(); request.ParseJson(callback); } public IEnumerator Read(Action> callback = null) where T : new() { string url = TableUrl(_name); ZumoRequest request = new ZumoRequest(url, Method.GET, true, _client.User); - Debug.Log("Read Request: " + url); - yield return request.Request.Send(); + //Debug.Log("Read Request: " + url); + yield return request.Request.SendWebRequest(); request.ParseJsonArray(callback); } public IEnumerator Query(TableQuery query, Action> callback = null) where T : new() { string url = TableQueryUrl(_name, query.ToString()); ZumoRequest request = new ZumoRequest(url, Method.GET, true, _client.User); - Debug.Log("Query Request: " + url + " Query:" + query); - yield return request.Request.Send(); + //Debug.Log("Query Request: " + url + " Query:" + query); + yield return request.Request.SendWebRequest(); request.ParseJsonArray(callback); } @@ -51,9 +51,9 @@ public override string ToString() { string q = query.ToString(); string nestedQueryString = string.Format("{0}{1}$inlinecount=allpages", q, (q.Length > 1) ? "&" : "?"); string url = TableQueryUrl(_name, nestedQueryString); - Debug.Log("Query Request: " + url + " Paginated Query:" + query); + //Debug.Log("Query Request: " + url + " Paginated Query:" + query); ZumoRequest request = new ZumoRequest(url, Method.GET, true, _client.User); - yield return request.Request.Send(); + yield return request.Request.SendWebRequest(); request.ParseJsonNestedArray>("results", callback); } @@ -76,24 +76,24 @@ public override string ToString() { string url = TableUrl(_name, id); ZumoRequest request = new ZumoRequest(url, Method.PATCH, true, _client.User); request.AddBody(item); - Debug.Log("Update Request Url: " + url + " patch:" + item); - yield return request.Request.Send(); + //Debug.Log("Update Request Url: " + url + " patch:" + item); + yield return request.Request.SendWebRequest(); request.ParseJson(callback); } public IEnumerator Delete(string id, Action> callback = null) where T : new() { string url = TableUrl(_name, id); ZumoRequest request = new ZumoRequest(url, Method.DELETE, true, _client.User); - Debug.Log("Delete Request Url: " + url); - yield return request.Request.Send(); + //Debug.Log("Delete Request Url: " + url); + yield return request.Request.SendWebRequest(); request.ParseJson(callback); } public IEnumerator Lookup(string id, Action> callback = null) where T : new() { string url = TableUrl(_name, id); ZumoRequest request = new ZumoRequest(url, Method.GET, true, _client.User); - Debug.Log("Lookup Request Url: " + url); - yield return request.Request.Send(); + //Debug.Log("Lookup Request Url: " + url); + yield return request.Request.SendWebRequest(); request.ParseJson(callback); }