Remove the deprecated legacy methods and tests

README.md

@@ -70,15 +70,11 @@ $client->setAccessToken('abc123');
 // Set Client credentials if using that grant type
 $client->useClientCredentials($appId, $appSecret);
 
-// Use legacy clientId and apiKey
-$client->useLegacyToken($clientId, $apiKey);
-
 // Use a refresh token to get a new access token
 $client->useRefreshToken($appId, $appSecret, $refreshToken);
 ```
 
 **Note**
-The `legacy_credentials` auth method is provided for developer convenience while both v1 and v2 of the API are active. When v1 of the API sunsets on June 6th, 2019, this auth scheme will no longer be active. 
 
 You can also pass auth credentials when you create the client.
 
@@ -93,16 +89,6 @@ $config = [
 ];
 $client = ApiClientFactory::createClient($config);
 
-// Using Legacy credentials - deprecated and will be removed on June 6, 2019
-$config = [
-    'auth' => [
-        'type' => 'legacy_credentials',
-        'clientId' => 'asdf1234',
-        'apiKey' => 'fdas4321'
-    ]
-];
-$client = ApiClientFactory::createClient($config);
-
 // Using a refresh token
 $config = [
     'auth' => [

src/ApiClient.php

@@ -102,22 +102,6 @@ public function useClientCredentials(string $appId, string $appSecret): ApiClien
         return $this;
     }
 
-    /**
-     * The Legacy Token auth scheme is provided as a developer convenience
-     * while transitioning from v1 to v2 of the API. On June 6, 2019, we will
-     * sunset v1 of the API. At that time, this method will no longer function
-     * and we will remove it from the SDK.
-     *
-     * @deprecated
-     */
-    public function useLegacyToken(string $clientId, string $apiKey): ApiClient
-    {
-        $this->getAuthenticator()
-            ->useLegacyToken($clientId, $apiKey);
-
-        return $this;
-    }
-
     public function useRefreshToken(string $appId, string $appSecret, string $refreshToken): ApiClient
     {
         $this->getAuthenticator()

src/Http/Authenticator.php

@@ -7,7 +7,6 @@
 use GuzzleHttp\Client;
 use HelpScout\Api\Http\Auth\Auth;
 use HelpScout\Api\Http\Auth\ClientCredentials;
-use HelpScout\Api\Http\Auth\LegacyCredentials;
 use HelpScout\Api\Http\Auth\NullCredentials;
 use HelpScout\Api\Http\Auth\RefreshCredentials;
 
@@ -119,19 +118,6 @@ public function useClientCredentials(string $appId, string $appSecret): void
         $this->auth = new ClientCredentials($appId, $appSecret);
     }
 
-    /**
-     * The Legacy Token auth scheme is provided as a developer convenience
-     * while transitioning from v1 to v2 of the API. On June 6, 2019, we will
-     * sunset v1 of the API. At that time, this method will no longer function
-     * and we will remove it from the SDK.
-     *
-     * @deprecated
-     */
-    public function useLegacyToken(string $clientId, string $apiKey): void
-    {
-        $this->auth = new LegacyCredentials($clientId, $apiKey);
-    }
-
     public function useRefreshToken(string $appId, string $appSecret, string $refreshToken): void
     {
         $this->auth = new RefreshCredentials($appId, $appSecret, $refreshToken);
@@ -145,9 +131,6 @@ public function setAuth(Auth $auth): void
     protected function fetchTokens(): void
     {
         switch ($this->auth->getType()) {
-            case LegacyCredentials::TYPE:
-                $this->convertLegacyToken();
-                break;
             case ClientCredentials::TYPE:
             case RefreshCredentials::TYPE:
                 $this->fetchAccessAndRefreshToken();
@@ -171,26 +154,6 @@ public function fetchAccessAndRefreshToken(): self
         return $this;
     }
 
-    /**
-     * This conversion helper is provided as a developer convenience while
-     * transitioning from v1 to v2 of the API. On June 6, 2019, we will sunset
-     * v1 of the API. At that time, this method will no longer function and we
-     * will remove it from the SDK.
-     *
-     * @deprecated
-     */
-    public function convertLegacyToken(): void
-    {
-        $tokens = $this->requestAuthTokens(
-            $this->auth->getPayload(),
-            self::TRANSITION_URL
-        );
-
-        $this->accessToken = $tokens['accessToken'];
-        $this->refreshToken = $tokens['refreshToken'];
-        $this->ttl = $tokens['expiresIn'];
-    }
-
     private function requestAuthTokens(array $payload, string $url): array
     {
         $headers = [

src/Http/RestClientBuilder.php

@@ -13,7 +13,6 @@
 use GuzzleHttp\Psr7\Response;
 use HelpScout\Api\Http\Auth\Auth;
 use HelpScout\Api\Http\Auth\ClientCredentials;
-use HelpScout\Api\Http\Auth\LegacyCredentials;
 use HelpScout\Api\Http\Auth\NullCredentials;
 use HelpScout\Api\Http\Auth\RefreshCredentials;
 use HelpScout\Api\Http\Handlers\AuthenticationHandler;
@@ -68,11 +67,6 @@ protected function getAuthClass(array $authConfig = []): Auth
                     $authConfig['appId'],
                     $authConfig['appSecret']
                 );
-            case LegacyCredentials::TYPE:
-                return new LegacyCredentials(
-                    $authConfig['clientId'],
-                    $authConfig['apiKey']
-                );
             case RefreshCredentials::TYPE:
                 return new RefreshCredentials(
                     $authConfig['appId'],

tests/ApiClientTest.php

@@ -168,21 +168,6 @@ public function testUseClientCredentials()
         );
     }
 
-    public function testUseLegacyCredentials()
-    {
-        $clientId = 'abc123';
-        $apiKey = '321cba';
-
-        $this->authenticator->shouldReceive('useLegacyToken')
-            ->once()
-            ->with($clientId, $apiKey);
-        $result = $this->client->useLegacyToken($clientId, $apiKey);
-        $this->assertSame(
-            $result,
-            $this->client
-        );
-    }
-
     public function testUseRefreshToken()
     {
         $appId = 'abc123';

tests/Authentication/AuthenticationIntegrationTest.php

@@ -6,7 +6,6 @@
 
 use GuzzleHttp\Client;
 use HelpScout\Api\Http\Auth\ClientCredentials;
-use HelpScout\Api\Http\Auth\LegacyCredentials;
 use HelpScout\Api\Http\Auth\NullCredentials;
 use HelpScout\Api\Http\Auth\RefreshCredentials;
 use HelpScout\Api\Http\Authenticator;
@@ -69,22 +68,6 @@ public function testClientCredentialsSetsAuth()
         $this->assertSame($expectedPayload, $auth->getPayload());
     }
 
-    public function testLegacyCredentialsSetsAuth()
-    {
-        $clientId = '123abc';
-        $apiKey = 'fdafda';
-        $expectedPayload = [
-            'clientId' => $clientId,
-            'apiKey' => $apiKey,
-        ];
-
-        $this->authenticator->useLegacyToken($clientId, $apiKey);
-        $auth = $this->authenticator->getAuthCredentials();
-        $this->assertSame(LegacyCredentials::TYPE, $auth->getType());
-        $this->assertInstanceOf(LegacyCredentials::class, $auth);
-        $this->assertSame($expectedPayload, $auth->getPayload());
-    }
-
     public function testUseRefreshTokenCredentials()
     {
         $appId = '123abc';
@@ -103,44 +86,6 @@ public function testUseRefreshTokenCredentials()
         $this->assertSame($expectedPayload, $auth->getPayload());
     }
 
-    public function testAuthenticatorFetchesTokensWithLegacyCredentials()
-    {
-        $clientId = '123abc';
-        $apiKey = 'fdafda';
-        $auth = new LegacyCredentials($clientId, $apiKey);
-        $expectedPayload = [
-            'clientId' => $clientId,
-            'apiKey' => $apiKey,
-        ];
-
-        $expectedOptions = [
-            'headers' => [
-                'Content-Type' => 'application/json;charset=UTF-8',
-            ],
-            'json' => $expectedPayload,
-        ];
-
-        $tokenResponse = [
-            'accessToken' => 'fdsafdas',
-            'refreshToken' => 'asdfasdf',
-            'expiresIn' => 7200,
-        ];
-        $expectedResponse = $this->getResponse(200, json_encode($tokenResponse));
-
-        $this->guzzle->shouldReceive('request')
-            ->with('POST', Authenticator::TRANSITION_URL, $expectedOptions)
-            ->andReturn($expectedResponse);
-
-        $expectedResult = [
-            'Authorization' => 'Bearer fdsafdas',
-        ];
-
-        $authenticator = new Authenticator(new Client(), $auth);
-        $authenticator->setClient($this->guzzle);
-        $result = $authenticator->getAuthHeader();
-        $this->assertSame($expectedResult, $result);
-    }
-
     public function testAuthenticatorFetchesTokensWithClientCredentials()
     {
         $appId = '123abc';

tests/Http/RestClientTest.php

@@ -11,7 +11,6 @@
 use GuzzleHttp\Psr7\Response;
 use HelpScout\Api\ApiClient;
 use HelpScout\Api\Http\Auth\ClientCredentials;
-use HelpScout\Api\Http\Auth\LegacyCredentials;
 use HelpScout\Api\Http\Auth\NullCredentials;
 use HelpScout\Api\Http\Auth\RefreshCredentials;
 use HelpScout\Api\Http\Authenticator;
@@ -115,24 +114,6 @@ public function testRestClientBuilderHandlesRefreshCredentialsAuth()
         );
     }
 
-    public function testRestClientBuilderHandlesLegacyCredentialsAuth()
-    {
-        $config = [
-            'auth' => [
-                'type' => LegacyCredentials::TYPE,
-                'clientId' => '123abc',
-                'apiKey' => 'cba321',
-            ],
-        ];
-        $builder = new RestClientBuilder($config);
-        $client = $builder->build();
-
-        $this->assertInstanceOf(
-            LegacyCredentials::class,
-            $client->getAuthenticator()->getAuthCredentials()
-        );
-    }
-
     public function testRestClientBuilderHandlesNullCredentialsAuth()
     {
         $config = [];