Merge branch 'main' into feat/embedded-login-webviews

Author: ImmutableJeffrey

src/Packages/Marketplace/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.immutable.marketplace",
-  "version": "1.36.4",
+  "version": "1.36.5",
   "description": "Marketplace package for the Immutable SDK for Unity",
   "displayName": "Immutable Marketplace",
   "author": {

src/Packages/Passport/Runtime/Resources/index.html

@@ -8,12 +8,12 @@ public class BrowserResponse
         public string requestId;
         public bool success;
         public string errorType;
-        public string error;
+        public string? error;
     }
 
     public class StringResponse : BrowserResponse
     {
-        public string result;
+        public string? result;
     }
 
     public class StringListResponse : BrowserResponse

src/Packages/Passport/Runtime/Scripts/Private/Core/Model/BrowserResponse.cs

@@ -4,7 +4,7 @@ public class SdkVersionInfoHelpers
     {
         public static string GetSdkVersionInfo()
         {
-            return "1.36.4";
+            return "1.36.5";
         }
     }
 }

src/Packages/Passport/Runtime/Scripts/Private/Helpers/SdkVersionInfoHelpers.cs

@@ -299,6 +299,8 @@ private static string GetGameExecutablePath(string suffix)
             if (suffix == ".exe")
             {
                 // Get the path of the currently running executable
+#if !ENABLE_IL2CPP
+                // Process.MainModule is only supported in Mono builds, not in IL2CPP, and will cause a crash
                 try
                 {
                     var process = System.Diagnostics.Process.GetCurrentProcess();
@@ -315,6 +317,7 @@ private static string GetGameExecutablePath(string suffix)
                 {
                     PassportLogger.Warn($"Process inaccessible: {ex.Message}. Using fallback method.");
                 }
+#endif
 
                 // Fallback: Use command line args
                 var args = System.Environment.GetCommandLineArgs();

src/Packages/Passport/Runtime/Scripts/Private/Helpers/WindowsDeepLink.cs

@@ -5,10 +5,10 @@ namespace Immutable.Passport.Model
     [Serializable]
     public class TokenResponse
     {
-        public string accessToken;
-        public string refreshToken;
-        public string idToken;
-        public string tokenType;
-        public int expiresIn;
+        public string access_token;
+        public string refresh_token;
+        public string id_token;
+        public string token_type;
+        public int expires_in;
     }
 }

src/Packages/Passport/Runtime/Scripts/Private/Model/Response/TokenResponse.cs

@@ -14,6 +14,7 @@ public static class PassportFunction
         public const string GET_EMAIL = "getEmail";
         public const string GET_PASSPORT_ID = "getPassportId";
         public const string GET_LINKED_ADDRESSES = "getLinkedAddresses";
+        public const string STORE_TOKENS = "storeTokens";
         public static class IMX
         {
             public const string GET_ADDRESS = "getAddress";

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

@@ -517,6 +517,13 @@ public async UniTask<bool> HasCredentialsSaved()
             }
         }
 
+        public async UniTask<bool> CompleteLogin(TokenResponse request)
+        {
+            var json = JsonUtility.ToJson(request);
+            var callResponse = await _communicationsManager.Call(PassportFunction.STORE_TOKENS, json);
+            return callResponse.GetBoolResponse() ?? false;
+        }
+
         public async UniTask<string?> GetAddress()
         {
             var response = await _communicationsManager.Call(PassportFunction.IMX.GET_ADDRESS);

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

@@ -314,6 +314,19 @@ public async UniTask<bool> ConnectImx(bool useCachedSession = false, DirectLogin
             return await GetPassportImpl().ConnectImx(useCachedSession, directLoginOptions);
         }
 
+        /// <summary>
+        /// Completes the login process by storing tokens received from the Bring Your Own Auth API token exchange endpoint.
+        /// This method enables authentication using existing auth systems without requiring users to log in twice.q
+        /// </summary>
+        /// <param name="request">The token request</param>
+        /// <returns>
+        /// True if successful, otherwise false.
+        /// </returns>
+        public async UniTask<bool> CompleteLogin(TokenResponse request)
+        {
+            return await GetPassportImpl().CompleteLogin(request);
+        }
+
         /// <summary>
         /// Gets the wallet address of the logged in user.
         /// <returns>

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

@@ -27,51 +27,52 @@ void Start()
             ShowOutput("Passport Instance is null");
         }
 
-        // Set up button listeners if buttons are assigned
-        if (DefaultLoginButton != null) DefaultLoginButton.onClick.AddListener(() => Login(DirectLoginMethod.None));
-        if (GoogleLoginButton != null) GoogleLoginButton.onClick.AddListener(() => Login(DirectLoginMethod.Google));
-        if (AppleLoginButton != null) AppleLoginButton.onClick.AddListener(() => Login(DirectLoginMethod.Apple));
-        if (FacebookLoginButton != null) FacebookLoginButton.onClick.AddListener(() => Login(DirectLoginMethod.Facebook));
+        // Set up button listeners using DirectLoginOptions
+        if (DefaultLoginButton != null) DefaultLoginButton.onClick.AddListener(() => Login(new DirectLoginOptions()));
+        if (GoogleLoginButton != null) GoogleLoginButton.onClick.AddListener(() => Login(new DirectLoginOptions(DirectLoginMethod.Google)));
+        if (AppleLoginButton != null) AppleLoginButton.onClick.AddListener(() => Login(new DirectLoginOptions(DirectLoginMethod.Apple)));
+        if (FacebookLoginButton != null) FacebookLoginButton.onClick.AddListener(() => Login(new DirectLoginOptions(DirectLoginMethod.Facebook)));
     }
 
     /// <summary>
     /// Logs into Passport using the default auth method.
     /// </summary>
     public async void Login()
     {
-        await LoginAsync(DirectLoginMethod.None);
+        await LoginAsync(new DirectLoginOptions());
     }
 
     /// <summary>
-    /// Logs into Passport using the specified direct login method.
+    /// Logs into Passport using the specified direct login options.
     /// </summary>
-    /// <param name="directLoginMethod">The direct login method to use (Google, Apple, Facebook, or None for default)</param>
-    public async void Login(DirectLoginMethod directLoginMethod)
+    /// <param name="directLoginOptions">The direct login options</param>
+    public async void Login(DirectLoginOptions directLoginOptions)
     {
-        await LoginAsync(directLoginMethod);
+        await LoginAsync(directLoginOptions);
     }
 
     /// <summary>
     /// Internal async method that performs the actual login logic.
     /// </summary>
-    /// <param name="directLoginMethod">The direct login method to use</param>
-    private async System.Threading.Tasks.Task LoginAsync(DirectLoginMethod directLoginMethod)
+    /// <param name="directLoginOptions">The direct login options</param>
+    private async System.Threading.Tasks.Task LoginAsync(DirectLoginOptions directLoginOptions)
     {
         try
         {
-            string methodName = directLoginMethod == DirectLoginMethod.None ? "default" : directLoginMethod.ToString();
-            ShowOutput($"Logging in with {methodName} method...");
+            string directLoginMethod = directLoginOptions.directLoginMethod.ToString().ToLower();
 
-            bool success = await Passport.Login(useCachedSession: false, directLoginMethod: directLoginMethod);
+            ShowOutput($"Logging in with {directLoginMethod} method...");
+
+            bool success = await Passport.Login(useCachedSession: false, directLoginOptions: directLoginOptions);
 
             if (success)
             {
-                ShowOutput($"Successfully logged in with {methodName}");
+                ShowOutput($"Successfully logged in with {directLoginMethod}");
                 SceneManager.LoadScene("AuthenticatedScene");
             }
             else
             {
-                ShowOutput($"Failed to log in with {methodName}");
+                ShowOutput($"Failed to log in with {directLoginMethod}");
             }
         }
         catch (OperationCanceledException ex)