From efd347bfbd7172025ee5f5de43a32ec35639be86 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Wed, 19 Sep 2018 14:16:31 -0400 Subject: [PATCH] Prefer instance GitHub credentials to global ones --- .../Controllers/RepositoryController.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs index 0c5ba6841b..3ca9664847 100644 --- a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs +++ b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs @@ -533,7 +533,11 @@ namespace Tgstation.Server.Host.Controllers foreach (var I in model.NewTestMerges.Where(x => String.IsNullOrWhiteSpace(x.PullRequestRevision))) I.PullRequestRevision = null; - var gitHubClient = String.IsNullOrEmpty(generalConfiguration.GitHubAccessToken) ? (currentModel.AccessToken != null ? gitHubClientFactory.CreateClient(currentModel.AccessToken) : gitHubClientFactory.CreateClient()) : gitHubClientFactory.CreateClient(generalConfiguration.GitHubAccessToken); + var gitHubClient = currentModel.AccessToken != null + ? gitHubClientFactory.CreateClient(currentModel.AccessToken) + : (String.IsNullOrEmpty(generalConfiguration.GitHubAccessToken) + ? gitHubClientFactory.CreateClient() + : gitHubClientFactory.CreateClient(generalConfiguration.GitHubAccessToken)); var repoOwner = repo.GitHubOwner; var repoName = repo.GitHubRepoName; @@ -665,6 +669,10 @@ namespace Tgstation.Server.Host.Controllers //you look at your anonymous access and sigh errorMessage = "P.R.E. RATE LIMITED"; } + catch (Octokit.AuthorizationException) + { + errorMessage = "P.R.E. BAD CREDENTIALS"; + } catch (Octokit.NotFoundException) { //you look at your shithub and sigh