Rewrite Icon fetching (#3023)

* Rewrite Icon fetching * Move validation to IconUri, Uri, or UriBuilder * `dotnet format` 🤖 * PR suggestions * Add not null compiler hint * Add twitter to test case * Move Uri manipulation to UriService * Implement MockedHttpClient Presents better, fluent handling of message matching and response building. * Add redirect handling tests * Add testing to models * More aggressively dispose content in icon link * Format 🤖 * Update icon lockfile * Convert to cloned stream for HttpResponseBuilder Content was being disposed when HttResponseMessage was being disposed. This avoids losing our reference to our content and allows multiple usages of the same `MockedHttpMessageResponse` * Move services to extension Extension is shared by testing and allows access to services from our service tests * Remove unused `using` * Prefer awaiting asyncs for better exception handling * `dotnet format` 🤖 * Await async * Update tests to use test TLD and ip ranges * Remove unused interfaces * Make assignments static when possible * Prefer invariant comparer to downcasing * Prefer injecting interface services to implementations * Prefer comparer set in HashSet initialization * Allow SVG icons * Filter out icons with unknown formats * Seek to beginning of MemoryStream after writing it * More appropriate to not return icon if it's invalid * Add svg icon test
2025-12-13 14:53:34 +00:00 · 2023-08-08 15:29:40 -04:00
parent ca368466ce
commit 4377c7a897
31 changed files with 1685 additions and 522 deletions
--- a/test/Common/MockedHttpClient/MockedHttpMessageHandler.cs
+++ b/test/Common/MockedHttpClient/MockedHttpMessageHandler.cs
@@ -0,0 +1,113 @@
+#nullable enable
+
+using System.Net;
+
+namespace Bit.Test.Common.MockedHttpClient;
+
+public class MockedHttpMessageHandler : HttpMessageHandler
+{
+    private readonly List<IHttpRequestMatcher> _matchers = new();
+
+    /// <summary>
+    /// The fallback handler to use when the request does not match any of the provided matchers.
+    /// </summary>
+    /// <returns>A Matcher that responds with 404 Not Found</returns>
+    public MockedHttpResponse Fallback { get; set; } = new(HttpStatusCode.NotFound);
+
+    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+    {
+        var matcher = _matchers.FirstOrDefault(x => x.Matches(request));
+        if (matcher == null)
+        {
+            return await Fallback.RespondToAsync(request);
+        }
+
+        return await matcher.RespondToAsync(request);
+    }
+
+    /// <summary>
+    /// Instantiates a new HttpRequestMessage matcher that will handle requests in fitting with the returned matcher. Configuration can be chained.
+    /// </summary>
+    /// <param name="requestMatcher"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public T When<T>(T requestMatcher) where T : IHttpRequestMatcher
+    {
+        _matchers.Add(requestMatcher);
+        return requestMatcher;
+    }
+
+    /// <summary>
+    /// Instantiates a new HttpRequestMessage matcher that will handle requests in fitting with the returned matcher. Configuration can be chained.
+    /// </summary>
+    /// <param name="requestMatcher"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public HttpRequestMatcher When(string uri)
+    {
+        var matcher = new HttpRequestMatcher(uri);
+        _matchers.Add(matcher);
+        return matcher;
+    }
+
+    /// <summary>
+    /// Instantiates a new HttpRequestMessage matcher that will handle requests in fitting with the returned matcher. Configuration can be chained.
+    /// </summary>
+    /// <param name="requestMatcher"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public HttpRequestMatcher When(Uri uri)
+    {
+        var matcher = new HttpRequestMatcher(uri);
+        _matchers.Add(matcher);
+        return matcher;
+    }
+
+    /// <summary>
+    /// Instantiates a new HttpRequestMessage matcher that will handle requests in fitting with the returned matcher. Configuration can be chained.
+    /// </summary>
+    /// <param name="requestMatcher"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public HttpRequestMatcher When(HttpMethod method)
+    {
+        var matcher = new HttpRequestMatcher(method);
+        _matchers.Add(matcher);
+        return matcher;
+    }
+
+    /// <summary>
+    /// Instantiates a new HttpRequestMessage matcher that will handle requests in fitting with the returned matcher. Configuration can be chained.
+    /// </summary>
+    /// <param name="requestMatcher"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public HttpRequestMatcher When(HttpMethod method, string uri)
+    {
+        var matcher = new HttpRequestMatcher(method, uri);
+        _matchers.Add(matcher);
+        return matcher;
+    }
+
+    /// <summary>
+    /// Instantiates a new HttpRequestMessage matcher that will handle requests in fitting with the returned matcher. Configuration can be chained.
+    /// </summary>
+    /// <param name="requestMatcher"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public HttpRequestMatcher When(Func<HttpRequestMessage, bool> matcher)
+    {
+        var requestMatcher = new HttpRequestMatcher(matcher);
+        _matchers.Add(requestMatcher);
+        return requestMatcher;
+    }
+
+    /// <summary>
+    /// Converts the MockedHttpMessageHandler to a HttpClient that can be used in your tests after setup.
+    /// </summary>
+    /// <returns></returns>
+    public HttpClient ToHttpClient()
+    {
+        return new HttpClient(this);
+    }
+}