Skip to content

Only authenticate with GH if necessary #114

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

Merged
merged 1 commit into from
Jul 2, 2024
Merged

Only authenticate with GH if necessary #114

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
49 changes: 33 additions & 16 deletions src/File/Http/GitHubAuthHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,35 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
if (request.RequestUri == null)
return await base.SendAsync(request, cancellationToken);

var creds = await GetCredentialAsync();
var builder = new UriBuilder(request.RequestUri)
var response = await base.SendAsync(request, cancellationToken);
if (response.StatusCode == System.Net.HttpStatusCode.Forbidden ||
response.StatusCode == System.Net.HttpStatusCode.NotFound)
{
UserName = creds.Password,
Password = "x-auth-basic"
};

// retry the request
var retry = new HttpRequestMessage(HttpMethod.Get, builder.Uri);
retry.Headers.Add("Authorization", "Basic " + Convert.ToBase64String(Encoding.ASCII.GetBytes(creds.Password)));
foreach (var etag in request.Headers.IfNoneMatch)
{
retry.Headers.IfNoneMatch.Add(etag);
var creds = await GetCredentialAsync();
if (creds == null)
return response;

var builder = new UriBuilder(request.RequestUri)
{
UserName = creds.Password,
Password = "x-auth-basic"
};

// retry the request
var retry = new HttpRequestMessage(HttpMethod.Get, builder.Uri);
retry.Headers.Add("Authorization", "Basic " + Convert.ToBase64String(Encoding.ASCII.GetBytes(creds.Password)));
foreach (var etag in request.Headers.IfNoneMatch)
{
retry.Headers.IfNoneMatch.Add(etag);
}

return await base.SendAsync(retry, cancellationToken);
}

return await base.SendAsync(retry, cancellationToken);
return response;
}

async Task<ICredential> GetCredentialAsync()
async Task<ICredential?> GetCredentialAsync()
{
if (credential != null)
return credential;
Expand All @@ -51,8 +61,15 @@ async Task<ICredential> GetCredentialAsync()

var provider = new GitHubHostProvider(new CommandContext());

credential = await provider.GetCredentialAsync(input);
return credential;
try
{
credential = await provider.GetCredentialAsync(input);
return credential;
}
catch (Exception)
{
return null;
}
}
}
}