Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/Meilisearch/Extensions/HttpExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,13 @@ public static void AddApiKeyToHeader(this HttpClient client, string apiKey)
}
}

public static void AddDefaultUserAgent(this HttpClient client)
{
var version = new Version();

client.DefaultRequestHeaders.Add("User-Agent", version.GetQualifiedVersion());
}

private static StringContent PrepareJsonPayload<T>(T body, JsonSerializerOptions options = null)
{
options = options ?? Constants.JsonSerializerOptionsWriteNulls;
Expand Down
4 changes: 3 additions & 1 deletion src/Meilisearch/MeilisearchClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ public class MeilisearchClient
/// </summary>
/// <param name="url">URL corresponding to Meilisearch server.</param>
/// <param name="apiKey">API Key to connect to the Meilisearch server.</param>
public MeilisearchClient(string url, string apiKey = default)
public MeilisearchClient(string url, string apiKey = default, HttpClient client = null)
{
_http = new HttpClient(new MeilisearchMessageHandler(new HttpClientHandler())) { BaseAddress = new Uri(url) };
_http.AddApiKeyToHeader(apiKey);
_http.AddDefaultUserAgent();
_taskEndpoint = null;
}

Expand All @@ -43,6 +44,7 @@ public MeilisearchClient(HttpClient client, string apiKey = default)
{
_http = client;
_http.AddApiKeyToHeader(apiKey);
_http.AddDefaultUserAgent();
}

/// <summary>
Expand Down
11 changes: 11 additions & 0 deletions tests/Meilisearch.Tests/MeilisearchClientTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -145,5 +145,16 @@ public async Task DeleteIndex()
var finishedTask = await _defaultClient.Index(indexUid).WaitForTaskAsync(task.Uid);
Assert.Equal("succeeded", finishedTask.Status);
}

[Fact]
public void GetDefaultUserAgentHeader()
{
var httpClient = ClientFactory.Instance.CreateClient<MeilisearchClient>();
var client = new MeilisearchClient(httpClient);
var userAgent = string.Join(' ', httpClient.DefaultRequestHeaders.GetValues("User-Agent"));
var version = new Version();

Assert.Equal(version.GetQualifiedVersion(), userAgent);
}
}
}