webgl

Author: andrew-yangy

src/Packages/Passport/Runtime/Scripts/Private/Core/BrowserCommunicationsManager.cs

@@ -15,7 +15,7 @@ namespace Immutable.Passport.Core
 
     public interface IBrowserCommunicationsManager
     {
-#if (UNITY_ANDROID && !UNITY_EDITOR_WIN) || (UNITY_IPHONE && !UNITY_EDITOR_WIN) || UNITY_STANDALONE_OSX
+#if (UNITY_ANDROID && !UNITY_EDITOR_WIN) || (UNITY_IPHONE && !UNITY_EDITOR_WIN) || UNITY_STANDALONE_OSX || UNITY_WEBGL
         event OnUnityPostMessageDelegate OnAuthPostMessage;
         event OnUnityPostMessageErrorDelegate OnPostMessageError;
 #endif

src/Packages/Passport/Runtime/Scripts/Private/Immutable.Passport.Runtime.Private.asmdef

@@ -13,7 +13,8 @@
         "Editor",
         "iOS",
         "macOSStandalone",
-        "WindowsStandalone64"
+        "WindowsStandalone64",
+        "WebGL"
     ],
     "excludePlatforms": [],
     "allowUnsafeCode": false,

src/Packages/Passport/Runtime/Scripts/Private/PassportImpl.cs

@@ -94,6 +94,7 @@ public async UniTask Init(string clientId, string environment, string redirectUr
                 initRequest = JsonUtility.ToJson(request);
             }
 
+            PassportLogger.Debug($"{TAG} initRequest: " + initRequest);
             string response = await communicationsManager.Call(PassportFunction.INIT, initRequest);
             BrowserResponse initResponse = response.OptDeserializeObject<BrowserResponse>();
 

src/Packages/Passport/Runtime/Scripts/Public/Immutable.Passport.Runtime.asmdef

@@ -14,7 +14,8 @@
         "Editor",
         "iOS",
         "macOSStandalone",
-        "WindowsStandalone64"
+        "WindowsStandalone64",
+        "WebGL"
     ],
     "excludePlatforms": [],
     "allowUnsafeCode": false,

src/Packages/Passport/Runtime/Scripts/Public/Passport.cs

@@ -5,7 +5,7 @@
 using VoltstroStudios.UnityWebBrowser.Core;
 using VoltstroStudios.UnityWebBrowser.Shared;
 #endif
-#elif (UNITY_ANDROID && !UNITY_EDITOR_WIN) || (UNITY_IPHONE && !UNITY_EDITOR_WIN) || UNITY_STANDALONE_OSX
+#elif (UNITY_ANDROID && !UNITY_EDITOR_WIN) || (UNITY_IPHONE && !UNITY_EDITOR_WIN) || UNITY_STANDALONE_OSX || UNITY_WEBGL
 using Immutable.Browser.Gree;
 #endif
 using Immutable.Passport.Event;
@@ -181,22 +181,26 @@ private async UniTask Initialise(
                     await ((WebBrowserClient)this.webBrowserClient).Init(engineStartupTimeoutMs);
 #endif
                 }
-#elif (UNITY_ANDROID && !UNITY_EDITOR_WIN) || (UNITY_IPHONE && !UNITY_EDITOR_WIN) || UNITY_STANDALONE_OSX
+#elif (UNITY_ANDROID && !UNITY_EDITOR_WIN) || (UNITY_IPHONE && !UNITY_EDITOR_WIN) || UNITY_STANDALONE_OSX || UNITY_WEBGL
                 // Initialise default browser client for Android, iOS, and macOS
                 webBrowserClient = new GreeBrowserClient();
 #else
                 throw new PassportException("Platform not supported");
 #endif
 
                 // Set up browser communication
-                BrowserCommunicationsManager communicationsManager = new BrowserCommunicationsManager(webBrowserClient);
+                // BrowserCommunicationsManager communicationsManager = new BrowserCommunicationsManager(webBrowserClient);
+                
+#if UNITY_WEBGL
+                readySignalReceived = true;
+#else
                 // Mark ready when browser is initialised and game bridge file is loaded
-                communicationsManager.OnReady += () => readySignalReceived = true;
-
+                // communicationsManager.OnReady += () => readySignalReceived = true;
+#endif
                 // Set up Passport implementation
-                passportImpl = new PassportImpl(communicationsManager);
-                // Subscribe to Passport authentication events
-                passportImpl.OnAuthEvent += OnPassportAuthEvent;
+                // passportImpl = new PassportImpl(communicationsManager);
+                // // Subscribe to Passport authentication events
+                // passportImpl.OnAuthEvent += OnPassportAuthEvent;
             }
             catch (Exception ex)
             {

src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/GreeBrowserClient.cs

@@ -1,7 +1,8 @@
-#if (UNITY_ANDROID && !UNITY_EDITOR_WIN) || (UNITY_IPHONE && !UNITY_EDITOR_WIN) || UNITY_STANDALONE_OSX
+#if (UNITY_ANDROID && !UNITY_EDITOR_WIN) || (UNITY_IPHONE && !UNITY_EDITOR_WIN) || UNITY_STANDALONE_OSX || UNITY_WEBGL
 
 using Immutable.Browser.Core;
 using Immutable.Passport.Core.Logging;
+using UnityEngine;
 
 namespace Immutable.Browser.Gree
 {
@@ -20,7 +21,12 @@ public GreeBrowserClient()
             PassportLogger.Warn("Native Android and iOS WebViews cannot run in the Editor, so the macOS WebView is currently used to save your development time." +
                 " Testing your game on an actual device or emulator is recommended to ensure proper functionality.");
 #endif
+#if UNITY_WEBGL
+            GameObject webViewGameObject = new GameObject("WebViewObject");
+            webViewObject = webViewGameObject.AddComponent<WebViewObject>();
+#else
             webViewObject = new WebViewObject();
+#endif
             webViewObject.Init(
                 cb: InvokeOnUnityPostMessage,
                 httpErr: InvokeOnPostMessageError,
@@ -34,6 +40,8 @@ public GreeBrowserClient()
 
         private void InvokeOnPostMessageError(string id, string message)
         {
+            PassportLogger.Info($"{TAG} InvokeOnPostMessageError: {message}");
+
             if (OnPostMessageError != null)
             {
                 OnPostMessageError.Invoke(id, message);
@@ -42,6 +50,8 @@ private void InvokeOnPostMessageError(string id, string message)
 
         internal void InvokeOnAuthPostMessage(string message)
         {
+            PassportLogger.Info($"{TAG} InvokeOnAuthPostMessage: {message}");
+
             if (OnAuthPostMessage != null)
             {
                 OnAuthPostMessage.Invoke(message);
@@ -50,6 +60,8 @@ internal void InvokeOnAuthPostMessage(string message)
 
         internal void InvokeOnUnityPostMessage(string message)
         {
+            PassportLogger.Info($"{TAG} InvokeOnUnityPostMessage: {message}");
+
             if (OnUnityPostMessage != null)
             {
                 OnUnityPostMessage.Invoke(message);

src/Packages/Passport/Runtime/ThirdParty/Gree/unity-webview.asmdef

@@ -9,7 +9,8 @@
         "Android",
         "Editor",
         "iOS",
-        "macOSStandalone"
+        "macOSStandalone",
+        "WebGL"
     ],
     "excludePlatforms": [],
     "allowUnsafeCode": false,

src/Packages/Passport/Runtime/ThirdParty/ImmutableBrowserCore/GameBridge.cs

@@ -11,6 +11,7 @@ public static class GameBridge
         private const string PASSPORT_PACKAGE_RESOURCES_DIRECTORY = "Packages/com.immutable.passport/Runtime/Resources";
         private const string ANDROID_DATA_DIRECTORY = "android_asset";
         private const string MAC_DATA_DIRECTORY = "/Resources/Data";
+        private const string WEBGL_DIRECTORY = "/Passport";
         private const string MAC_EDITOR_RESOURCES_DIRECTORY = "Packages/com.immutable.passport/Runtime/Resources";
 
         public static string GetFilePath()
@@ -32,6 +33,9 @@ public static string GetFilePath()
 #elif UNITY_EDITOR_WIN
             // Windows editor
             filePath = SCHEME_FILE + Path.GetFullPath($"{PASSPORT_PACKAGE_RESOURCES_DIRECTORY}{PASSPORT_HTML_FILE_NAME}");
+#elif UNITY_WEBGL
+            // WebGL
+            filePath = WEBGL_DIRECTORY + PASSPORT_HTML_FILE_NAME;
 #else
             filePath = SCHEME_FILE + Path.GetFullPath(Application.dataPath) + PASSPORT_DATA_DIRECTORY_NAME + PASSPORT_HTML_FILE_NAME;
 #endif

src/Packages/Passport/Runtime/ThirdParty/ImmutableBrowserCore/IWindowsWebBrowserClient.cs

@@ -1,4 +1,4 @@
-#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN)
+#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) || UNITY_WEBGL
 
 using System.IO;
 using UnityEngine;