Merge pull request #515 from immutable/fix/uwb-logs

[ID-3839] fix: uwb log level

Author: nattb8

src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/[email protected]/Runtime/Logging/DefaultUnityWebBrowserLogger.cs

@@ -7,6 +7,7 @@
 
 using System;
 using UnityEngine;
+using VoltstroStudios.UnityWebBrowser.Shared;
 
 namespace VoltstroStudios.UnityWebBrowser.Logging
 {
@@ -18,32 +19,43 @@ public sealed class DefaultUnityWebBrowserLogger : IWebBrowserLogger
         private const string LoggingTag = "[UWB]";
 
         private readonly ILogger logger;
+
+        private LogSeverity logSeverity;
 
         /// <summary>
         /// A function that defines how sensitive data should be redacted.
         /// If null, no redaction is applied.
         /// </summary>
         public Func<string, string>? redactionHandler;
 
-        public DefaultUnityWebBrowserLogger(Func<string, string>? redactionHandler = null)
+        public DefaultUnityWebBrowserLogger(LogSeverity logSeverity = LogSeverity.Info, Func<string, string>? redactionHandler = null)
         {
             logger = UnityEngine.Debug.unityLogger;
+            this.logSeverity = logSeverity;
             this.redactionHandler = redactionHandler;
         }
 
         public void Debug(object message)
         {
-            logger.Log(LogType.Log, LoggingTag, redactIfRequired(message));
+            if (ShouldLog(LogSeverity.Debug))
+                logger.Log(LogType.Log, LoggingTag, redactIfRequired(message));
         }
 
         public void Warn(object message)
         {
-            logger.LogWarning(LoggingTag, redactIfRequired(message));
+            if (ShouldLog(LogSeverity.Warn))
+                logger.LogWarning(LoggingTag, redactIfRequired(message));
         }
 
         public void Error(object message)
         {
-            logger.LogError(LoggingTag, redactIfRequired(message));
+            if (ShouldLog(LogSeverity.Error))
+                logger.LogError(LoggingTag, redactIfRequired(message));
+        }
+        
+        private bool ShouldLog(LogSeverity severity)
+        {
+            return severity >= logSeverity;
         }
 
         private object redactIfRequired(object message)

src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/[email protected]/Runtime/UwbWebView.cs

@@ -43,16 +43,17 @@ public async UniTask Init(int engineStartupTimeoutMs, bool redactTokensInLogs, F
             webBrowserClient.noSandbox = true;
 
             // Log level
-            webBrowserClient.logSeverity = PassportLogger.CurrentLogLevel switch
+            var logSeverity = PassportLogger.CurrentLogLevel switch
             {
                 LogLevel.Debug => LogSeverity.Debug,
                 LogLevel.Warn => LogSeverity.Warn,
                 LogLevel.Error => LogSeverity.Error,
                 _ => LogSeverity.Info
             };
+            webBrowserClient.logSeverity = logSeverity;
 
             // Logger
-            webBrowserClient.Logger = new DefaultUnityWebBrowserLogger(redactionHandler: redactTokensInLogs ? redactionHandler : null);
+            webBrowserClient.Logger = new DefaultUnityWebBrowserLogger(logSeverity: logSeverity, redactionHandler: redactTokensInLogs ? redactionHandler : null);
 
             // Js
             webBrowserClient.jsMethodManager = new JsMethodManager { jsMethodsEnable = true };