fix(tests): improve logout URL detection on macOS

- macOS: improve standalone Player.log detection for logout URL capture
  (additional paths + fallback scan) and trigger returnTo via open
- Windows: revert deeplink registry changes that caused immutablerunner prompt

Author: rodrigo-fournier-immutable

sample/Tests/test/test_mac_helpers.py

@@ -3,8 +3,6 @@
 import os
 import re
 from pathlib import Path
-from selenium import webdriver
-from selenium.webdriver.chrome.options import Options
 
 def get_app_name():
     """Get the app name from environment variable, falling back to default"""
@@ -30,20 +28,54 @@ def get_product_name():
     # If regex fails, return default
     return "SampleApp"
 
+def get_company_name():
+    """Get the company name from ProjectSettings.asset (used for log paths on some macOS setups)."""
+    project_settings_path = Path(__file__).resolve().parent.parent.parent / 'ProjectSettings' / 'ProjectSettings.asset'
+
+    if not project_settings_path.exists():
+        print(f"Warning: ProjectSettings.asset not found at {project_settings_path}")
+        return None
+
+    try:
+        with open(project_settings_path, 'r') as f:
+            content = f.read()
+        match = re.search(r'companyName: (.+)', content)
+        if match:
+            return match.group(1).strip()
+    except Exception as e:
+        print(f"Warning: failed to read companyName from ProjectSettings.asset: {e}")
+    return None
+
 def get_logout_url_from_unity_logs():
     """Monitor Unity logs to capture logout URLs."""
     import tempfile
+    from pathlib import Path as _Path
 
     product_name = os.getenv("UNITY_APP_NAME", get_product_name())
+    company_name = get_company_name()
 
     # Unity log file locations on macOS
     log_paths = [
         os.path.join(os.path.expanduser("~"), "Library", "Logs", "Unity", product_name, "Player.log"),
         os.path.join(os.path.expanduser("~"), "Library", "Logs", product_name, "Player.log"),
+        # Common standalone player paths
+        os.path.join(os.path.expanduser("~"), "Library", "Logs", "Unity", "Player.log"),
+        os.path.join(os.path.expanduser("~"), "Library", "Logs", "Unity", product_name, "Player.log"),
+        os.path.join(os.path.expanduser("~"), "Library", "Logs", "Unity", "Player.log"),
         os.path.join(tempfile.gettempdir(), "UnityPlayer.log"),
         "Player.log"  # Current directory
     ]
+
+    if company_name:
+        log_paths.insert(
+            0,
+            os.path.join(os.path.expanduser("~"), "Library", "Logs", company_name, product_name, "Player.log"),
+        )
 
+    # De-dup while preserving order
+    seen = set()
+    log_paths = [p for p in log_paths if not (p in seen or seen.add(p))]
+
     for log_path in log_paths:
         if os.path.exists(log_path):
             print(f"Monitoring Unity log for logout URL: {log_path}")
@@ -62,27 +94,53 @@ def get_logout_url_from_unity_logs():
             except Exception as e:
                 print(f"Error reading log file {log_path}: {e}")
                 continue
+
+    # Fallback: scan ~/Library/Logs for any Player.log and try the most recently modified few.
+    # This helps on standalone runners where Unity logs may be under Company/Product folders.
+    try:
+        logs_root = _Path(os.path.expanduser("~")) / "Library" / "Logs"
+        if logs_root.exists():
+            candidates = []
+            for p in logs_root.rglob("Player.log"):
+                try:
+                    candidates.append((p.stat().st_mtime, str(p)))
+                except Exception:
+                    continue
+
+            # Newest first; try a small number to avoid slow scans.
+            candidates.sort(reverse=True)
+            for _, p in candidates[:10]:
+                if p in seen:
+                    continue
+                print(f"Monitoring Unity log for logout URL (fallback): {p}")
+                try:
+                    with open(p, 'r', encoding='utf-8', errors='ignore') as f:
+                        content = f.read()
+                        matches = re.findall(r'(?:\[Immutable\] PASSPORT_AUTH_URL: |PASSPORT_AUTH_URL: |LaunchAuthURL : )(https?://[^\s]+)', content)
+                        if matches:
+                            for url in reversed(matches):
+                                if 'logout' in url or 'im-logged-out' in url:
+                                    print(f"Found logout URL: {url}")
+                                    return url
+                except Exception as e:
+                    print(f"Error reading log file {p}: {e}")
+                    continue
+    except Exception as e:
+        print(f"Warning: fallback Player.log scan failed: {e}")
 
     print("No logout URL found in Unity logs")
     return None
 
 def logout_with_controlled_browser():
-    """Handle logout using the controlled browser instance instead of letting Unity open its own browser."""
+    """Handle logout without relying on Selenium/ChromeDriver.
+
+    The Unity sample app already opens the logout URL in the system browser when LogoutBtn is tapped.
+    Here we monitor Unity logs to capture that logout URL, extract its `returnTo` deep-link, and
+    trigger it via `open` so Unity receives the callback deterministically.
+    """
     print("Starting controlled logout process...")
-    
-    # Set up Chrome WebDriver options to connect to the existing browser instance
-    chrome_options = Options()
-    chrome_options.add_experimental_option("debuggerAddress", "localhost:9222")
-    
-    # Brave binary location on macOS
-    brave_path = "/Applications/Brave Browser.app/Contents/MacOS/Brave Browser"
-    chrome_options.binary_location = brave_path
-    
+
     try:
-        # Connect to the existing browser instance
-        driver = webdriver.Chrome(options=chrome_options)
-        print("Connected to existing browser for logout")
-        
         # Monitor Unity logs for logout URL
         print("Monitoring Unity logs for logout URL...")
         logout_url = None
@@ -93,17 +151,8 @@ def logout_with_controlled_browser():
             time.sleep(1)
 
         if logout_url:
-            print(f"Navigating controlled browser to logout URL: {logout_url}")
-            driver.get(logout_url)
-            
-            # Wait for logout page to load
-            time.sleep(3)
-            print("Logout completed in controlled browser")
-            
-            # Check final page
-            current_url = driver.current_url
-            print(f"Final logout URL: {current_url}")
-            
+            print(f"Captured logout URL from Unity logs: {logout_url}")
+
             # Extract the deep-link from the redirect
             # Look for immutablerunner://logout in the response or extract from returnTo parameter
             if 'returnTo=' in logout_url:
@@ -118,6 +167,10 @@ def logout_with_controlled_browser():
                     print(f"Triggering deep-link manually: {return_to}")
                     subprocess.run(['open', return_to], check=False)
                     time.sleep(2)
+                else:
+                    print("Warning: returnTo parameter present but could not be parsed.")
+            else:
+                print("Warning: logout URL did not include returnTo; cannot trigger deep-link callback.")
 
         else:
             print("Could not find logout URL in Unity logs - logout may complete without browser interaction")