From 9e6a7a55f4e7a48f91c1d83ab318a4b9244d744e Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Wed, 5 Dec 2018 10:23:18 -0500 Subject: [PATCH] add github app client id/secret --- data/config.php.example | 4 ++-- lib/thirdparty/Github.class.php | 5 +++++ lib/tools/Config.class.php | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/data/config.php.example b/data/config.php.example index 0ce8ba52..52808851 100644 --- a/data/config.php.example +++ b/data/config.php.example @@ -2,8 +2,8 @@ $config = []; // $config[Config::GITHUB_KEY] = ''; -// $config[Config::GITHUB_DEVELOPER_CREDITS_CLIENT_ID] = ''; -// $config[Config::GITHUB_DEVELOPER_CREDITS_CLIENT_SECRET] = ''; +// $config[Config::GITHUB_APP_CLIENT_ID] = ''; //optional, increases API rate limit +// $config[Config::GITHUB_APP_CLIENT_SECRET] = ''; // $config[Config::LBRY_API_SERVER] = ''; // $config[Config::MAILCHIMP_KEY] = ''; // $config[Config::ASANA_KEY] = ''; diff --git a/lib/thirdparty/Github.class.php b/lib/thirdparty/Github.class.php index 686b34ff..bef2ff4b 100644 --- a/lib/thirdparty/Github.class.php +++ b/lib/thirdparty/Github.class.php @@ -95,6 +95,11 @@ class Github public static function get($endpoint, array $params = [], $cache = true) { $twoHoursInSeconds = 7200; + if (Config::get(Config::GITHUB_APP_CLIENT_ID) && Config::get(Config::GITHUB_APP_CLIENT_SECRET)) + { + $params['client_id'] = Config::get(Config::GITHUB_APP_CLIENT_ID); + $params['client_secret'] = Config::Get(Config::GITHUB_APP_CLIENT_SECRET); + } return CurlWithCache::get( 'https://api.github.com' . $endpoint . '?' . http_build_query($params), [], diff --git a/lib/tools/Config.class.php b/lib/tools/Config.class.php index da0610d7..e4457428 100644 --- a/lib/tools/Config.class.php +++ b/lib/tools/Config.class.php @@ -7,8 +7,8 @@ class Config //Constant to help with managing strings const IS_PROD = "is_prod"; const GITHUB_KEY = "github_key"; - const GITHUB_DEVELOPER_CREDITS_CLIENT_ID = "github_developer_credits_client_id"; - const GITHUB_DEVELOPER_CREDITS_CLIENT_SECRET = "github_developer_credits_client_secret"; + const GITHUB_APP_CLIENT_ID = "github_app_client_id"; + const GITHUB_APP_CLIENT_SECRET = "github_app_client_secret"; const LBRY_API_SERVER = "lbry_api_server"; const MAILCHIMP_KEY = "mailchimp_key"; const ASANA_KEY = "asana_key";