refactored raygunclient to be used as a singleton and cleaned up the …

…dependencies for middleware to remove middleware settings

Mindscape.Raygun4Net.AspNetCore.Tests/Program.cs

@@ -9,11 +9,7 @@
 
 builder.Services.AddRazorPages();
 builder.Services.AddMvc();
-builder.Services.AddRaygun(builder.Configuration, new RaygunMiddlewareSettings
-{
-  // adds an optional example of over riding the client provider
-  ClientProvider = new ExampleRaygunAspNetCoreClientProvider()
-});
+builder.Services.AddRaygun(builder.Configuration);
 
 // because we're using a library that uses Raygun, we need to initialize that too
 RaygunClientFactory.Initialize(builder.Configuration["RaygunSettings:ApiKey"]);

Mindscape.Raygun4Net.AspNetCore/ApplicationBuilderExtensions.cs

@@ -0,0 +1,32 @@
+#nullable enable
+
+using System;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace Mindscape.Raygun4Net.AspNetCore;
+
+public static class ApplicationBuilderExtensions
+{
+  public static IApplicationBuilder UseRaygun(this IApplicationBuilder app)
+  {
+    return app.UseMiddleware<RaygunMiddleware>();
+  }
+
+  public static IServiceCollection AddRaygun(this IServiceCollection services, IConfiguration? configuration = null, Action<RaygunSettings>? configure = null)
+  {
+    // Fetch settings from configuration or use default settings
+    var settings = configuration?.GetSection("RaygunSettings").Get<RaygunSettings>() ?? new RaygunSettings();
+
+    // Override settings with user-provided settings
+    configure?.Invoke(settings);
+
+    services.TryAddSingleton(settings);
+    services.TryAddSingleton(s => new RaygunClient(s.GetService<RaygunSettings>()));
+    services.AddHttpContextAccessor();
+
+    return services;
+  }
+}

Mindscape.Raygun4Net.AspNetCore/Builders/RaygunAspNetCoreRequestMessageBuilder.cs

@@ -1,4 +1,6 @@
-using System;
+#nullable enable
+
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
@@ -16,8 +18,13 @@ public class RaygunAspNetCoreRequestMessageBuilder
   {
     private const int MAX_RAW_DATA_LENGTH = 4096; // bytes
 
-    public static async Task<RaygunRequestMessage> Build(HttpContext context, RaygunRequestMessageOptions options)
+    public static async Task<RaygunRequestMessage> Build(HttpContext? context, RaygunRequestMessageOptions? options)
     {
+      if (context == null)
+      {
+        return new RaygunRequestMessage();
+      }
+
       var request = context.Request;
 
       options = options ?? new RaygunRequestMessageOptions();

Mindscape.Raygun4Net.AspNetCore/Builders/RaygunAspNetCoreResponseMessageBuilder.cs

@@ -1,12 +1,19 @@
-using Microsoft.AspNetCore.Http;
+#nullable enable
+
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 
 namespace Mindscape.Raygun4Net.AspNetCore.Builders
 {
   public class RaygunAspNetCoreResponseMessageBuilder
   {
-    public static RaygunResponseMessage Build(HttpContext context)
+    public static RaygunResponseMessage Build(HttpContext? context)
     {
+      if (context == null)
+      {
+        return new RaygunResponseMessage();
+      }
+
       var httpResponseFeature = context.Features.Get<IHttpResponseFeature>();
       return new RaygunResponseMessage
       {

Mindscape.Raygun4Net.AspNetCore/HttpRequestExtensions.cs

@@ -0,0 +1,31 @@
+using System.Net;
+using Microsoft.AspNetCore.Http;
+
+namespace Mindscape.Raygun4Net.AspNetCore;
+
+internal static class HttpRequestExtensions
+{
+  /// <summary>
+  /// Returns true if the IP address of the request originator was 127.0.0.1 or if the IP address of the request was the same as the server's IP address.
+  /// </summary>
+  /// <remarks>
+  /// Credit to Filip W for the initial implementation of this method.
+  /// See http://www.strathweb.com/2016/04/request-islocal-in-asp-net-core/
+  /// </remarks>
+  public static bool IsLocal(this HttpRequest req)
+  {
+    var connection = req.HttpContext.Connection;
+    if (connection.RemoteIpAddress != null)
+    {
+      return (connection.LocalIpAddress != null && connection.RemoteIpAddress.Equals(connection.LocalIpAddress)) || IPAddress.IsLoopback(connection.RemoteIpAddress);
+    }
+
+    // for in memory TestServer or when dealing with default connection info
+    if (connection.RemoteIpAddress == null && connection.LocalIpAddress == null)
+    {
+      return true;
+    }
+
+    return false;
+  }
+}