Gracefully handle null Bugsnag ApiKey

sillsdev · Sep 11, 2024 · d3f83c7 · d3f83c7
1 parent 283e41d
commit d3f83c7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/Serval/src/Serval.Shared/Controllers/BugsnagExceptionFilter.cs b/src/Serval/src/Serval.Shared/Controllers/BugsnagExceptionFilter.cs
@@ -7,6 +7,10 @@ public class BugsnagExceptionFilter : ExceptionFilterAttribute
     public override void OnException(ExceptionContext context)
     {
         Bugsnag.IClient? client = context.HttpContext.RequestServices.GetService<Bugsnag.IClient>();
+        if (client?.Configuration.ApiKey == null)
+        {
+            return;
+        }
         client?.Notify(context.Exception);
     }
 }
diff --git a/src/ServiceToolkit/src/SIL.ServiceToolkit/Configuration/BugsnagOptions.cs b/src/ServiceToolkit/src/SIL.ServiceToolkit/Configuration/BugsnagOptions.cs
@@ -4,5 +4,5 @@ public class BugsnagOptions
 {
     public const string Key = "Bugsnag";
 
-    public string ApiKey { get; set; } = "";
+    public string? ApiKey { get; set; } = null;
 }
diff --git a/src/ServiceToolkit/src/SIL.ServiceToolkit/Configuration/IServiceCollectionExtensions.cs b/src/ServiceToolkit/src/SIL.ServiceToolkit/Configuration/IServiceCollectionExtensions.cs
@@ -13,13 +13,10 @@ public static IServiceCollection AddBugSnag(this IServiceCollection services, IC
         {
             Console.WriteLine("BugSnag ApiKey not available - not adding BugSnag.");
         }
-        else
+        services.AddBugsnag(configuration =>
         {
-            services.AddBugsnag(configuration =>
-            {
-                configuration.ApiKey = apiKey;
-            });
-        }
+            configuration.ApiKey = apiKey;
+        });
         return services;
     }
 }