Skip to content

client's secret should be invalid if not sent. #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

Open
nishimura-d wants to merge 1 commit into
base: 0.8.x
Choose a base branch
from
Open

client's secret should be invalid if not sent. #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
4 changes: 1 addition & 3 deletions src/Bridge/Repository/ClientRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ public function validateClient($clientIdentifier, $clientSecret, $grantType)
$conditions = [
$this->table->getPrimaryKey() => $clientIdentifier,
];
if ($clientSecret !== null) {
$conditions[$this->table->aliasField('client_secret')] = $clientSecret;
}
$conditions[$this->table->aliasField('client_secret')] = (string)$clientSecret;

$client = $this->table->find()->where($conditions)->first();
/* @var $client Client|null */
Expand Down
12 changes: 12 additions & 0 deletions tests/Fixture/ClientsFixture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@ public function init()
]),
];

$this->records[] = [
'id' => 'Public',
'client_secret' => '',
'name' => 'Public Client',
'redirect_uri' => json_encode(['http://www.example.com']),
'grant_types' => json_encode([
'password',
'authorization_code',
'refresh_token',
]),
];

parent::init();
}
}
10 changes: 7 additions & 3 deletions tests/TestCase/Bridge/Repository/ClientRepositoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,19 @@ public function testValidateClient($inputs, $expects)
public function dataValidateClient()
{
return [
'valid: Client id only' => [
['TEST', null, null],
'valid: Public Client id only' => [
['Public', null, null],
true,
],
'invalid: Confidential Client id only' => [
['TEST', null, null],
false,
],
'valid: Client id with secret' => [
['TEST', 'TestSecret', null],
true,
],
'invalid: Client id only' => [
'invalid: Unregistered Client id only' => [
['INVALID', null, null],
false,
],
Expand Down