support webgl

Author: andrew-yangy

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

@@ -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/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
@@ -317,11 +317,14 @@ 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}";
-                if (domain.EndsWith("/"))
+                string hostWithPort = uri.IsDefaultPort ? uri.Host : $"{uri.Host}:{uri.Port}";
+                
+                if (hostWithPort.EndsWith("/"))
                 {
-                    domain = domain.Remove(domain.Length - 1);
+                    hostWithPort = hostWithPort.Remove(hostWithPort.Length - 1);
                 }
+                
+                string domain = $"{uri.Scheme}://{hostWithPort}{uri.AbsolutePath}";
 
                 if (domain.Equals(logoutRedirectUri))
                 {
@@ -433,7 +436,7 @@ public async UniTask CompleteLoginPKCEFlow(string uriString)
                 Uri uri = new Uri(uriString);
                 string state = uri.GetQueryParameter("state");
                 string authCode = uri.GetQueryParameter("code");
-
+                PassportLogger.Debug($"{TAG} CompleteLoginPKCEFlow: {state} {authCode}");
                 if (String.IsNullOrEmpty(state) || String.IsNullOrEmpty(authCode))
                 {
                     Track(

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

@@ -189,18 +189,18 @@ private async UniTask Initialise(
 #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)
             {
@@ -241,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>