cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-28 23:52:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix GitHubAccessToken never being used

Browse Source
This commit is contained in:
Jordan Brown
2021-01-25 17:23:04 -05:00
parent 4d831fd0e3
commit 2da9f7ca82
1 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Core/GitHubClientFactory.cs
+28 -18
View File
@@ -1,5 +1,7 @@
using System;
using Microsoft.Extensions.Options;
using Octokit;
using Tgstation.Server.Host.Configuration;
using Tgstation.Server.Host.System;
namespace Tgstation.Server.Host.Core
@@ -12,35 +14,43 @@ namespace Tgstation.Server.Host.Core
/// </summary>
readonly IAssemblyInformationProvider assemblyInformationProvider;
/// <summary>
/// The <see cref="GeneralConfiguration"/> for the <see cref="GitHubClientFactory"/>.
/// </summary>
readonly GeneralConfiguration generalConfiguration;
/// <summary>
/// Construct a <see cref="GitHubClientFactory"/>
/// </summary>
/// <param name="assemblyInformationProvider">The value of <see cref="assemblyInformationProvider"/></param>
public GitHubClientFactory(IAssemblyInformationProvider assemblyInformationProvider)
/// <param name="assemblyInformationProvider">The value of <see cref="assemblyInformationProvider"/>.</param>
///
public GitHubClientFactory(IAssemblyInformationProvider assemblyInformationProvider, IOptions<GeneralConfiguration> generalConfigurationOptions)
{
this.assemblyInformationProvider = assemblyInformationProvider ?? throw new ArgumentNullException(nameof(assemblyInformationProvider));
generalConfiguration = generalConfigurationOptions?.Value ?? throw new ArgumentNullException(nameof(generalConfigurationOptions));
}
/// <summary>
/// Create a <see cref="GitHubClient"/>
/// Create a <see cref="GitHubClient"/>.
/// </summary>
/// <param name="accessToken">Optional access token to use as credentials.</param>
/// <returns>A new <see cref="GitHubClient"/></returns>
GitHubClient CreateBaseClient() => new GitHubClient(
new ProductHeaderValue(
assemblyInformationProvider.ProductInfoHeaderValue.Product.Name,
assemblyInformationProvider.ProductInfoHeaderValue.Product.Version));
/// <inheritdoc />
public IGitHubClient CreateClient() => CreateBaseClient();
/// <inheritdoc />
public IGitHubClient CreateClient(string accessToken)
GitHubClient CreateClientImpl(string accessToken)
{
if (accessToken == null)
throw new ArgumentNullException(nameof(accessToken));
var result = CreateBaseClient();
result.Credentials = new Credentials(accessToken);
return result;
var client = new GitHubClient(
new ProductHeaderValue(
assemblyInformationProvider.ProductInfoHeaderValue.Product.Name,
assemblyInformationProvider.ProductInfoHeaderValue.Product.Version));
if (accessToken != null)
client.Credentials = new Credentials(accessToken);
return client;
}
/// <inheritdoc />
public IGitHubClient CreateClient() => CreateClientImpl(generalConfiguration.GitHubAccessToken);
/// <inheritdoc />
public IGitHubClient CreateClient(string accessToken) => CreateClientImpl(accessToken ?? throw new ArgumentNullException(nameof(accessToken)));
}
}