Merge - Add missing change

nibra · nibra · commit 44ab61cbdb5c · 2021-01-04T17:11:10.000+01:00
diff --git a/src/AbstractGithubObject.php b/src/AbstractGithubObject.php
@@ -115,8 +115,14 @@ protected function fetchUrl($path, $page = 0, $limit = 0)
 
 		if ($this->options->get('gh.token', false))
 		{
-			// Use oAuth authentication - @todo set in request header ?
-			$uri->setVar('access_token', $this->options->get('gh.token'));
+			// Use oAuth authentication
+			$headers = $this->client->getOption('headers', array());
+
+			if (!isset($headers['Authorization']))
+			{
+				$headers['Authorization'] = 'token ' . $this->options->get('gh.token');
+				$this->client->setOption('headers', $headers);
+			}
 		}
 		else
 		{

Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,14 @@ protected function fetchUrl($path, $page = 0, $limit = 0)`
`115`	`115`
`116`	`116`	`if ($this->options->get('gh.token', false))`
`117`	`117`	`{`
`118`		`- // Use oAuth authentication - @todo set in request header ?`
`119`		`- $uri->setVar('access_token', $this->options->get('gh.token'));`
	`118`	`+ // Use oAuth authentication`
	`119`	`+ $headers = $this->client->getOption('headers', array());`
	`120`	`+`
	`121`	`+ if (!isset($headers['Authorization']))`
	`122`	`+ {`
	`123`	`+ $headers['Authorization'] = 'token ' . $this->options->get('gh.token');`
	`124`	`+ $this->client->setOption('headers', $headers);`
	`125`	`+ }`
`120`	`126`	`}`
`121`	`127`	`else`
`122`	`128`	`{`