Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions src/sanctum/src/HasApiTokens.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,7 @@ public function tokenCant(BackedEnum|string $ability): bool
*/
public function createToken(string $name, array $abilities = ['*'], ?DateTimeInterface $expiresAt = null): NewAccessToken
{
$abilities = array_map(
fn ($ability) => $ability instanceof BackedEnum ? $ability->value : $ability,
$abilities
);
$abilities = Str::fromAll($abilities);

$plainTextToken = $this->generateTokenString();

Expand Down
3 changes: 2 additions & 1 deletion src/sanctum/src/PersonalAccessToken.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use Hypervel\Context\ApplicationContext;
use Hypervel\Database\Eloquent\Model;
use Hypervel\Sanctum\Contracts\HasAbilities;
use Hypervel\Support\Str;

/**
* @property int|string $id
Expand Down Expand Up @@ -155,7 +156,7 @@ public static function findTokenable(PersonalAccessToken $accessToken): ?Authent
*/
public function can(BackedEnum|string $ability): bool
{
$ability = $ability instanceof BackedEnum ? $ability->value : $ability;
$ability = Str::from($ability);

return in_array('*', $this->abilities)
|| array_key_exists($ability, array_flip($this->abilities));
Expand Down
38 changes: 38 additions & 0 deletions tests/Sanctum/HasApiTokensTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Hypervel\Sanctum\PersonalAccessToken;
use Hypervel\Sanctum\TransientToken;
use Hypervel\Testbench\TestCase;
use Hypervel\Tests\Sanctum\Stub\TokenAbility;
use Hypervel\Tests\Sanctum\Stub\UserWithApiTokens;

/**
Expand Down Expand Up @@ -52,4 +53,41 @@ public function testCurrentAccessTokenGetter(): void

$this->assertSame($token, $user->currentAccessToken());
}

public function testTokenCanWithBackedEnum(): void
{
$user = new UserWithApiTokens();

$token = new PersonalAccessToken();
$token->abilities = ['posts:read', 'posts:write'];

$user->withAccessToken($token);

$this->assertTrue($user->tokenCan(TokenAbility::PostsRead));
$this->assertTrue($user->tokenCan(TokenAbility::PostsWrite));
$this->assertFalse($user->tokenCan(TokenAbility::UsersRead));
}

public function testTokenCantWithBackedEnum(): void
{
$user = new UserWithApiTokens();

$token = new PersonalAccessToken();
$token->abilities = ['posts:read'];

$user->withAccessToken($token);

$this->assertFalse($user->tokenCant(TokenAbility::PostsRead));
$this->assertTrue($user->tokenCant(TokenAbility::PostsWrite));
}

public function testTransientTokenCanWithBackedEnum(): void
{
$user = new UserWithApiTokens();
$user->withAccessToken(new TransientToken());

// TransientToken allows everything
$this->assertTrue($user->tokenCan(TokenAbility::PostsRead));
$this->assertTrue($user->tokenCan(TokenAbility::UsersWrite));
}
}
43 changes: 43 additions & 0 deletions tests/Sanctum/PersonalAccessTokenTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Hypervel\Tests\Sanctum;

use Hypervel\Sanctum\PersonalAccessToken;
use Hypervel\Tests\Sanctum\Stub\TokenAbility;
use PHPUnit\Framework\TestCase;

/**
Expand Down Expand Up @@ -33,4 +34,46 @@ public function testCanDetermineWhatItCanAndCantDo(): void
$this->assertTrue($token->can('foo'));
$this->assertTrue($token->can('bar'));
}

public function testCanCheckAbilitiesWithBackedEnum(): void
{
$token = new PersonalAccessToken();
$token->abilities = ['posts:read', 'posts:write'];

$this->assertTrue($token->can(TokenAbility::PostsRead));
$this->assertTrue($token->can(TokenAbility::PostsWrite));
$this->assertFalse($token->can(TokenAbility::UsersRead));
}

public function testCantCheckAbilitiesWithBackedEnum(): void
{
$token = new PersonalAccessToken();
$token->abilities = ['posts:read'];

$this->assertFalse($token->cant(TokenAbility::PostsRead));
$this->assertTrue($token->cant(TokenAbility::PostsWrite));
}

public function testWildcardAbilityWorksWithBackedEnum(): void
{
$token = new PersonalAccessToken();
$token->abilities = ['*'];

$this->assertTrue($token->can(TokenAbility::PostsRead));
$this->assertTrue($token->can(TokenAbility::PostsWrite));
$this->assertTrue($token->can(TokenAbility::UsersRead));
}

public function testMixedStringAndEnumAbilitiesWork(): void
{
$token = new PersonalAccessToken();
$token->abilities = ['posts:read', 'legacy-ability'];

// Enum check
$this->assertTrue($token->can(TokenAbility::PostsRead));
// String check for same value
$this->assertTrue($token->can('posts:read'));
// String check for legacy
$this->assertTrue($token->can('legacy-ability'));
}
}
13 changes: 13 additions & 0 deletions tests/Sanctum/Stub/TokenAbility.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

declare(strict_types=1);

namespace Hypervel\Tests\Sanctum\Stub;

enum TokenAbility: string
{
case PostsRead = 'posts:read';
case PostsWrite = 'posts:write';
case UsersRead = 'users:read';
case UsersWrite = 'users:write';
}