* Scope MCP OAuth tokens to user + workspace
Bind authorization-code grants to the authorizing workspace (via auth codes),
inherit workspace on refresh, resolve MCP/API requests from the token instead
of current_workspace_id, backfill existing grants, and revoke workspace tokens
when a member is removed.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Add multi-workspace MCP OAuth coverage
Cover coexistence of the same client across workspaces, settings
list/disconnect scoped to the current workspace, and API key
controllers excluding workspace-bound MCP grants.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Use constrained foreignUuid for oauth_auth_codes.workspace_id
Match the project's UUID foreign-key convention instead of a separate
foreign() call.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Localize the MCP OAuth authorize consent screen
Wire authorize.blade.php to mcp.* translation keys (including the
workspace scope copy) and cover pt-BR rendering.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Fix invalid Mockery import in bind workspace test
CI treats the non-compound `use Mockery` as an ErrorException and
aborts the whole parallel suite.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Inline MCP OAuth workspace backfill into the migration
Move the one-shot backfill out of a dedicated Action and wrap it in an
explicit transaction so a failure rolls back partial binds/revokes.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Nest MCP authorize i18n keys and test backfill rollback
Group consent-screen copy under mcp.authorize.*, and assert the
workspace backfill migration rolls back binds when it fails before
commit.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Hardcode TryPost in the MCP authorize page title
Drop the config('app.name') interpolation from the consent screen title.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Add workspace picker to MCP OAuth consent screen
Let users choose which workspace to bind at authorize time instead of
always using current_workspace_id; silent re-consent still falls back.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Tighten MCP authorize workspace select spacing
Match NativeSelect styling and give the label, control, and helper text room to breathe.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Convert MCP OAuth consent screen to Inertia Vue
Reuse AuthCardLayout, Button, and NativeSelect so the authorize page
matches the app UI. Keep native form posts so Passport's external
redirect still works for MCP client popups.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Polish MCP authorize layout with logo and workspace combobox
Drop the shield and AuthCardLayout double-logo, put TryPost branding
at the top, and reuse the app Combobox pattern for workspace search.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Align MCP OAuth workspace backfill with mcpOAuth scope
Reuse AccessToken::mcpOAuth() so the migration only touches mcp:use
grants on non-PAT clients, matching the rest of the codebase.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Tighten MCP OAuth workspace backfill heuristics
Only touch connected MCP sessions, bind a sole membership or a valid
current workspace, and revoke ambiguous multi-workspace grants instead
of guessing the oldest workspace.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Drop Passport connection override from auth code migration
Always use the app default database connection from .env.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Bind MCP OAuth workspace in AccessTokenRepository
Replace the AccessTokenCreated listener with the same Passport repository
override pattern used for auth codes, so workspace_id is set at persist.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Simplify AccessTokenRepository workspace binding
Drop redundant string casts and the oldest-workspace fallback; keep a
small ownedWorkspace/payloadId helper surface instead.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Extract Passport MCP authorization view from AppServiceProvider
Keep configurePassport thin by moving the Inertia consent props into an
invokable App\Passport\AuthorizationView class.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Simplify AuthorizationView and cover it with direct tests
Use collection higher-order mapping for workspaces/scopes and add focused
tests for current-workspace selection and empty-user props.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Rename BindWorkspaceToAccessTokenTest after listener removal
The suite now covers AuthCodeRepository and AccessTokenRepository
workspace binding, not an AccessTokenCreated listener.
* Fail closed when auth code has no bindable workspace
Authorization-code grants no longer fall back to the user's current
workspace, so a token cannot be minted for a different tenant than consent.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Retrigger CI after GitHub Actions infrastructure failures
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: retrigger CI
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: harden MCP OAuth workspace binding on refresh and backfill
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: always show MCP OAuth consent to pick a workspace
Disable Passport silent re-consent and require an explicit workspace_id
from the consent form, with Passport wiring moved to its own provider.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: sort MCP connected clients by last used
Show most recently used OAuth connections first on the workspace MCP settings page.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Cursor <cursoragent@cursor.com>
202 lines
6.6 KiB
PHP
202 lines
6.6 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
use App\Enums\UserWorkspace\Role;
|
|
use App\Models\AccessToken;
|
|
use App\Models\User;
|
|
use App\Models\Workspace;
|
|
use Database\Seeders\PassportSeeder;
|
|
use Illuminate\Support\Facades\DB;
|
|
use Laravel\Passport\ClientRepository;
|
|
|
|
beforeEach(function () {
|
|
$this->user = User::factory()->create();
|
|
$this->workspace = Workspace::factory()->create([
|
|
'account_id' => $this->user->account_id,
|
|
'user_id' => $this->user->id,
|
|
]);
|
|
$this->workspace->members()->attach($this->user->id, ['role' => Role::Admin->value]);
|
|
$this->user->update(['current_workspace_id' => $this->workspace->id]);
|
|
$this->user->refresh();
|
|
});
|
|
|
|
function makeWorkspaceToken(User $user, Workspace $workspace): AccessToken
|
|
{
|
|
$result = $user->createToken('Existing');
|
|
$token = AccessToken::find($result->token->id);
|
|
$token->forceFill(['workspace_id' => $workspace->id])->saveQuietly();
|
|
|
|
return $token->refresh();
|
|
}
|
|
|
|
it('shows api keys page', function () {
|
|
makeWorkspaceToken($this->user, $this->workspace);
|
|
|
|
$this->actingAs($this->user)
|
|
->get(route('app.api-keys.index'))
|
|
->assertOk()
|
|
->assertInertia(fn ($page) => $page
|
|
->component('settings/workspace/ApiKeys')
|
|
->has('apiTokens', 1)
|
|
);
|
|
});
|
|
|
|
it('excludes workspace-bound mcp oauth grants from the api keys page', function () {
|
|
makeWorkspaceToken($this->user, $this->workspace);
|
|
$oauth = mcpAccessToken($this->user, mcpOauthClient('Claude'), $this->workspace);
|
|
|
|
$this->actingAs($this->user)
|
|
->get(route('app.api-keys.index'))
|
|
->assertOk()
|
|
->assertInertia(fn ($page) => $page
|
|
->has('apiTokens', 1)
|
|
->where('apiTokens', fn ($tokens): bool => collect($tokens)->every(
|
|
fn (array $token): bool => $token['id'] !== $oauth->id,
|
|
)));
|
|
});
|
|
|
|
it('cannot delete a workspace-bound mcp oauth grant through api keys', function () {
|
|
$oauth = mcpAccessToken($this->user, mcpOauthClient('Claude'), $this->workspace);
|
|
|
|
$this->actingAs($this->user)
|
|
->delete(route('app.api-keys.destroy', $oauth->id))
|
|
->assertNotFound();
|
|
|
|
expect($oauth->fresh()->revoked)->toBeFalse();
|
|
});
|
|
|
|
it('creates an api key', function () {
|
|
$this->actingAs($this->user)
|
|
->post(route('app.api-keys.store'), ['name' => 'My API Key'])
|
|
->assertRedirect();
|
|
|
|
$tokens = AccessToken::where('user_id', $this->user->id)
|
|
->where('workspace_id', $this->workspace->id)
|
|
->get();
|
|
|
|
expect($tokens)->toHaveCount(1);
|
|
expect($tokens->first()->name)->toBe('My API Key');
|
|
expect($tokens->first()->revoked)->toBeFalse();
|
|
expect($tokens->first()->expires_at)->toBeNull();
|
|
});
|
|
|
|
it('bootstraps the personal access client idempotently', function () {
|
|
DB::table('oauth_clients')
|
|
->whereJsonContains('grant_types', 'personal_access')
|
|
->delete();
|
|
|
|
$seeder = app(PassportSeeder::class);
|
|
$clients = app(ClientRepository::class);
|
|
|
|
$seeder->run($clients);
|
|
$seeder->run($clients);
|
|
|
|
expect(DB::table('oauth_clients')
|
|
->whereJsonContains('grant_types', 'personal_access')
|
|
->count())->toBe(1);
|
|
|
|
expect($this->user->createToken('Self-hosted API Key')->accessToken)->toBeString();
|
|
});
|
|
|
|
it('creates an api key with expiration', function () {
|
|
$expiresAt = now()->addDays(30)->startOfDay();
|
|
|
|
$this->actingAs($this->user)
|
|
->post(route('app.api-keys.store'), [
|
|
'name' => 'Expiring Key',
|
|
'expires_at' => $expiresAt->format('Y-m-d'),
|
|
])
|
|
->assertRedirect();
|
|
|
|
$token = AccessToken::where('user_id', $this->user->id)
|
|
->where('workspace_id', $this->workspace->id)
|
|
->first();
|
|
|
|
expect($token->expires_at)->not->toBeNull()
|
|
->and($token->expires_at->toDateString())->toBe($expiresAt->toDateString())
|
|
->and($token->expires_at->format('H:i:s'))->toBe('23:59:59');
|
|
});
|
|
|
|
it('validates name is required', function () {
|
|
$this->actingAs($this->user)
|
|
->post(route('app.api-keys.store'), [])
|
|
->assertSessionHasErrors('name');
|
|
});
|
|
|
|
it('rejects an expiration in the past', function () {
|
|
$this->actingAs($this->user)
|
|
->post(route('app.api-keys.store'), [
|
|
'name' => 'Past Key',
|
|
'expires_at' => now()->subDay()->toDateString(),
|
|
])
|
|
->assertSessionHasErrors('expires_at');
|
|
});
|
|
|
|
it('allows an expiration of today', function () {
|
|
$today = now()->toDateString();
|
|
|
|
$this->actingAs($this->user)
|
|
->post(route('app.api-keys.store'), [
|
|
'name' => 'Expires Today',
|
|
'expires_at' => $today,
|
|
])
|
|
->assertRedirect();
|
|
|
|
$token = AccessToken::where('user_id', $this->user->id)
|
|
->where('workspace_id', $this->workspace->id)
|
|
->where('name', 'Expires Today')
|
|
->firstOrFail();
|
|
|
|
expect($token->expires_at->toDateString())->toBe($today)
|
|
->and($token->expires_at->format('H:i:s'))->toBe('23:59:59');
|
|
});
|
|
|
|
it('revokes an api key', function () {
|
|
$token = makeWorkspaceToken($this->user, $this->workspace);
|
|
|
|
$this->actingAs($this->user)
|
|
->delete(route('app.api-keys.destroy', $token->id))
|
|
->assertRedirect();
|
|
|
|
expect($token->refresh()->revoked)->toBeTrue();
|
|
});
|
|
|
|
it('cannot delete api key from another workspace', function () {
|
|
$otherUser = User::factory()->create();
|
|
$otherWorkspace = Workspace::factory()->create([
|
|
'account_id' => $otherUser->account_id,
|
|
'user_id' => $otherUser->id,
|
|
]);
|
|
$token = makeWorkspaceToken($otherUser, $otherWorkspace);
|
|
|
|
$this->actingAs($this->user)
|
|
->delete(route('app.api-keys.destroy', $token->id))
|
|
->assertNotFound();
|
|
});
|
|
|
|
it('member cannot create api key', function () {
|
|
$member = User::factory()->create(['account_id' => $this->user->account_id]);
|
|
$this->workspace->members()->attach($member->id, ['role' => Role::Member->value]);
|
|
$member->update(['current_workspace_id' => $this->workspace->id]);
|
|
|
|
$this->actingAs($member)
|
|
->post(route('app.api-keys.store'), ['name' => 'Test Key'])
|
|
->assertForbidden();
|
|
});
|
|
|
|
it('member cannot delete api key', function () {
|
|
$member = User::factory()->create(['account_id' => $this->user->account_id]);
|
|
$this->workspace->members()->attach($member->id, ['role' => Role::Member->value]);
|
|
$member->update(['current_workspace_id' => $this->workspace->id]);
|
|
|
|
$token = makeWorkspaceToken($this->user, $this->workspace);
|
|
|
|
$this->actingAs($member)
|
|
->delete(route('app.api-keys.destroy', $token->id))
|
|
->assertForbidden();
|
|
});
|
|
|
|
it('api keys page requires authentication', function () {
|
|
$this->get(route('app.api-keys.index'))->assertRedirect(route('login'));
|
|
});
|