* Add workspace MCP settings and token access controls. Ship MCP settings UI, OAuth revoke/list helpers, Passport deploy wiring, and workspace.token:mcp gating so assistants can connect without pulling in welcome/onboarding from the parent epic. Co-authored-by: Cursor <cursoragent@cursor.com> * Type MCP client config shapes instead of string checks. Encode http/config-root on each advanced client and tighten primary client ids so snippet generation does not branch on magic strings. Co-authored-by: Cursor <cursoragent@cursor.com> * Polish MCP settings follow-ups from review. Translate Ukrainian MCP copy, deep-link ChatGPT into connector creation, drop an unused asset and revoke arg, and assert PATs are rejected on the MCP endpoint. Co-authored-by: Cursor <cursoragent@cursor.com> * Harden MCP connected clients, revoke scope, and OAuth consent. List recoverable sessions with live refresh tokens, revoke only PATs, throttle registration alone, and block viewers from authorizing MCP. Co-authored-by: Cursor <cursoragent@cursor.com> * Simplify MCP OAuth route throttling to a single middleware group. Co-authored-by: Cursor <cursoragent@cursor.com> * Allow workspace viewers read-only MCP access with web policy writes. Mirror the web app: MCP connects on view + OAuth mcp:use, write tools enforce createPost/update/delete/manageAccounts/manageTeam, and demotion to Viewer keeps grants. Cover role denials, consent, and disconnect. Co-authored-by: Cursor <cursoragent@cursor.com> * Harden MCP tool authz with shared workspace helpers. Route ApiKey tools through AuthorizesMcpTool, fail closed on null user or policy argument, and resolve the current workspace before mutating. Co-authored-by: Cursor <cursoragent@cursor.com> * Drop redundant string casts on validated request data. Enum::from and validated() fields are already strings, so the casts add noise without changing behavior. Co-authored-by: Cursor <cursoragent@cursor.com> * Show only the current user's MCP connections in settings. Match API keys privacy: list and disconnect your own OAuth clients, not teammates' across the account. Co-authored-by: Cursor <cursoragent@cursor.com> * Cover LoadWorkspaceFromToken gaps and harden AuthorizesMcpTool tests. Co-authored-by: Cursor <cursoragent@cursor.com> * Drop redundant is_string guard before UpdatePostTool find. Co-authored-by: Cursor <cursoragent@cursor.com> * Refactor AppSidebar to always show MCP link and simplify route middleware definition in ai.php. The MCP link is now consistently displayed regardless of the current workspace state, and the route middleware syntax has been streamlined. * Refresh MCP connected clients with Inertia usePoll. Co-authored-by: Cursor <cursoragent@cursor.com> * Bump laravel/mcp to 0.9.1 and add the TryPost server icon. Requires laravel/boost 2.5 for the Icon attribute; expose images/trypost/icon.png on TryPostServer. Co-authored-by: Cursor <cursoragent@cursor.com> * Drop no-op ReflectionClass import in TryPostServerTest. Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: Cursor <cursoragent@cursor.com>
268 lines
7.7 KiB
PHP
268 lines
7.7 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
use App\Enums\UserWorkspace\Role;
|
|
use App\Models\AccessToken;
|
|
use App\Models\Account;
|
|
use App\Models\Plan;
|
|
use App\Models\User;
|
|
use App\Models\Workspace;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Illuminate\Support\Facades\DB;
|
|
use Illuminate\Support\Str;
|
|
use Tests\BrowserTestCase;
|
|
use Tests\TestCase;
|
|
|
|
/*
|
|
|--------------------------------------------------------------------------
|
|
| Test Case
|
|
|--------------------------------------------------------------------------
|
|
|
|
|
| The closure you provide to your test functions is always bound to a specific PHPUnit test
|
|
| case class. By default, that class is "PHPUnit\Framework\TestCase". Of course, you may
|
|
| need to change it using the "pest()" function to bind a different classes or traits.
|
|
|
|
|
*/
|
|
|
|
pest()->extend(TestCase::class)
|
|
->use(RefreshDatabase::class)
|
|
->in('Feature', 'Unit');
|
|
|
|
pest()->extend(BrowserTestCase::class)
|
|
->use(RefreshDatabase::class)
|
|
->in('Browser');
|
|
|
|
/*
|
|
|--------------------------------------------------------------------------
|
|
| Expectations
|
|
|--------------------------------------------------------------------------
|
|
|
|
|
| When you're writing tests, you often need to check that values meet certain conditions. The
|
|
| "expect()" function gives you access to a set of "expectations" methods that you can use
|
|
| to assert different things. Of course, you may extend the Expectation API at any time.
|
|
|
|
|
*/
|
|
|
|
expect()->extend('toBeOne', function () {
|
|
return $this->toBe(1);
|
|
});
|
|
|
|
/*
|
|
|--------------------------------------------------------------------------
|
|
| Functions
|
|
|--------------------------------------------------------------------------
|
|
|
|
|
| While Pest is very powerful out-of-the-box, you may have some testing code specific to your
|
|
| project that you don't want to repeat in every file. Here you can also expose helpers as
|
|
| global functions to help you to reduce the number of lines of code in your test files.
|
|
|
|
|
*/
|
|
|
|
/**
|
|
* Issue a real Passport personal access token bound to a workspace and return
|
|
* the plain JWT string. Use the returned token in `Authorization: Bearer ...`
|
|
* to exercise the auth:api + workspace.token middleware stack.
|
|
*/
|
|
function passportToken(User $user, Workspace $workspace, array $scopes = []): string
|
|
{
|
|
$result = $user->createToken('Test', $scopes);
|
|
|
|
AccessToken::find($result->token->id)
|
|
->forceFill(['workspace_id' => $workspace->id])
|
|
->saveQuietly();
|
|
|
|
return $result->accessToken;
|
|
}
|
|
|
|
/**
|
|
* Create a workspace + owner + Passport token suitable for hitting the public
|
|
* API. Drop-in replacement for the legacy `createXApiToken` helpers.
|
|
*
|
|
* @param array{workspace?: Workspace} $overrides
|
|
* @return array{plain_token: string, workspace: Workspace, user: User}
|
|
*/
|
|
function createApiTestToken(array $overrides = []): array
|
|
{
|
|
$workspace = data_get($overrides, 'workspace');
|
|
|
|
if (! $workspace) {
|
|
$user = User::factory()->create();
|
|
$workspace = Workspace::factory()->create([
|
|
'account_id' => $user->account_id,
|
|
'user_id' => $user->id,
|
|
]);
|
|
$workspace->members()->attach($user->id, [
|
|
'role' => Role::Admin->value,
|
|
]);
|
|
$user->update(['current_workspace_id' => $workspace->id]);
|
|
} else {
|
|
$user = $workspace->owner ?? User::factory()->create([
|
|
'account_id' => $workspace->account_id,
|
|
]);
|
|
|
|
if ($workspace->account && $workspace->account->owner_id !== $user->id) {
|
|
$workspace->account->update(['owner_id' => $user->id]);
|
|
}
|
|
}
|
|
|
|
return [
|
|
'plain_token' => passportToken($user, $workspace),
|
|
'workspace' => $workspace,
|
|
'user' => $user,
|
|
];
|
|
}
|
|
|
|
function feedFixture(string $name): string
|
|
{
|
|
return file_get_contents(base_path("tests/fixtures/feeds/{$name}.xml"));
|
|
}
|
|
|
|
/**
|
|
* Create an account on the Workspace plan with an active subscription on the
|
|
* given Stripe price, plus N workspaces. Used by the billing-cycle tests.
|
|
*
|
|
* @param array<string, mixed> $subscriptionAttributes
|
|
*/
|
|
function billingAccount(string $price, array $subscriptionAttributes = [], int $workspaces = 1): Account
|
|
{
|
|
$plan = Plan::query()->firstOrFail();
|
|
$plan->update([
|
|
'stripe_monthly_price_id' => 'price_month',
|
|
'stripe_yearly_price_id' => 'price_year',
|
|
]);
|
|
|
|
$account = Account::factory()->create([
|
|
'plan_id' => $plan->id,
|
|
'trial_ends_at' => null,
|
|
]);
|
|
|
|
$account->subscriptions()->create(array_merge([
|
|
'type' => Account::SUBSCRIPTION_NAME,
|
|
'stripe_id' => 'sub_'.fake()->uuid(),
|
|
'stripe_status' => 'active',
|
|
'stripe_price' => $price,
|
|
'quantity' => $workspaces,
|
|
], $subscriptionAttributes));
|
|
|
|
Workspace::factory()->count($workspaces)->create(['account_id' => $account->id]);
|
|
|
|
return $account->refresh();
|
|
}
|
|
|
|
/**
|
|
* Attach an active default subscription to the given account.
|
|
*/
|
|
function subscribeAccount(Account $account): void
|
|
{
|
|
$account->subscriptions()->create([
|
|
'type' => Account::SUBSCRIPTION_NAME,
|
|
'stripe_id' => 'sub_'.fake()->uuid(),
|
|
'stripe_status' => 'active',
|
|
'stripe_price' => 'price_123',
|
|
]);
|
|
}
|
|
|
|
/**
|
|
* Insert an OAuth client suitable for MCP connection tests.
|
|
*/
|
|
function mcpOauthClient(string $name = 'My Agent'): string
|
|
{
|
|
$id = (string) Str::uuid();
|
|
|
|
DB::table('oauth_clients')->insert([
|
|
'id' => $id,
|
|
'name' => $name,
|
|
'secret' => null,
|
|
'provider' => null,
|
|
'redirect_uris' => '[]',
|
|
'grant_types' => json_encode(['authorization_code']),
|
|
'revoked' => false,
|
|
'created_at' => now(),
|
|
'updated_at' => now(),
|
|
]);
|
|
|
|
return $id;
|
|
}
|
|
|
|
/**
|
|
* Create an active OAuth access token for MCP connection tests.
|
|
*
|
|
* @param list<string> $scopes
|
|
*/
|
|
function mcpAccessToken(User $user, string $clientId, array $scopes = ['mcp:use']): AccessToken
|
|
{
|
|
$token = new AccessToken;
|
|
$token->forceFill([
|
|
'id' => Str::random(80),
|
|
'user_id' => $user->id,
|
|
'client_id' => $clientId,
|
|
'workspace_id' => null,
|
|
'name' => 'MCP',
|
|
'scopes' => $scopes,
|
|
'revoked' => false,
|
|
])->save();
|
|
|
|
return $token->refresh();
|
|
}
|
|
|
|
/**
|
|
* Move a member onto a shared account (stranded-member / invitee fixture).
|
|
*
|
|
* @return array{
|
|
* owner: User,
|
|
* member: User,
|
|
* shared_workspaces: list<Workspace>
|
|
* }
|
|
*/
|
|
function strandedMemberOnSharedAccount(
|
|
int $sharedWorkspaces = 0,
|
|
bool $attachMember = true,
|
|
bool $attachMemberToAll = true,
|
|
bool $setMemberCurrent = false,
|
|
?User $owner = null,
|
|
?string $memberEmail = null,
|
|
): array {
|
|
$owner ??= User::factory()->create();
|
|
$member = User::factory()->create(array_filter([
|
|
'email' => $memberEmail,
|
|
]));
|
|
|
|
// Closed-account model: the member's empty signup shell is gone after
|
|
// accepting the invite, so drop it here to match the real state.
|
|
$member->account?->delete();
|
|
|
|
$shared = [];
|
|
|
|
for ($i = 0; $i < $sharedWorkspaces; $i++) {
|
|
$workspace = Workspace::factory()->create([
|
|
'account_id' => $owner->account_id,
|
|
'user_id' => $owner->id,
|
|
]);
|
|
|
|
$workspace->members()->syncWithoutDetaching([
|
|
$owner->id => ['role' => Role::Admin->value],
|
|
]);
|
|
|
|
if ($attachMember && ($attachMemberToAll || $i === 0)) {
|
|
$workspace->members()->attach($member->id, [
|
|
'role' => Role::Member->value,
|
|
]);
|
|
}
|
|
|
|
$shared[] = $workspace;
|
|
}
|
|
|
|
$member->update([
|
|
'account_id' => $owner->account_id,
|
|
'current_workspace_id' => ($setMemberCurrent && $shared !== [])
|
|
? $shared[0]->id
|
|
: null,
|
|
]);
|
|
|
|
return [
|
|
'owner' => $owner->fresh(),
|
|
'member' => $member->fresh(),
|
|
'shared_workspaces' => $shared,
|
|
];
|
|
}
|