Browse Source

Merge remote-tracking branch '1stvamp/github-tokens-from-git-config'

Jordi Boggiano 12 years ago
parent
commit
bf5f34a114
1 changed files with 7 additions and 0 deletions
  1. 7 0
      src/Composer/Repository/Vcs/GitHubDriver.php

+ 7 - 0
src/Composer/Repository/Vcs/GitHubDriver.php

@@ -350,6 +350,13 @@ class GitHubDriver extends VcsDriver
 
     protected function authorizeOAuth()
     {
+        // If available use token from git config
+        if (0 === $this->process->execute('git config github.accesstoken', $output)) {
+            $this->io->write('Using Github OAuth token stored in git config (github.accesstoken)');
+            $this->io->setAuthorization($this->originUrl, $output[0], 'x-oauth-basic');
+            return;
+        }
+
         $attemptCounter = 0;
 
         $this->io->write('The credentials will be swapped for an OAuth token stored in '.$this->config->get('home').'/config.json, your password will not be stored');