removed promptAuth

hirak · Apr 25, 2016 · e270932 · e270932
1 parent 5805497
commit e270932
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 192 deletions.
diff --git a/src/GitHubRequest.php b/src/GitHubRequest.php
@@ -34,10 +34,4 @@ public function getURL()
             parent::getURL()
         );
     }
-
-    public function promptAuth(HttpGetResponse $res, IO\IOInterface $io)
-    {
-        $util = new \Composer\Util\GitHub($io, $this->config, null);
-        $this->promptAuthWithUtil(404, $util, $res, $io);
-    }
 }
diff --git a/src/GitLabRequest.php b/src/GitLabRequest.php
@@ -25,13 +25,4 @@ public function __construct($origin, $url, IO\IOInterface $io)
             $this->username = $this->password = null;
         }
     }
-
-    /**
-     * @codeCoverageIgnore
-     */
-    public function promptAuth(HttpGetResponse $res, IO\IOInterface $io)
-    {
-        $util = new \Composer\Util\GitLab($io, $this->config, null);
-        $this->promptAuthWithUtil(401, $util, $res, $io);
-    }
 }
diff --git a/src/HttpGetRequest.php b/src/HttpGetRequest.php
@@ -234,61 +234,6 @@ public function setConfig(CConfig $config)
         $this->config = $config;
     }
 
-    public function promptAuth(HttpGetResponse $res, IO\IOInterface $io)
-    {
-        $httpCode = $res->info['http_code'];
-        // 404s are only handled for github
-        if (404 === $httpCode) {
-            return false;
-        }
-
-        // fail if the console is not interactive
-        if (!$io->isInteractive() && ($httpCode === 401 || $httpCode === 403)) {
-            $message = "The '{$this->getURL()}' URL required authentication.\nYou must be using the interactive console to authenticate";
-            throw new Downloader\TransportException($message, $httpCode);
-        }
-
-        // fail if we already have auth
-        if ($io->hasAuthentication($this->origin)) {
-            throw new Downloader\TransportException("Invalid credentials for '{$this->getURL()}', aborting.", $httpCode);
-        }
-
-        $io->overwrite("    Authentication required (<info>$this->host</info>):");
-        $username = $io->ask('      Username: ');
-        $password = $io->askAndHideAnswer('      Password: ');
-        $io->setAuthentication($this->origin, $username, $password);
-        return true;
-    }
-
-    /**
-     * @internal
-     * @param int $privateCode 404|403
-     * @param Composer\Util\GitHub|Composer\Util\GitLab $util
-     * @param HttpGetResponse $res
-     * @param IO\IOInterface $io
-     * @throws Composer\Downloader\TransportException
-     * @return bool
-     */
-    public function promptAuthWithUtil($privateCode, $util, HttpGetResponse $res, IO\IOInterface $io)
-    {
-        $httpCode = $res->info['http_code'];
-        $message = "\nCould not fetch {$this->getURL()}, enter your $this->origin credentials ";
-        if ($privateCode === $httpCode) {
-            $message .= 'to access private repos';
-        } else {
-            $message .= 'to go over the API rate limit';
-        }
-        if ($util->authorizeOAuth($this->origin)) {
-            return true;
-        }
-        if ($io->isInteractive() &&
-            $util->authorizeOAuthInteractively($this->origin, $message)) {
-            return true;
-        }
-
-        throw new Downloader\TransportException("Could not authenticate against $this->origin", $httpCode);
-    }
-
     /**
      * @return string
      */

diff --git a/tests/unit/GitHubRequestTest.php b/tests/unit/GitHubRequestTest.php
@@ -40,56 +40,4 @@ public function testProcessRFSOption()
         ));
         self::assertEquals('abcdef', $req->query['access_token']);
     }
-
-    /**
-     * @expectedException Composer\Downloader\TransportException
-     */
-    public function testPromptAuth()
-    {
-        $io = $this->prophesize('Composer\IO\NullIO');
-        $req = new GitHubRequest(
-            'github.com',
-            'https://github.com/',
-            $io->reveal()
-        );
-        $req->setConfig(new CConfig);
-
-        $res = new HttpGetResponse(CURLE_OK, '', array('http_code' => 400));
-        $req->promptAuth($res, $io->reveal());
-    }
-
-    public function testPromptAuthWith404()
-    {
-        $io = $this->prophesize('Composer\IO\NullIO')
-            ->hasAuthentication(Argument::any())
-            ->willReturn(false)
-        ->getObjectProphecy()
-            ->isInteractive()
-            ->willReturn(true)
-        ->getObjectProphecy()
-        ->reveal();
-        $req = new GitHubRequest(
-            'github.com',
-            'https://github.com/',
-            $io
-        );
-        $util = $this->prophesize('Composer\Util\GitHub')
-            ->authorizeOAuth('github.com')
-            ->willReturn(true)
-        ->getObjectProphecy()
-        ->reveal();
-
-        $res = new HttpGetResponse(CURLE_OK, '', array('http_code' => 404));
-        self::assertTrue($req->promptAuthWithUtil(404, $util, $res, $io));
-
-        $util = $this->prophesize('Composer\Util\GitHub')
-            ->authorizeOAuth('github.com')
-            ->willReturn(false)
-        ->getObjectProphecy()
-            ->authorizeOAuthInteractively('github.com', Argument::any())
-            ->willReturn(true)
-        ->getObjectProphecy()
-        ->reveal();
-        self::assertTrue($req->promptAuthWithUtil(404, $util, $res, $io));
-    }
 }
diff --git a/tests/unit/HttpGetRequestTest.php b/tests/unit/HttpGetRequestTest.php
@@ -165,74 +165,4 @@ public function testSetConfig()
         );
         self::assertNull($req->setConfig(new CConfig));
     }
-
-    public function testPromptAuth()
-    {
-        $res = new HttpGetResponse(CURLE_OK, '', array('http_code' => 400));
-        $io = $this->prophesize('Composer\IO\NullIO')
-            ->isInteractive()
-            ->willReturn(true)
-        ->getObjectProphecy()
-            ->hasAuthentication('packagist.org')
-            ->willReturn(false)
-        ->getObjectProphecy()
-            ->overwrite(Argument::any())
-            ->willReturn(false)
-        ->getObjectProphecy()
-            ->ask(Argument::any())
-            ->willReturn('user')
-        ->getObjectProphecy()
-            ->askAndHideAnswer(Argument::any())
-            ->willReturn('pass')
-        ->getObjectProphecy()
-            ->setAuthentication('packagist.org', 'user', 'pass')
-            ->willReturn(null)
-        ->getObjectProphecy()
-        ->reveal();
-
-        $req = new HttpGetRequest(
-            'packagist.org',
-            'https://packagist.org/packages.json',
-            $io
-        );
-        $req->promptAuth($res, $io);
-    }
-
-    /**
-     * @expectedException Composer\Downloader\TransportException
-     */
-    public function testPromptAuth403()
-    {
-        $res = new HttpGetResponse(CURLE_OK, '', array('http_code' => 403));
-        $io = $this->prophesize('Composer\IO\NullIO')->reveal();
-
-        $req = new HttpGetRequest('packagist.org', 'https://packagist.org/packages.json', $io);
-        $req->promptAuth($res, $io);
-    }
-
-    /**
-     * @expectedException Composer\Downloader\TransportException
-     */
-    public function testPromptAuthInvalidCred()
-    {
-        $res = new HttpGetResponse(CURLE_OK, '', array('http_code' => 400));
-        $io = $this->prophesize('Composer\IO\NullIO')
-            ->isInteractive()
-            ->willReturn(true)
-        ->getObjectProphecy()
-            ->hasAuthentication('packagist.org')
-            ->willReturn(true)
-        ->getObjectProphecy()
-            ->getAuthentication('packagist.org')
-            ->willReturn(array('username' => 'user', 'password' => 'pass'))
-        ->getObjectProphecy()
-        ->reveal();
-
-        $req = new HttpGetRequest(
-            'packagist.org',
-            'https://packagist.org/packages.json',
-            $io
-        );
-        $req->promptAuth($res, $io);
-    }
 }