Merge branch 'main' into feat/passport-prefab

Author: CodeSchwert

sample/Tests/README.md

@@ -0,0 +1,37 @@
+# UI Tests
+
+## Prerequisites
+
+### Passport SDK Log Level Configuration
+
+For the authentication flow tests to work properly, the Passport SDK must be configured with an appropriate log level that enables auth URL capture. The test automation relies on capturing authentication URLs from Unity's Player.log.
+
+**Required Configuration:**
+
+In your Unity project's Passport initialisation script, ensure the log level is set to `Info` or `Debug`:
+
+**File:** `src/Packages/Passport/Runtime/Scripts/Passport/PassportInitialisation/PassportInitialisationScript.cs`
+
+```csharp
+// Set the log level for the SDK (required for test automation)
+Passport.LogLevel = LogLevel.Info; // or LogLevel.Debug
+```
+
+**Why This Is Required:**
+
+- The test framework captures authentication URLs from Unity logs using `PassportLogger.Info()` calls
+- Without proper logging, authentication URL interception will fail
+- This enables the workaround for browser process isolation issues in automated testing environments
+
+**Log Patterns Captured:**
+
+The tests monitor Unity's `Player.log` for these patterns:
+
+- `[Immutable] PASSPORT_AUTH_URL: <url>`
+- `[Immutable] [Browser Communications Manager] LaunchAuthURL : <url>`
+
+If authentication tests fail to capture URLs, verify that:
+
+1. The Passport SDK log level is set correctly
+2. Unity's Player.log is being written to the expected location
+3. The authentication flow is actually being triggered

sample/Tests/test/test_windows.py

@@ -1,3 +1,12 @@
+"""
+Unity Passport Windows UI Tests
+
+For test setup and configuration requirements (especially Passport SDK log level),
+see: sample/Tests/README.md
+
+These tests require proper authentication URL logging to work correctly.
+"""
+
 import time
 
 from alttester import *
@@ -192,8 +201,8 @@ def test_4_imx_functions(self):
         print("=" * 60)
         print("STARTING TEST: test_4_imx_functions")
         print("=" * 60)
-        # self.test_2_imx_functions() # TODO: Fix this test - needs NFTs to pass the test
-        print("SKIPPING TEST: test_4_imx_functions")
+        self.test_2_imx_functions()
+        print("COMPLETED TEST: test_4_imx_functions")
         print("=" * 60)
 
     def test_5_zkevm_functions(self):

sample/Tests/test/test_windows_helpers.py

@@ -80,7 +80,8 @@ def get_auth_url_from_unity_logs():
                     content = f.read()
                     # Look for either our custom message or the existing LaunchAuthURL message
                     # Get the LAST occurrence (most recent) and make sure it's a login URL, not logout
-                    matches = re.findall(r'(?:PASSPORT_AUTH_URL: |LaunchAuthURL : )(https?://[^\s]+)', content)
+                    # Now includes [Immutable] tag from PassportLogger
+                    matches = re.findall(r'(?:\[Immutable\] PASSPORT_AUTH_URL: |PASSPORT_AUTH_URL: |LaunchAuthURL : )(https?://[^\s]+)', content)
                     if matches:
                         # Get the last URL and make sure it's not a logout URL
                         for url in reversed(matches):
@@ -124,8 +125,9 @@ def get_logout_url_from_unity_logs():
             try:
                 with open(log_path, 'r', encoding='utf-8', errors='ignore') as f:
                     content = f.read()
-                    # Look for logout URLs in Unity logs
-                    matches = re.findall(r'(?:PASSPORT_LOGOUT_URL: |LaunchAuthURL : )(https?://[^\s]+)', content)
+                    # Look for logout URLs in Unity logs (uses same PASSPORT_AUTH_URL pattern)
+                    # Now includes [Immutable] tag from PassportLogger
+                    matches = re.findall(r'(?:\[Immutable\] PASSPORT_AUTH_URL: |PASSPORT_AUTH_URL: |LaunchAuthURL : )(https?://[^\s]+)', content)
                     if matches:
                         # Get the last URL and make sure it's a logout URL
                         for url in reversed(matches):
@@ -573,7 +575,28 @@ def open_sample_app(clear_data=False):
         clear_unity_data()
 
     print(f"Opening {product_name}...")
-    subprocess.Popen([f"{product_name}.exe"], shell=True)
+    
+    # Look for the executable in build folder first, then current directory
+    exe_paths = [
+        f"../build/{product_name}.exe",  # Relative to Tests folder
+        f"{product_name}.exe"  # Current directory (fallback)
+    ]
+    
+    exe_launched = False
+    for exe_path in exe_paths:
+        if os.path.exists(exe_path):
+            print(f"Found executable at: {exe_path}")
+            subprocess.Popen([exe_path], shell=True)
+            exe_launched = True
+            break
+    
+    if not exe_launched:
+        print(f"ERROR: Could not find {product_name}.exe in any of these locations:")
+        for path in exe_paths:
+            abs_path = os.path.abspath(path)
+            print(f"  - {abs_path} (exists: {os.path.exists(abs_path)})")
+        raise FileNotFoundError(f"Unity executable not found")
+    
     time.sleep(10)
     print(f"{product_name} opened successfully.")
 

src/Packages/Passport/Runtime/ThirdParty/ImmutableBrowserCore/Immutable.Browser.Core.asmdef

@@ -2,7 +2,8 @@
     "name": "Immutable.Browser.Core",
     "rootNamespace": "Immutable.Browser.Core",
     "references": [
-        "GUID:f51ebe6a0ceec4240a699833d6309b23"
+        "UniTask",
+        "Immutable.Passport.Core.Logging"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

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

@@ -3,6 +3,7 @@
 using System.IO;
 using UnityEngine;
 using Immutable.Browser.Core;
+using Immutable.Passport.Core.Logging;
 using Cysharp.Threading.Tasks;
 
 namespace Immutable.Browser.Core
@@ -51,7 +52,7 @@ public void ExecuteJs(string js)
         public void LaunchAuthURL(string url, string? redirectUri)
         {
             // Log the auth URL for test automation to capture
-            Debug.Log($"PASSPORT_AUTH_URL: {url}");
+            PassportLogger.Info($"PASSPORT_AUTH_URL: {url}");
             Application.OpenURL(url);
         }
 

src/Packages/ZkEvmApi/Documentation~/FeedItemFollowGame.md

@@ -23,6 +23,7 @@ Name | Type | Description | Notes
 **Description** | **string** | Description of the CTA button | 
 **Logo** | **string** | URL of the quiz logo | 
 **Title** | **string** | Title of the video | 
+**SimilarGames** | **List<string>** | Similar games to display | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

src/Packages/ZkEvmApi/Runtime/Model/FeedItemFollowGame.cs

@@ -79,7 +79,8 @@ protected FeedItemFollowGame() { }
         /// <param name="description">Description of the CTA button (required).</param>
         /// <param name="logo">URL of the quiz logo (required).</param>
         /// <param name="title">Title of the video (required).</param>
-        public FeedItemFollowGame(string id = default(string), string name = default(string), string questId = default(string), int priority = default(int), int gemsEarnable = default(int), bool bypass = default(bool), bool dayZero = default(bool), Guid gameId = default(Guid), string gameName = default(string), string questCompletedPopupText = default(string), List<string> tags = default(List<string>), List<string> categories = default(List<string>), string onboardingExperience = default(string), TypeEnum type = default(TypeEnum), string image = default(string), string label = default(string), string description = default(string), string logo = default(string), string title = default(string))
+        /// <param name="similarGames">Similar games to display.</param>
+        public FeedItemFollowGame(string id = default(string), string name = default(string), string questId = default(string), int priority = default(int), int gemsEarnable = default(int), bool bypass = default(bool), bool dayZero = default(bool), Guid gameId = default(Guid), string gameName = default(string), string questCompletedPopupText = default(string), List<string> tags = default(List<string>), List<string> categories = default(List<string>), string onboardingExperience = default(string), TypeEnum type = default(TypeEnum), string image = default(string), string label = default(string), string description = default(string), string logo = default(string), string title = default(string), List<string> similarGames = default(List<string>))
         {
             // to ensure "id" is required (not null)
             if (id == null)
@@ -140,6 +141,7 @@ protected FeedItemFollowGame() { }
             this.Tags = tags;
             this.Categories = categories;
             this.OnboardingExperience = onboardingExperience;
+            this.SimilarGames = similarGames;
         }
 
         /// <summary>
@@ -268,6 +270,13 @@ protected FeedItemFollowGame() { }
         [DataMember(Name = "title", IsRequired = true, EmitDefaultValue = true)]
         public string Title { get; set; }
 
+        /// <summary>
+        /// Similar games to display
+        /// </summary>
+        /// <value>Similar games to display</value>
+        [DataMember(Name = "similar_games", EmitDefaultValue = false)]
+        public List<string> SimilarGames { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -295,6 +304,7 @@ public override string ToString()
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  Logo: ").Append(Logo).Append("\n");
             sb.Append("  Title: ").Append(Title).Append("\n");
+            sb.Append("  SimilarGames: ").Append(SimilarGames).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }

src/Packages/ZkEvmApi/api~/openapi.yaml

@@ -9167,6 +9167,11 @@ components:
           title:
             description: Title of the video
             type: string
+          similar_games:
+            description: Similar games to display
+            items:
+              type: string
+            type: array
         required:
         - description
         - image