Merge pull request #10 from Unity3dAzure/azureappservices

Azure App Services

Author: deadlyfingers

Assets/MobileServices/README.md

@@ -1,15 +1,14 @@
 # Azure Mobile Services for Unity3d
-For game developers looking to use Azure Mobile Services in their Unity3D project. 
+For game developers looking to use Azure Mobile Services or Azure App Services in their Unity3D project.
 
-The REST service implements [UnityRestClient](https://github.com/ProjectStratus/UnityRestClient) which uses the JsonFx plugin. 
-Runs in UnityEditor and works on iOS, Android and Windows. 
+Also available as a [MobileServices Demo Project](https://github.com/Unity3dAzure/MobileServicesDemo) which will run inside UnityEditor and on iOS, Android and Windows. The demo project has got everything bundled in and does not require any additional assets to work. If you want to integrate with an existing Unity3d project then follow instructions below:
 
 ## How to add MobileServices into Unity3d project
 1. [Download UnityRestClient](https://github.com/ProjectStratus/UnityRestClient/archive/master.zip)
- 	* Copy 'plugins' and 'Source' into project `Assets` folder
+ 	* Copy JsonFx 'plugins' and the UnityRestClient 'Source' into project `Assets` folder
 2. [Download MobileServices](https://github.com/Unity3dAzure/MobileServices/archive/master.zip)  
-	* Copy 'MobileServices' into project `Assets` folder. 
-3. [Create a Mobile Service](https://manage.windowsazure.com)
+	* Copy 'MobileServices' into project `Assets` folder.
+3. Create an [Azure Mobile Service](https://manage.windowsazure.com) or an [Azure App Service](https://portal.azure.com)
 	* Create a table for app data.
 
 ## Supported Features
@@ -22,12 +21,12 @@ InvokeApi | Get custom API
 ### MobileServiceTable
 API | Description
 --- | -----------
-Insert | Create a new item. 
-Read | Get a list of items. 
-Update | Update an item’s data using id property. 
+Insert | Create a new item.
+Read | Get a list of items.
+Update | Update an item’s data using id property.
 Delete | Delete an item using id property.  
-Query | Get a list of results using a custom query. 
-Lookup | Get an item’s data using id property. 
+Query | Get a list of results using a custom query.
+Lookup | Get an item’s data using id property.
 
 ### MobileServiceClient Interface
 	void Login(MobileServiceAuthenticationProvider provider, string token, Action<IRestResponse<MobileServiceUser>> callback = null);
@@ -43,33 +42,33 @@ Lookup | Get an item’s data using id property.
 
 
 ## Sample usage
-
-```csharp
+```
 using UnityEngine;
 using System;
 using System.Net;
 using System.Collections.Generic;
 using RestSharp;
 using Pathfinding.Serialization.JsonFx;
 using Unity3dAzure.MobileServices;
+
 ```
 
-```csharp
+```
 private MobileServiceClient _client;
 private MobileServiceTable<TodoItem> _table;
 ```
 
-```csharp
+```
 void Start () {
 	_client = new MobileServiceClient(appUrl, appKey); // <- add your app connection strings here.
 	_table = _client.GetTable<TodoItem>("TodoItem");
 }
 ```
-
-```csharp
+```
 private void ReadItems() {
 	_table.Read<TodoItem>(OnReadItemsCompleted);
 }
+
 private void OnReadItemsCompleted(IRestResponse<List<TodoItem>> response) {
 	if ( response.StatusCode == HttpStatusCode.OK) {
 		Debug.Log("OnReadItemsCompleted data: " + response.Content);
@@ -82,4 +81,7 @@ private void OnReadItemsCompleted(IRestResponse<List<TodoItem>> response) {
 }
 ```
 
-Questions or tweet #Azure #GameDev [@deadlyfingers](https://twitter.com/deadlyfingers)
+## Dependencies
+The REST service implements [UnityRestClient](https://github.com/ProjectStratus/UnityRestClient) which uses [JsonFx](https://bitbucket.org/TowerOfBricks/jsonfx-for-unity3d-git/) to parse JSON data.
+
+Questions or tweet #Azure #GameDev [@deadlyfingers](https://twitter.com/deadlyfingers)

Assets/MobileServices/client/MobileServiceClient.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using System.Collections;
 using RestSharp;
 using System.Collections.Generic;
@@ -12,16 +12,16 @@
 namespace Unity3dAzure.MobileServices
 {
     public class MobileServiceClient : RestClient, IAzureMobileServiceClient
-    {        
+    {
         public string AppUrl { get; private set; }
         public string AppKey { get; private set; }
-        
+
         public MobileServiceUser User { get; set; }
-        
+
         public const string URI_API = "api/";
-        
+
         /// <summary>
-        /// Creates a new RestClient using Azure Mobile Service's Application Url
+        /// Creates a new RestClient using Azure Mobile Service's Application Url and App Key
         /// </summary>
         public MobileServiceClient(string appUrl, string appKey) : base(appUrl)
         {
@@ -35,6 +35,14 @@ public MobileServiceClient(string appUrl, string appKey) : base(appUrl)
             #endif
         }
 
+    		/// <summary>
+    		/// Creates a new RestClient using Azure App Service's Application Url
+    		/// </summary>
+    		public MobileServiceClient(string appUrl) : base(appUrl)
+    		{
+          AppUrl = appUrl;
+    		}
+
         public override string ToString()
         {
             return this.BaseUrl;
@@ -44,19 +52,20 @@ public MobileServiceTable<E> GetTable<E>(string tableName) where E : class
         {
             return new MobileServiceTable<E>(tableName, this);
         }
-        
+
         /// <summary>
         /// Client-directed single sign on (POST with access token)
         /// </summary>
         public void Login(MobileServiceAuthenticationProvider provider, string token, Action<IRestResponse<MobileServiceUser>> callback = null)
         {
-            string uri = "login/" + provider.ToString().ToLower();
+            string p = provider.ToString().ToLower();
+            string uri = IsAppService() ? ".auth/login/" + p : "login/" + p;
             ZumoRequest request = new ZumoRequest(this, uri, Method.POST);
             Debug.Log("Login Request Uri: " + uri + " access token: " + token);
             request.AddBodyAccessToken(token);
             this.ExecuteAsync(request, callback);
         }
-        
+
         /// <summary>
         /// TODO: Service login (using GET via webview)
         /// </summary>
@@ -66,9 +75,9 @@ public void Login(MobileServiceAuthenticationProvider provider)
             Debug.Log("TODO");
         }
         //*/
-        
+
         /// <summary>
-        // TODO: Implement custom API (using GET request)
+        /// TODO: Implement custom API (using GET request)
         /// </summary>
         public void InvokeApi<T>(string apiName, Action<IRestResponse<T>> callback = null) where T : new()
         {
@@ -78,6 +87,14 @@ public void Login(MobileServiceAuthenticationProvider provider)
             this.ExecuteAsync(request, callback);
         }
 
+        /// <summary>
+        /// Mobile Service uses an AppKey, but App Service does not.
+        /// </summary>
+        public bool IsAppService()
+        {
+          return String.IsNullOrEmpty(AppKey);
+        }
+
         #if !NETFX_CORE || UNITY_ANDROID
         private bool RemoteCertificateValidationCallback(System.Object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
         {

Assets/MobileServices/http/ZumoRequest.cs

@@ -8,8 +8,15 @@ public class ZumoRequest : RestRequest
     {
         public ZumoRequest(MobileServiceClient client, string uri, Method httpMethod) : base(uri, httpMethod)
         {
-            this.AddHeader("X-ZUMO-APPLICATION", client.AppKey);
-            //this.AddHeader("Content-Type", "application/json; charset=UTF-8"); // this line caused winrt app to not connect
+            if (client.IsAppService())
+            {
+              // App Service headers
+              this.AddHeader("ZUMO-API-VERSION", "2.0.0");
+            } else {
+              // Mobile Service headers
+              this.AddHeader("X-ZUMO-APPLICATION", client.AppKey);
+            }
+
             this.AddHeader("Accept", "application/json");
             this.RequestFormat = DataFormat.Json;
             if (client.User != null && !string.IsNullOrEmpty(client.User.authenticationToken))