Skip to content

UserAgent exposed for HTTP requests #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

UserAgent exposed for HTTP requests #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e5fc65f
bumped nuget versions and TFMs
moljac Apr 18, 2023
e846b7d
tests added for failing artifacts (with and w/o UserAgent)
moljac Apr 18, 2023
f939013
exposed HttpClient do UserAgent can be modified
moljac Apr 18, 2023
19858fa
nugets bumped
moljac Apr 18, 2023
f4b2c77
UserAgent added to HttpClient requests
moljac Apr 18, 2023
0f025aa
user agent tests refactored
moljac Apr 18, 2023
9eecb45
update to dotnet 6
moljac Apr 19, 2023
fa32028
net7 TFM removed
moljac Apr 19, 2023
031d7c2
Merge branch 'master' into mu-20230418-user-agent
moljac Apr 28, 2023
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
8 changes: 4 additions & 4 deletions MavenNet.Tests/MavenNet.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFrameworks>net6</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
32 changes: 31 additions & 1 deletion MavenNet.Tests/Test.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,5 +100,35 @@ public async Task Test_GroupIds_Project_MAVENCENTRAL()

Assert.True(project.Dependencies?.Any());
}
}

[Fact]
public async Task Test_GroupIds_Project_MAVENCENTRAL_1()
{
var repo = MavenRepository.FromMavenCentral();
MavenRepository.HttpClient.DefaultRequestHeaders.Add("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36");
await repo.Refresh("com.google.accompanist");

var project = await repo.GetProjectAsync("com.google.accompanist", "accompanist-appcompat-theme", "0.30.1");

Assert.True(project != null);

Assert.True(project.Dependencies?.Any());
}

[Fact]
public async Task Test_GroupIds_Project_MAVENCENTRAL_2()
{
var repo = MavenRepository.FromMavenCentral();
MavenRepository.HttpClient.DefaultRequestHeaders.Clear();
await repo.Refresh("com.google.accompanist");

try
{
var project = await repo.GetProjectAsync("com.google.accompanist", "accompanist-appcompat-theme", "0.30.1");
}
finally
{
}
}
}
}
9 changes: 5 additions & 4 deletions MavenNet/MavenCentralRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ protected override string CombinePaths(params string[] parts)
return string.Join(new string(PathSeparator, 1), parts);
}

static readonly HttpClient http = new HttpClient();

protected override async Task<IEnumerable<Artifact>> GetArtifactsAsync(string groupId)
{
var artifacts = new List<Artifact>();

var url = $"http://search.maven.org/solrsearch/select?q=g:%22{groupId}%22&rows=100&wt=json";

var data = await http.GetStringAsync(url);
// enable by default?
// HttpClient.DefaultRequestHeaders.Add("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36");

var data = await HttpClient.GetStringAsync(url);

var json = JObject.Parse(data);

Expand Down Expand Up @@ -83,7 +84,7 @@ protected override Task<Stream> OpenFileAsync(string path)
{
var url = $"https://repo1.maven.org/maven2/{path}";

return http.GetStreamAsync(url);
return HttpClient.GetStreamAsync(url);
}
}
}
4 changes: 2 additions & 2 deletions MavenNet/MavenNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<Compile Remove="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NuGet.Versioning" Version="5.9.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NuGet.Versioning" Version="6.5.0" />
</ItemGroup>
</Project>
3 changes: 3 additions & 0 deletions MavenNet/MavenRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@
using System.IO;
using System.Threading.Tasks;
using MavenNet.Models;
using System.Net.Http;

namespace MavenNet
{
public abstract class MavenRepository : IMavenRepository
{
public static readonly HttpClient HttpClient = new HttpClient();

public static GoogleMavenRepository FromGoogle()
{
return new GoogleMavenRepository();
Expand Down