Merge pull request #11 from ethereum-boilerplate/features/webql-unitask

Incorporate support for Unity3D  WebGL applications.

Author: xactant

Assembly-CSharp-Editor.csproj

@@ -743,10 +743,18 @@
       <Project>{33C7F2A2-4AEA-64FB-8DAF-0F32154145E8}</Project>
       <Name>Assembly-CSharp</Name>
     </ProjectReference>
+    <ProjectReference Include="UniTask.TextMeshPro.csproj">
+      <Project>{DD9FBA50-F34C-8139-B3B5-343F4D69F34A}</Project>
+      <Name>UniTask.TextMeshPro</Name>
+    </ProjectReference>
     <ProjectReference Include="LeanCommon.csproj">
       <Project>{5F33B1B9-9801-72E3-D3B6-0BE732F8089A}</Project>
       <Name>LeanCommon</Name>
     </ProjectReference>
+    <ProjectReference Include="UniTask.DOTween.csproj">
+      <Project>{4DC51B1B-0F5A-CF2E-4B59-76AB2FC4943F}</Project>
+      <Name>UniTask.DOTween</Name>
+    </ProjectReference>
     <ProjectReference Include="LeanGUI.csproj">
       <Project>{1A6356EB-DA13-4D05-E0A2-B4102EFEEE87}</Project>
       <Name>LeanGUI</Name>
@@ -755,10 +763,22 @@
       <Project>{E15FCF00-000C-B7F6-0240-791AF76D32E0}</Project>
       <Name>endel.nativewebsocket</Name>
     </ProjectReference>
+    <ProjectReference Include="UniTask.csproj">
+      <Project>{476CBF30-A1C6-5E8D-1CA3-CF359CC96538}</Project>
+      <Name>UniTask</Name>
+    </ProjectReference>
+    <ProjectReference Include="UniTask.Addressables.csproj">
+      <Project>{F5CC6268-57BF-FB81-A497-522C5BACBDF9}</Project>
+      <Name>UniTask.Addressables</Name>
+    </ProjectReference>
     <ProjectReference Include="LeanTransition.Editor.csproj">
       <Project>{2E294EDD-27B9-9A60-ECFB-0CE5E06F28CE}</Project>
       <Name>LeanTransition.Editor</Name>
     </ProjectReference>
+    <ProjectReference Include="UniTask.Linq.csproj">
+      <Project>{8F73A630-12B8-86C2-A4F6-C50A8728D121}</Project>
+      <Name>UniTask.Linq</Name>
+    </ProjectReference>
     <ProjectReference Include="LeanTransition.csproj">
       <Project>{03A0A499-4A5D-BF38-396D-7221417375F7}</Project>
       <Name>LeanTransition</Name>

Assembly-CSharp.Player.csproj

@@ -27,9 +27,6 @@
  *  SOFTWARE.
  */
 using System.Collections.Generic;
-using System.Threading.Tasks;
-using Moralis.Platform;
-using Moralis.Platform.Objects;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
@@ -38,6 +35,16 @@
 using Assets.Scripts;
 using Assets;
 
+#if UNITY_WEBGL
+using Cysharp.Threading.Tasks;
+using Moralis.WebGL.Platform;
+using Moralis.WebGL.Platform.Objects;
+#else
+using System.Threading.Tasks;
+using Moralis.Platform;
+using Moralis.Platform.Objects;
+#endif
+
 /// <summary>
 /// Example class that demonstrates a game menu that incorporates Wallet 
 /// Connect and Moralis Authentication.
@@ -55,7 +62,7 @@ public class MainMenuScript : MonoBehaviour
 
     Image menuBackground;
 
-    void Start()
+    async void Start()
     {
         menuBackground = (Image)gameObject.GetComponent(typeof(Image));
 
@@ -74,7 +81,7 @@ void Start()
         joystick.SetActive(true);
 #endif
 
-        MoralisInterface.Initialize(MoralisApplicationId, MoralisServerURI, hostManifestData);
+        await MoralisInterface.Initialize(MoralisApplicationId, MoralisServerURI, hostManifestData);
 
         if (MoralisInterface.IsLoggedIn())
         {
@@ -106,7 +113,7 @@ public async void Play()
             Debug.Log("User is already logged in to Moralis.");
 
             // Transition to main game scene
-            SceneManager.LoadScene(SceneMap.GAME_VIEW);
+            //SceneManager.LoadScene(SceneMap.GAME_VIEW);
         }
         // User is not logged in, depending on build target, begin wallect connection.
         else
@@ -196,7 +203,8 @@ public async void Quit()
     /// <summary>
     /// Display Moralis connector login page
     /// </summary>
-    private async Task LoginViaConnectionPage()
+ #if UNITY_WEBGL
+    private async UniTask LoginViaConnectionPage()
     {
         // Use Moralis Connect page for authentication as we work to make the Wallet 
         // Connect experience better.
@@ -213,7 +221,25 @@ private async Task LoginViaConnectionPage()
             AuthenticationButtonOn();
         }
     }
+#else
+    private async Task LoginViaConnectionPage()
+    {
+        // Use Moralis Connect page for authentication as we work to make the Wallet 
+        // Connect experience better.
+        MoralisUser user = await MobileLogin.LogIn(MoralisServerURI, MoralisApplicationId);
 
+        if (user != null)
+        {
+            // User is not null so login was successful, show first game scene.
+            //SceneManager.LoadScene(SceneMap.GAME_VIEW);
+            AuthenticationButtonOff();
+        }
+        else
+        {
+            AuthenticationButtonOn();
+        }
+    }
+#endif
     private void AuthenticationButtonOff()
     {
         AuthenticationButton.SetActive(false);

Assembly-CSharp.csproj

@@ -26,7 +26,13 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  *  SOFTWARE.
  */
+#if UNITY_WEBGL
+using Moralis.WebGL.Platform;
+using System.Collections.Generic;
+#else
 using Moralis.Platform;
+using System.Collections.Generic;
+#endif
 using UnityEngine;
 
 public class MoralisSetup : MonoBehaviour
@@ -36,7 +42,7 @@ public class MoralisSetup : MonoBehaviour
     public string ApplicationName;
     public string Version;
 
-    void Start()
+    async void Start()
     {
         HostManifestData hostManifestData = new HostManifestData()
         {
@@ -46,6 +52,9 @@ void Start()
             ShortVersion = Version
         };
 
-        MoralisInterface.Initialize(MoralisApplicationId, MoralisServerURI, hostManifestData);
+        await MoralisInterface.Initialize(MoralisApplicationId, MoralisServerURI, hostManifestData);
+
+        var authData = new Dictionary<string, object> { { "id", "0x26841E928b5b89BB257CCCeC06d8d63951f2507b".ToLower() }, { "signature", "0x7589245bd712ccdcaa9f946c1052b169569fecaf5beed44d916acc0361be16b63f9ad8fb8526c276a1869a314ca7f9a0becee334aadca2e62ccd656cd1379c041b" }, { "data", "Moralis Authentication" } };
+        await MoralisInterface.GetClient().LogInAsync(authData);
     }
 }

Assets/MoralisWeb3ApiSdk/Example/Scripts/MainMenuScript.cs

@@ -69,16 +69,21 @@ private void Start()
 #endif
     }
 
-    private void Update()
+    private async void Update()
     {
         // Update character address if it has not been set
-        if (!isAuthenticated && MoralisInterface.GetUser() != null)
+        if (!isAuthenticated)
         {
-            string addr = MoralisInterface.GetUser().authData["moralisEth"]["id"].ToString();
+            var user = await MoralisInterface.GetUserAsync();
 
-            addressText.text = string.Format("{0}...{1}", addr.Substring(0, 6), addr.Substring(addr.Length - 3, 3));
+            if (user != null)
+            {
+                string addr = user.authData["moralisEth"]["id"].ToString();
+
+                addressText.text = string.Format("{0}...{1}", addr.Substring(0, 6), addr.Substring(addr.Length - 3, 3));
 
-            isAuthenticated = true;
+                isAuthenticated = true;
+            }
         }
 
         Move();

Assets/MoralisWeb3ApiSdk/Example/Scripts/MainMenuScript.cs.bak.meta

@@ -0,0 +1,99 @@
+/**
+ *           Module: ResourceData.cs
+ *  Descriptiontion: Define a set of objects that represent a known response from 
+ *                   a Moralis Cloud function used to load remote resources and so 
+ *                   by-pass CORS issues when loading resources from remote servers.
+ *                   NOTE: This was designed spoecifically to retrieve image files for the
+ *                         sample TokenListController. Other resource may require modification.
+ *           Author: Moralis Web3 Technology AB, 559307-5988 - David B. Goodrich
+ *  
+ *  Sample Moralis Cloud Function used to retrieve remote resources
+ *  =================================================================
+     Moralis.Cloud.define("loadResource", async (request) => {
+      const logger = Moralis.Cloud.getLogger();
+  
+      return await Moralis.Cloud.httpRequest({
+        url: request.params.url
+      }).then(function(httpResponse) {
+        let resp = {status: httpResponse.status, headers: httpResponse.headers, data: JSON.stringify(httpResponse.buffer)};
+        return resp;
+      },function(httpResponse) {
+        // Error occurred
+        logger.error('Request failed with response code ' + httpResponse.status);
+        return httpResponse;
+      });
+    }, {
+	    fields : ["url"]
+    });
+ *  
+ *  
+ *  MIT License
+ *  
+ *  Copyright (c) 2021 Moralis Web3 Technology AB, 559307-5988
+ *  
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *  
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *  
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+/// <summary>
+/// Define a set of objects that represent a known response from 
+/// a Moralis Cloud function used to load remote resources and so 
+/// by-pass CORS issues when loading resources from remote servers.
+/// NOTE: This was designed spoecifically to retrieve image files for the
+///       sample TokenListController. Other resource may require modification.
+/// </summary>
+namespace Assets.MoralisWeb3ApiSdk.Example.Scripts
+{
+    /// <summary>
+    /// Raw data element of the resource loaded.
+    /// </summary>
+    public class ResourceData
+    {
+        public string type;
+        public byte[] data;
+    }
+
+    /// <summary>
+    /// Response body from the Cloud Function.
+    /// </summary>
+    public class ResourceResponse
+    {
+        public int status;
+        public Dictionary<string, string> headers;
+        public string data;
+
+        public ResourceData resourceData
+        {
+            get
+            {
+                return JsonConvert.DeserializeObject<ResourceData>(data);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Result wrapper added by the server after the fact. 
+    /// </summary>
+    public class ResourceRequestResult
+    {
+        public ResourceResponse result;
+    }
+}