Skip to content

Added support for optional Authorization and Accept headers via environment variables. #634

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
azchohfi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added support for optional Authorization and Accept headers via environment variables. #634

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 28 additions & 7 deletions src/WingetCreateCore/Common/PackageParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,7 @@ public static class PackageParser
"nullsoft",
};

private static HttpClient httpClient = new()
{
DefaultRequestHeaders =
{
UserAgent = { new ProductInfoHeaderValue("WinGetCreate", Utils.GetEntryAssemblyVersion()) },
},
};
private static HttpClient httpClient = CreateHttpClient();

private enum MachineType
{
Expand Down Expand Up @@ -85,6 +79,33 @@ public static void SetHttpMessageHandler(HttpMessageHandler httpMessageHandler)
{
httpClient.Dispose();
httpClient = httpMessageHandler != null ? new HttpClient(httpMessageHandler) : new HttpClient();
SetDefaultHeaders(httpClient);
}

private static HttpClient CreateHttpClient()
{
var client = new HttpClient();
SetDefaultHeaders(client);
return client;
}

private static void SetDefaultHeaders(HttpClient client)
{
client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("WinGetCreate", Utils.GetEntryAssemblyVersion()));

// Add Authorization header from environment variable, if present
string authToken = Environment.GetEnvironmentVariable("WINGET_CREATE_HTTP_CLIENT_AUTH_TOKEN");
if (!string.IsNullOrEmpty(authToken))
{
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", authToken);
}

// Add Accept header from environment variable, if present
string acceptHeader = Environment.GetEnvironmentVariable("WINGET_CREATE_HTTP_CLIENT_ACCEPT_HEADER");
if (!string.IsNullOrEmpty(acceptHeader))
{
client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptHeader));
}
}

/// <summary>
Expand Down