Skip to content
Open
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
8 changes: 4 additions & 4 deletions src/Http/Controllers/CP/Concerns/ResolvesUserId.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ private function resolveUserId(): string
{
$user = User::current();

/** @var string $userId */
$userId = $user ? $user->id() : '';

return $userId;
// Cast to string: Statamic's User->id() returns string under the file
// users driver but int under the Eloquent driver. The trait's return
// type contract (and downstream token storage) requires string.
return $user ? (string) $user->id() : '';
}
}
48 changes: 48 additions & 0 deletions tests/Unit/Http/Controllers/CP/Concerns/ResolvesUserIdTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?php

declare(strict_types=1);

use Cboxdk\StatamicMcp\Http\Controllers\CP\Concerns\ResolvesUserId;
use Illuminate\Contracts\Auth\Authenticatable;
use Statamic\Contracts\Auth\User as StatamicUserContract;
use Statamic\Facades\User;

/**
* Concrete subject that exposes the private trait method for direct testing.
*/
class ResolvesUserIdSubject
{
use ResolvesUserId {
resolveUserId as public;
}
}

it('returns the user id as a string when User->id() returns an int (Eloquent driver)', function () {
$user = Mockery::mock(StatamicUserContract::class, Authenticatable::class);
$user->shouldReceive('id')->andReturn(42);

User::shouldReceive('current')->andReturn($user);

$result = (new ResolvesUserIdSubject)->resolveUserId();

expect($result)->toBe('42');
});

it('returns the user id as a string when User->id() returns a string (file driver)', function () {
$user = Mockery::mock(StatamicUserContract::class, Authenticatable::class);
$user->shouldReceive('id')->andReturn('019357a0-7f6a-7000-a1b2-deadbeef0000');

User::shouldReceive('current')->andReturn($user);

$result = (new ResolvesUserIdSubject)->resolveUserId();

expect($result)->toBe('019357a0-7f6a-7000-a1b2-deadbeef0000');
});

it('returns an empty string when no user is authenticated', function () {
User::shouldReceive('current')->andReturn(null);

$result = (new ResolvesUserIdSubject)->resolveUserId();

expect($result)->toBe('');
});