chore: resolve conflicts

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
@@ -58,7 +58,7 @@ public BrowserCommunicationsManager(IWebBrowserClient webBrowserClient)
         {
             this.webBrowserClient = webBrowserClient;
             this.webBrowserClient.OnUnityPostMessage += InvokeOnUnityPostMessage;
-#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
             this.webBrowserClient.OnAuthPostMessage += InvokeOnAuthPostMessage;
             this.webBrowserClient.OnPostMessageError += InvokeOnPostMessageError;
 #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

@@ -55,7 +55,7 @@ public async UniTask Init(string clientId, string environment, string redirectUr
             this.redirectUri = redirectUri;
             this.logoutRedirectUri = logoutRedirectUri;
 
-#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
             this.communicationsManager.OnAuthPostMessage += OnDeepLinkActivated;
             this.communicationsManager.OnPostMessageError += OnPostMessageError;
 #endif
@@ -94,7 +94,7 @@ public async UniTask Init(string clientId, string environment, string redirectUr
                 };
                 initRequest = JsonUtility.ToJson(request);
             }
-
+ 
             string response = await communicationsManager.Call(PassportFunction.INIT, initRequest);
             BrowserResponse initResponse = response.OptDeserializeObject<BrowserResponse>();
 
@@ -317,12 +317,17 @@ public async void OnDeepLinkActivated(string url)
                 PassportLogger.Info($"{TAG} Received deeplink URL: {url}");
 
                 Uri uri = new Uri(url);
-                string domain = $"{uri.Scheme}://{uri.Host}{uri.AbsolutePath}";
+				string hostWithPort = uri.IsDefaultPort ? uri.Host : $"{uri.Host}:{uri.Port}";
+
+				string domain = $"{uri.Scheme}://{hostWithPort}{uri.AbsolutePath}";
+                PassportLogger.Info($"{TAG} domain: {domain}");
+                PassportLogger.Info($"{TAG} redirectUri: {redirectUri}");
+
                 if (domain.EndsWith("/"))
                 {
                     domain = domain.Remove(domain.Length - 1);
                 }
-
+                
                 if (domain.Equals(logoutRedirectUri))
                 {
                     HandleLogoutPKCESuccess();

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,18 +181,22 @@ 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);
-                // Mark ready when browser is initialised and game bridge file is loaded
-                communicationsManager.OnReady += () => readySignalReceived = true;
-
+				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;
+#endif
                 // Set up Passport implementation
                 passportImpl = new PassportImpl(communicationsManager);
                 // Subscribe to Passport authentication events
@@ -237,7 +241,7 @@ public async UniTask<bool> ConnectImx(bool useCachedSession = false, Nullable<lo
             return await GetPassportImpl().ConnectImx(useCachedSession, timeoutMs);
         }
 
-#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
         /// <summary>
         /// Connects the user into Passport via PKCE auth.
         /// </summary>

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 && !UNITY_EDITOR
+            GameObject webViewGameObject = new GameObject("WebViewObject");
+            webViewObject = webViewGameObject.AddComponent<WebViewObject>();
+#else
             webViewObject = new WebViewObject();
+#endif
             webViewObject.Init(
                 cb: InvokeOnUnityPostMessage,
                 httpErr: InvokeOnPostMessageError,

src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/WebGLTemplates.meta

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en-us">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Unity WebGL Player | Immutable Runner</title>
+    <link rel="shortcut icon" href="TemplateData/favicon.ico">
+    <link rel="stylesheet" href="TemplateData/style.css">
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
+    <script src="unity-webview.js"></script>
+</head>
+<body>
+<div id="unity-container" class="unity-desktop">
+    <div id="unity-build-title">Logging in</div>
+</div>
+<script>
+    window.opener.postMessage({
+        type: 'callback',
+        url: window.location.href,
+    });
+    window.close();
+</script>
+</body>
+</html>

src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/WebGLTemplates/unity-webview.meta

@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Unity WebGL Player | Immutable Runner</title>
+    <link rel="shortcut icon" href="TemplateData/favicon.ico">
+    <link rel="stylesheet" href="TemplateData/style.css">
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
+    <script src="unity-webview.js"></script>
+  </head>
+  <body>
+    <div id="unity-container" class="unity-desktop">
+      <canvas id="unity-canvas"></canvas>
+      <div id="unity-loading-bar">
+        <div id="unity-logo"></div>
+        <div id="unity-progress-bar-empty">
+          <div id="unity-progress-bar-full"></div>
+        </div>
+      </div>
+      <div id="unity-footer">
+        <div id="unity-webgl-logo"></div>
+        <div id="unity-fullscreen-button"></div>
+        <div id="unity-build-title">Immutable Runner</div>
+      </div>
+    </div>
+    <script>
+      var buildUrl = "Build";
+      var loaderUrl = buildUrl + "/webgl.loader.js";
+      var config = {
+        dataUrl: buildUrl + "/webgl.data.br",
+        frameworkUrl: buildUrl + "/webgl.framework.js.br",
+        codeUrl: buildUrl + "/webgl.wasm.br",
+        streamingAssetsUrl: "StreamingAssets",
+        companyName: "Immutable",
+        productName: "Immutable Runner",
+        productVersion: "0.1.0",
+      };
+
+      var container = document.querySelector("#unity-container");
+      var canvas = document.querySelector("#unity-canvas");
+      var loadingBar = document.querySelector("#unity-loading-bar");
+      var progressBarFull = document.querySelector("#unity-progress-bar-full");
+      var fullscreenButton = document.querySelector("#unity-fullscreen-button");
+      var width0 = "960px";
+      var height0 = "600px";
+
+      if (/iPhone|iPad|iPod|Android/i.test(navigator.userAgent)) {
+        container.className = "unity-mobile";
+        config.devicePixelRatio = 1;
+      } else {
+        canvas.style.width = "960px";
+        canvas.style.height = "600px";
+      }
+      loadingBar.style.display = "block";
+
+      document.addEventListener(
+        'fullscreenchange',
+        function() {
+          var p = document.getElementById('unity-container');
+          var c = document.getElementById('unity-canvas');
+          if (document.fullscreenElement) {
+            width0 = c.style.width;
+            height0 = c.style.height;
+            setTimeout(
+              function() {
+                c.style.width = getComputedStyle(p).width;
+                c.style.height = getComputedStyle(p).height;
+              },
+              250);
+          } else {
+            c.style.width = width0;
+            c.style.height = height0;
+          }
+        });
+      var script = document.createElement("script");
+      script.src = loaderUrl;
+      script.onload = () => {
+        createUnityInstance(canvas, config, (progress) => {
+          progressBarFull.style.width = 100 * progress + "%";
+        }).then((unityInstance) => {
+          window.unityInstance = unityInstance;
+          loadingBar.style.display = "none";
+          fullscreenButton.onclick = () => {
+            var p = document.getElementById('unity-container');
+            var c = document.getElementById('unity-canvas');
+            c.requestFullscreen = () => {
+              p.requestFullscreen();
+            };
+            unityInstance.SetFullscreen(1);
+          };
+        }).catch((message) => {
+          alert(message);
+        });
+      };
+      document.body.appendChild(script);
+    </script>
+  </body>
+</html>

src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/WebGLTemplates/unity-webview/callback.html

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en-us">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Unity WebGL Player | Immutable Runner</title>
+    <link rel="shortcut icon" href="TemplateData/favicon.ico">
+    <link rel="stylesheet" href="TemplateData/style.css">
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
+    <script src="unity-webview.js"></script>
+</head>
+<body>
+<div id="unity-container" class="unity-desktop">
+    <div id="unity-build-title">Logging out</div>
+</div>
+<script>
+    window.opener.postMessage({
+        type: 'logout',
+        url: window.location.href,
+    });
+    window.close();
+</script>
+</body>
+</html>