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

Add the access token as query string parameter.

pull/5363/head
Stefan Grootscholten 2016-06-08 20:56:11 +02:00
parent d9fd9fca6b
commit 7716ef059b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Composer/Util/RemoteFilesystem.php
View File

@ -245,6 +245,11 @@ class RemoteFilesystem
unset($options['gitlab-token']); unset($options['gitlab-token']);
} }
if (isset($options['bitbucket-token'])) {
$fileUrl .= (false === strpos($fileUrl, '?') ? '?' : '&') . 'access_token='.$options['bitbucket-token'];
unset($options['bitbucket-token']);
}
if (isset($options['http'])) { if (isset($options['http'])) {
$options['http']['ignore_errors'] = true; $options['http']['ignore_errors'] = true;
} }
@ -692,7 +697,7 @@ class RemoteFilesystem
} }
} elseif ('bitbucket.org' === $originUrl && $this->fileUrl !== Bitbucket::OAUTH2_ACCESS_TOKEN_URL) { } elseif ('bitbucket.org' === $originUrl && $this->fileUrl !== Bitbucket::OAUTH2_ACCESS_TOKEN_URL) {
if ('x-token-auth' === $auth['username']) { if ('x-token-auth' === $auth['username']) {
$headers[] = 'Authorization: Bearer ' . $auth['password']; $options['bitbucket-token'] = $auth['password'];
} }
} else { } else {
$authStr = base64_encode($auth['username'] . ':' . $auth['password']); $authStr = base64_encode($auth['username'] . ':' . $auth['password']);