From: Niklas (Krymonota) Date: Thu, 6 Feb 2020 16:36:13 +0000 (+0100) Subject: Update GitHub authorization to use headers instead of query parameters X-Git-Tag: 5.2.2~2^2~1^2^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a043252c7349c08239471b4f1325adca667dd741;p=GitHub%2FWoltLab%2FWCF.git Update GitHub authorization to use headers instead of query parameters Using query parameters for access_token has been deprecated. For further information, check out: - https://community.woltlab.com/thread/281366-github-api-deprecation-notice-for-authentication-via-url-query-parameters/ - https://developer.github.com/changes/2019-11-05-deprecated-passwords-and-authorizations-api/#authenticating-using-query-parameters --- diff --git a/wcfsetup/install/files/lib/action/GithubAuthAction.class.php b/wcfsetup/install/files/lib/action/GithubAuthAction.class.php index e1a59d31a5..123e427bb7 100644 --- a/wcfsetup/install/files/lib/action/GithubAuthAction.class.php +++ b/wcfsetup/install/files/lib/action/GithubAuthAction.class.php @@ -63,7 +63,8 @@ class GithubAuthAction extends AbstractAction { try { // fetch userdata - $request = new HTTPRequest('https://api.github.com/user?access_token='.$data['access_token']); + $request = new HTTPRequest('https://api.github.com/user'); + $request->addHeader('Authorization', 'token '.$data['access_token']); $request->execute(); $reply = $request->getReply(); $userData = JSON::decode(StringUtil::trim($reply['body'])); @@ -119,7 +120,8 @@ class GithubAuthAction extends AbstractAction { WCF::getSession()->register('__username', $userData['login']); try { - $request = new HTTPRequest('https://api.github.com/user/emails?access_token='.$data['access_token']); + $request = new HTTPRequest('https://api.github.com/user/emails'); + $request->addHeader('Authorization', 'token '.$data['access_token']); $request->execute(); $reply = $request->getReply(); $emails = JSON::decode(StringUtil::trim($reply['body']));