Allow to easier skip $password parameter when calling authenticate() method.

Author: stloyd

lib/Github/Client.php

@@ -144,11 +144,22 @@ public function api($name)
      * Authenticate a user for all next requests
      *
      * @param string      $tokenOrLogin  GitHub private token/username/client ID
-     * @param null|string $password      GitHub password/secret
+     * @param null|string $password      GitHub password/secret (optionally can contain $authMethod)
      * @param null|string $authMethod    One of the AUTH_* class constants
+     *
+     * @throws InvalidArgumentException  If no authentication method was given
      */
     public function authenticate($tokenOrLogin, $password = null, $authMethod = null)
     {
+        if (null === $password && null === $authMethod) {
+            throw new InvalidArgumentException('You need to specify authentication method!');
+        }
+
+        if (null === $authMethod && in_array($password, array(self::AUTH_URL_TOKEN, self::AUTH_URL_CLIENT_ID, self::AUTH_HTTP_PASSWORD, self::AUTH_HTTP_TOKEN))) {
+            $authMethod = $password;
+            $password   = null;
+        }
+
         $this->httpClient->addListener(
             new AuthListener(
                 $authMethod,

test/Github/Tests/ClientTest.php

@@ -30,9 +30,9 @@ public function shouldPassHttpClientInterfaceToConstructor()
 
     /**
      * @test
-     * @dataProvider getAuthenticationData
+     * @dataProvider getAuthenticationFullData
      */
-    public function shouldAuthenticateUsingGivenParameters($login, $password, $method)
+    public function shouldAuthenticateUsingAllGivenParameters($login, $password, $method)
     {
         $httpClient = $this->getHttpClientMock(array('addListener'));
         $httpClient->expects($this->once())
@@ -43,17 +43,51 @@ public function shouldAuthenticateUsingGivenParameters($login, $password, $metho
         $client->authenticate($login, $password, $method);
     }
 
-    public function getAuthenticationData()
+    public function getAuthenticationFullData()
     {
         return array(
-            array('login', null, null),
             array('login', 'password', Client::AUTH_HTTP_PASSWORD),
             array('token', null, Client::AUTH_HTTP_TOKEN),
             array('token', null, Client::AUTH_URL_TOKEN),
             array('client_id', 'client_secret', Client::AUTH_URL_CLIENT_ID),
         );
     }
 
+    /**
+     * @test
+     * @dataProvider getAuthenticationPartialData
+     */
+    public function shouldAuthenticateUsingGivenParameters($token, $method)
+    {
+        $httpClient = $this->getHttpClientMock(array('addListener'));
+        $httpClient->expects($this->once())
+            ->method('addListener')
+            ->with(new AuthListener($method, array('tokenOrLogin' => $token, 'password' => null)));
+
+        $client = new Client($httpClient);
+        $client->authenticate($token, $method);
+    }
+
+    public function getAuthenticationPartialData()
+    {
+        return array(
+            array('token', Client::AUTH_HTTP_TOKEN),
+            array('token', Client::AUTH_URL_TOKEN),
+        );
+    }
+
+    /**
+     * @test
+     * @expectedException InvalidArgumentException
+     */
+    public function shouldThrowExceptionWhenAuthenticatingWithoutMethodSet()
+    {
+        $httpClient = $this->getHttpClientMock(array('addListener'));
+
+        $client = new Client($httpClient);
+        $client->authenticate('login', null, null);
+    }
+
     /**
      * @test
      */