public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Refactor code to use RemoteFilesystem facilities for header parsing, refs #5435

pull/5463/head
Jordi Boggiano 2016-06-21 11:32:39 +01:00
parent f8c3ef4136
commit 1c4acf3583
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Composer/Repository/Vcs/GitHubDriver.php
View File

@ -325,25 +325,18 @@ class GitHubDriver extends VcsDriver
return $this->attemptCloneFallback(); return $this->attemptCloneFallback();
} }
$scopes_issued = array(); $scopesIssued = array();
$scopes_needed = array(); $scopesNeeded = array();
if (!is_null($headers = $e->getHeaders())) { if ($headers = $e->getHeaders()) {
// Check if X-OAuth-Scopes and X-Accepted-OAuth-Scopes should let us in... if ($scopes = $this->remoteFilesystem->findHeaderValue($headers, 'X-OAuth-Scopes')) {
foreach ($headers as $header) { $scopesIssued = explode(' ', $scopes);
$k = substr($header, 0, strpos($header, ":")); }
$v = trim(substr($header, strpos($header, ":")+1)); if ($scopes = $this->remoteFilesystem->findHeaderValue($headers, 'X-Accepted-OAuth-Scopes')) {
switch ($k) { $scopesNeeded = explode(' ', $scopes);
case 'X-OAuth-Scopes':
$scopes_issued = explode(" ", $v);
break;
case 'X-Accepted-OAuth-Scopes':
$scopes_needed = explode(" ", $v);
break;
} }
} }
} $scopesFailed = array_diff($scopesNeeded, $scopesIssued);
$scopes_failed = array_diff($scopes_needed, $scopes_issued); if (!$headers || count($scopesFailed)) {
if (is_null($headers) || count($scopes_failed)) {
$gitHubUtil->authorizeOAuthInteractively($this->originUrl, 'Your GitHub credentials are required to fetch private repository metadata (<info>'.$this->url.'</info>)'); $gitHubUtil->authorizeOAuthInteractively($this->originUrl, 'Your GitHub credentials are required to fetch private repository metadata (<info>'.$this->url.'</info>)');
} }