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-06-30 15:42:48 -05: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/HttpResponseBuilder.cs
+++ b/test/Common/MockedHttpClient/HttpResponseBuilder.cs
@ -0,0 +1,84 @@
+using System.Net;
+
+namespace Bit.Test.Common.MockedHttpClient;
+
+public class HttpResponseBuilder : IDisposable
+{
+    private bool _disposedValue;
+
+    public HttpStatusCode StatusCode { get; set; }
+    public IEnumerable<KeyValuePair<string, string>> Headers { get; set; } = new List<KeyValuePair<string, string>>();
+    public IEnumerable<string> HeadersToRemove { get; set; } = new List<string>();
+    public HttpContent Content { get; set; }
+
+    public async Task<HttpResponseMessage> ToHttpResponseAsync()
+    {
+        var copiedContentStream = new MemoryStream();
+        await Content.CopyToAsync(copiedContentStream); // This is important, otherwise the content stream will be disposed when the response is disposed.
+        copiedContentStream.Seek(0, SeekOrigin.Begin);
+        var message = new HttpResponseMessage(StatusCode)
+        {
+            Content = new StreamContent(copiedContentStream),
+        };
+
+        foreach (var header in Headers)
+        {
+            message.Headers.TryAddWithoutValidation(header.Key, header.Value);
+        }
+
+        return message;
+    }
+
+    public HttpResponseBuilder WithStatusCode(HttpStatusCode statusCode)
+    {
+        return new()
+        {
+            StatusCode = statusCode,
+            Headers = Headers,
+            HeadersToRemove = HeadersToRemove,
+            Content = Content,
+        };
+    }
+
+    public HttpResponseBuilder WithHeader(string name, string value)
+    {
+        return new()
+        {
+            StatusCode = StatusCode,
+            Headers = Headers.Append(new KeyValuePair<string, string>(name, value)),
+            HeadersToRemove = HeadersToRemove,
+            Content = Content,
+        };
+    }
+
+    public HttpResponseBuilder WithContent(HttpContent content)
+    {
+        return new()
+        {
+            StatusCode = StatusCode,
+            Headers = Headers,
+            HeadersToRemove = HeadersToRemove,
+            Content = content,
+        };
+    }
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (!_disposedValue)
+        {
+            if (disposing)
+            {
+                Content?.Dispose();
+            }
+
+            _disposedValue = true;
+        }
+    }
+
+    public void Dispose()
+    {
+        // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+        Dispose(disposing: true);
+        GC.SuppressFinalize(this);
+    }
+}