Merge pull request #211 from andytson-inviqa/feature/github-authoriza…

…tion-header Use authorization: token header for Github authentication
hirak · Feb 16, 2020 · 53d20eb · 53d20eb
2 parents a382b93 + fbc5e00
commit 53d20eb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/BaseRequest.php b/src/BaseRequest.php
@@ -142,7 +142,7 @@ protected function setupAuthentication(IO\IOInterface $io, $useRedirector, array
 
         // is github
         if (in_array($authKey, $githubDomains) && 'x-oauth-basic' === $auth['password']) {
-            $this->addParam('access_token', $auth['username']);
+            $this->addHeader('authorization', 'token ' . $auth['username']);
             $this->user = $this->pass = null;
             return;
         }

diff --git a/tests/unit/CopyRequestTest.php b/tests/unit/CopyRequestTest.php
@@ -89,11 +89,15 @@ public function testGitHubRedirector()
 
         // user:pass -> query
         $req = new CopyRequest($example, $tmpfile, false, $this->iop->reveal(), $this->configp->reveal());
-        $this->assertEquals("$example&access_token=at", $req->getURL());
+        $this->assertEquals($example, $req->getURL());
+        $opts = $req->getCurlOptions();
+        $this->assertContains('Authorization: token at', $opts[CURLOPT_HTTPHEADER]);
 
         // api.github.com -> codeload.github.com
         $req = new CopyRequest($example, $tmpfile, true, $this->iop->reveal(), $this->configp->reveal());
-        $this->assertEquals('https://codeload.github.com/vendor/name/legacy.zip/aaaa?a=b&access_token=at', $req->getURL());
+        $this->assertEquals('https://codeload.github.com/vendor/name/legacy.zip/aaaa?a=b', $req->getURL());
+        $opts = $req->getCurlOptions();
+        $this->assertContains('Authorization: token at', $opts[CURLOPT_HTTPHEADER]);
     }
 
     public function testGitLab()