OAuth Support for Bitbucket #5055
Conversation
… content before calling http_build_query.
|
|
||
| // if available use token from git config | ||
| if (0 === $this->process->execute('git config bitbucket.accesstoken', $output)) { | ||
| $this->io->setAuthentication($originUrl, trim($output), 'x-oauth-basic'); |
There was a problem hiding this comment.
This seems like it won't work for bitbucket?
|
Is the bitbucket-domains config really needed? It seems to me like this stuff only works for "bitbucket cloud" which is bitbucket.org. I don't have a bitbucket server to check though so no idea. |
|
I've never used Atlassian's Stash (now called Bitbucket Server), so I'm not sure if they allow different domains. I can remove the config for now, and add it back later if it's requested. |
| @@ -27,6 +27,7 @@ class Config | |||
| 'preferred-install' => 'auto', | |||
| 'notify-on-install' => true, | |||
| 'github-protocols' => array('https', 'ssh', 'git'), | |||
| 'bitbucket-protocols' => array('https'), | |||
There was a problem hiding this comment.
do we need it ? Are they allowing to clone with another protocol ?
|
We're running a pretty out of date Stash 3.3 here (still need to plan an update to Bitbucket Server hehe) but I can't find OAuth anywhere in the configs. Don't think it's much use either behind the firewall...? All I can find on Google with a quick search refers to Bitbucket Cloud as well. Let me know if there's anything I can test with our Stash instance though. |
| try { | ||
| $apiUrl = 'bitbucket.org/site/oauth2/access_token'; | ||
|
|
||
| $json = $this->remoteFilesystem->getContents($originUrl, 'https://'.$apiUrl, false, array( |
There was a problem hiding this comment.
https:// should be in the apiUrl variable directly IMO here
The OAuth logic always performs the OAuth calls on the bitbucket.org API in this API, so it does not support any other domain |
…tication when read from git config. Grant type is now only set when requesting an access token. Removed bitbucket-domains and bitbucket-protocols from config. Fixed bitbucket typo in JsonConfigSource. Removed unecessary comments. Changed visibility of Composer/Util/Bitbucket properties to private. Added https to bitbucket url. Removed unused $note variable.
|
I completed the updates per the conversations above. |
| // handle bitbucket-oauth | ||
| if (preg_match('/^(bitbucket-oauth)\.(.+)/', $settingKey, $matches)) { | ||
| if (2 !== count($values)) { | ||
| throw new \RuntimeException('Excepted two arguments (consumer-key, consumer-secret), got '.count($values)); |
There was a problem hiding this comment.
There's a typo in the exception message. Should be Expected, not Excepted.
|
alrighty, thanks @wenkepaul |
I used existing github-oauth code as a template to develop bitbucket-oauth functionality. Users can add consumer-key and consumer-secret to auth.json. Instructions on how to obtain the consumer keys have been added to the documentation.