Skip to content

Use the correct URL when refreshing access tokens #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wgriffioen merged 1 commit into from
Nov 6, 2023
Merged

Use the correct URL when refreshing access tokens #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions src/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ class Connection

private const TOKEN_URL = '/oauth/token';

private const REFRESH_URL = '/oauth/token/refresh';

private const VERSION = '1.0';
private const VERSION = '1.0.1';

/** @var Client|null */
private ?Client $client = null;
Expand Down Expand Up @@ -289,22 +287,17 @@ private function acquireAccessToken(): void
'client_secret' => $this->clientSecret,
'code' => $this->authorizationCode,
];

$response = $this->getClient()->post(self::BASE_URL . self::TOKEN_URL, ['form_params' => $parameters]);
} else {
$parameters = [
'refresh_token' => $this->refreshToken,
'grant_type' => 'refresh_token',
'client_id' => $this->clientId,
'client_secret' => $this->clientSecret,
];

$response = $this->getClient()->post(
self::BASE_URL . self::REFRESH_URL,
['form_params' => $parameters]
);
}

$response = $this->getClient()->post(self::BASE_URL . self::TOKEN_URL, ['form_params' => $parameters]);

Message::rewindBody($response);

$responseBody = $response->getBody()->getContents();
Expand Down
6 changes: 3 additions & 3 deletions tests/ConnectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ public function testUserAgentIsSet(): void
$connection = new Connection();

$this->assertEquals(
sprintf('Sendy/1.0 PHP/%s', phpversion()),
sprintf('Sendy/1.0.1 PHP/%s', phpversion()),
$connection->getClient()->getConfig('headers')['User-Agent']
);

$connection = new Connection();
$connection->setOauthClient(true);

$this->assertEquals(
sprintf('Sendy/1.0 PHP/%s OAuth/2.0', phpversion()),
sprintf('Sendy/1.0.1 PHP/%s OAuth/2.0', phpversion()),
$connection->getClient()->getConfig('headers')['User-Agent']
);
}
Expand Down Expand Up @@ -288,7 +288,7 @@ public function testTokensAreAcquiredWithRefreshToken(): void
$this->assertEquals(time() + 3600, $connection->getTokenExpires());

$this->assertEquals(
'https://app.sendy.nl/oauth/token/refresh',
'https://app.sendy.nl/oauth/token',
(string) $mockHandler->getLastRequest()->getUri()
);
}
Expand Down