Skip to content
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

Jump to bottom

Remove deprecated token generator #380

Merged
merged 2 commits into from
Oct 16, 2019
Merged

Remove deprecated token generator #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4e3885
Remove deprecated TokenGenerator class and adjust tests
joshcanhelp Oct 15, 2019
8ac10b2
Move and rename JWT verifier tests
joshcanhelp Oct 16, 2019
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
71 changes: 0 additions & 71 deletions src/API/Helpers/TokenGenerator.php
View file
Open in desktop

This file was deleted.

47 changes: 19 additions & 28 deletions tests/API/Helpers/TokenGeneratorTest.php → tests/JWTVerifierTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<?php
namespace Auth0\Tests\Api\Helpers;
namespace Auth0\Tests;

use Auth0\SDK\Auth0JWT;
use Auth0\SDK\API\Helpers\TokenGenerator;
use Auth0\SDK\Exception\CoreException;
use Auth0\SDK\Exception\InvalidTokenException;
use Auth0\SDK\Helpers\JWKFetcher;
Expand All @@ -12,11 +10,11 @@
use PHPUnit\Framework\TestCase;

/**
* Class TokenTest
* Class JWTVerifierTest
*
* @package Auth0\Tests\Api\Helpers
*/
class TokenTest extends TestCase
class JWTVerifierTest extends TestCase
{

use ErrorHelpers;
Expand Down Expand Up @@ -336,42 +334,35 @@ public function testThatTokenWithInvalidAudThrowsException()
*/
public function testSuccessfulHs256TokenDecoding()
{
$token_generator = new TokenGenerator( self::CLIENT_ID, self::CLIENT_SECRET );
$token_payload = [
'sub' => '__test_sub__',
'aud' => self::CLIENT_ID
];

// 1. Test that an encoded client secret can be used.
$verifier = new JWTVerifier( [
'valid_audiences' => [ self::CLIENT_ID ],
'client_secret' => self::CLIENT_SECRET,
'client_secret' => JWT::urlsafeB64Encode( self::CLIENT_SECRET ),
] );
$jwt = $token_generator->generate( ['users' => ['actions' => ['read']]] );
$decoded = $verifier->verifyAndDecode($jwt);

$this->assertObjectHasAttribute('aud', $decoded);
$this->assertEquals(self::CLIENT_ID, $decoded->aud);
$this->assertObjectHasAttribute('scopes', $decoded);
$this->assertObjectHasAttribute('users', $decoded->scopes);
$this->assertObjectHasAttribute('actions', $decoded->scopes->users);
$this->assertArraySubset(['read'], $decoded->scopes->users->actions);
$jwt = JWT::encode( $token_payload, self::CLIENT_SECRET );
$decoded = $verifier->verifyAndDecode($jwt);

$this->assertObjectHasAttribute('sub', $decoded);
$this->assertEquals('__test_sub__', $decoded->sub);

// 2. Test that a non-encoded client secret can be used.
$verifier = new JWTVerifier( [
'valid_audiences' => [ self::CLIENT_ID ],
'client_secret' => self::CLIENT_SECRET,
'secret_base64_encoded' => false,
] );
$jwt = $token_generator->generate(
['users' => ['actions' => ['read']]],
TokenGenerator::DEFAULT_LIFETIME,
false
);
$decoded = $verifier->verifyAndDecode($jwt);

$this->assertObjectHasAttribute('aud', $decoded);
$this->assertEquals(self::CLIENT_ID, $decoded->aud);
$this->assertObjectHasAttribute('scopes', $decoded);
$this->assertObjectHasAttribute('users', $decoded->scopes);
$this->assertObjectHasAttribute('actions', $decoded->scopes->users);
$this->assertArraySubset(['read'], $decoded->scopes->users->actions);

$jwt = JWT::encode( $token_payload, self::CLIENT_SECRET );
$decoded = $verifier->verifyAndDecode($jwt);

$this->assertObjectHasAttribute('sub', $decoded);
$this->assertEquals('__test_sub__', $decoded->sub);
}

/**
Expand Down