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

Merge branch '1.10'

pull/9391/head
Jordi Boggiano 2020-10-30 17:30:33 +01:00
parent d25e66ad53 78797df5f8
commit 0a356b8a39
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Composer/Util/AuthHelper.php
View File

@ -125,8 +125,9 @@ class AuthHelper
) { ) {
throw new TransportException('Could not authenticate against '.$origin, 401); throw new TransportException('Could not authenticate against '.$origin, 401);
} }
} elseif ($origin === 'bitbucket.org') { } elseif ($origin === 'bitbucket.org' || $origin === 'api.bitbucket.org') {
$askForOAuthToken = true; $askForOAuthToken = true;
$origin = 'bitbucket.org';
if ($this->io->hasAuthentication($origin)) { if ($this->io->hasAuthentication($origin)) {
$auth = $this->io->getAuthentication($origin); $auth = $this->io->getAuthentication($origin);
if ($auth['username'] !== 'x-token-auth') { if ($auth['username'] !== 'x-token-auth') {

2
src/Composer/Util/Bitbucket.php
View File

@ -142,7 +142,7 @@ class Bitbucket
$this->io->writeError($message); $this->io->writeError($message);
} }
$url = 'https://confluence.atlassian.com/bitbucket/oauth-on-bitbucket-cloud-238027431.html'; $url = 'https://support.atlassian.com/bitbucket-cloud/docs/use-oauth-on-bitbucket-cloud/';
$this->io->writeError(sprintf('Follow the instructions on %s', $url)); $this->io->writeError(sprintf('Follow the instructions on %s', $url));
$this->io->writeError(sprintf('to create a consumer. It will be stored in "%s" for future use by Composer.', $this->config->getAuthConfigSource()->getName())); $this->io->writeError(sprintf('to create a consumer. It will be stored in "%s" for future use by Composer.', $this->config->getAuthConfigSource()->getName()));
$this->io->writeError('Ensure you enter a "Callback URL" (http://example.com is fine) or it will not be possible to create an Access Token (this callback url will not be used by composer)'); $this->io->writeError('Ensure you enter a "Callback URL" (http://example.com is fine) or it will not be possible to create an Access Token (this callback url will not be used by composer)');