Reuse github existing tokens instead of failing, fixes #2724
parent
1851c29dd3
commit
5b0dc99fec
|
@ -101,12 +101,36 @@ class GitHub
|
||||||
$appName .= ' on ' . trim($output);
|
$appName .= ' on ' . trim($output);
|
||||||
}
|
}
|
||||||
|
|
||||||
$headers = array('Content-Type: application/json');
|
$headers = array();
|
||||||
|
|
||||||
if ($otp) {
|
if ($otp) {
|
||||||
$headers[] = 'X-GitHub-OTP: ' . $otp;
|
$headers = array('X-GitHub-OTP: ' . $otp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// try retrieving an existing token with the same name
|
||||||
|
$contents = null;
|
||||||
|
$auths = JsonFile::parseJson($this->remoteFilesystem->getContents($originUrl, 'https://'. $apiUrl . '/authorizations', false, array(
|
||||||
|
'retry-auth-failure' => false,
|
||||||
|
'http' => array(
|
||||||
|
'header' => $headers
|
||||||
|
)
|
||||||
|
)));
|
||||||
|
foreach ($auths as $auth) {
|
||||||
|
if (
|
||||||
|
isset($auth['app']['name'])
|
||||||
|
&& 0 === strpos($auth['app']['name'], $appName)
|
||||||
|
&& $auth['app']['url'] === 'https://getcomposer.org/'
|
||||||
|
) {
|
||||||
|
$this->io->write('An existing OAuth token for Composer is present and will be reused');
|
||||||
|
|
||||||
|
$contents['token'] = $auth['token'];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// no existing token, create one
|
||||||
|
if (empty($contents['token'])) {
|
||||||
|
$headers[] = array('Content-Type: application/json');
|
||||||
|
|
||||||
$contents = JsonFile::parseJson($this->remoteFilesystem->getContents($originUrl, 'https://'. $apiUrl . '/authorizations', false, array(
|
$contents = JsonFile::parseJson($this->remoteFilesystem->getContents($originUrl, 'https://'. $apiUrl . '/authorizations', false, array(
|
||||||
'retry-auth-failure' => false,
|
'retry-auth-failure' => false,
|
||||||
'http' => array(
|
'http' => array(
|
||||||
|
@ -120,6 +144,8 @@ class GitHub
|
||||||
)),
|
)),
|
||||||
)
|
)
|
||||||
)));
|
)));
|
||||||
|
$this->io->write('Token successfully created');
|
||||||
|
}
|
||||||
} catch (TransportException $e) {
|
} catch (TransportException $e) {
|
||||||
if (in_array($e->getCode(), array(403, 401))) {
|
if (in_array($e->getCode(), array(403, 401))) {
|
||||||
// 401 when authentication was supplied, handle 2FA if required.
|
// 401 when authentication was supplied, handle 2FA if required.
|
||||||
|
|
Loading…
Reference in New Issue