Enable support for Github Enterprise when using Github Authentication

This commit is contained in:
Frederic Guillot
2015-08-01 16:48:58 -04:00
parent 80a0c9f560
commit ea24cfb07c
6 changed files with 38 additions and 4 deletions

View File

@@ -94,8 +94,8 @@ class Github extends Base
GITHUB_CLIENT_ID,
GITHUB_CLIENT_SECRET,
$this->helper->url->to('oauth', 'github', array(), '', true),
'https://github.com/login/oauth/authorize',
'https://github.com/login/oauth/access_token',
GITHUB_OAUTH_AUTHORIZE_URL,
GITHUB_OAUTH_TOKEN_URL,
array()
);
}
@@ -115,7 +115,7 @@ class Github extends Base
$this->getService()->getAccessToken($code);
return $this->httpClient->getJson(
'https://api.github.com/user',
GITHUB_API_URL.'user',
array($this->getService()->getAuthorizationHeader())
);
}

View File

@@ -46,6 +46,9 @@ defined('GOOGLE_CLIENT_SECRET') or define('GOOGLE_CLIENT_SECRET', '');
defined('GITHUB_AUTH') or define('GITHUB_AUTH', false);
defined('GITHUB_CLIENT_ID') or define('GITHUB_CLIENT_ID', '');
defined('GITHUB_CLIENT_SECRET') or define('GITHUB_CLIENT_SECRET', '');
defined('GITHUB_OAUTH_AUTHORIZE_URL') or define('GITHUB_OAUTH_AUTHORIZE_URL', 'https://github.com/login/oauth/authorize');
defined('GITHUB_OAUTH_TOKEN_URL') or define('GITHUB_OAUTH_TOKEN_URL', 'https://github.com/login/oauth/access_token');
defined('GITHUB_API_URL') or define('GITHUB_API_URL', 'https://api.github.com/');
// Proxy authentication
defined('REVERSE_PROXY_AUTH') or define('REVERSE_PROXY_AUTH', false);