Skip to content

Allow OAuth client registration without a client name #254

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

Merged
pushpak1300 merged 3 commits into from
Jun 25, 2026
Merged

Allow OAuth client registration without a client name #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73f627a
Allow OAuth client registration without a client name
lazerg Jun 25, 2026
616124a
Extract OAuth client name resolution and preserve falsy names
pushpak1300 Jun 25, 2026
5ce3fa7
Merge branch 'main' into fix/issue-253-optional-client-name
pushpak1300 Jun 25, 2026
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
18 changes: 15 additions & 3 deletions src/Server/Http/Controllers/OAuthRegisterController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class OAuthRegisterController
public function __invoke(Request $request): JsonResponse
{
$validator = Validator::make($request->all(), [
'client_name' => ['nullable', 'string', 'min:1', 'max:255', 'required_without:name'],
'name' => ['nullable', 'string', 'min:1', 'max:255', 'required_without:client_name'],
'client_name' => ['nullable', 'string', 'min:1', 'max:255'],
'name' => ['nullable', 'string', 'min:1', 'max:255'],
'redirect_uris' => ['required', 'array', 'min:1'],
'redirect_uris.*' => ['required', 'string', function (string $attribute, $value, $fail): void {
if (! $this->isValidRedirectUri($value)) {
Expand Down Expand Up @@ -76,7 +76,7 @@ public function __invoke(Request $request): JsonResponse
);

$client = $clients->createAuthorizationCodeGrantClient(
name: $validated['client_name'] ?? $validated['name'],
name: $this->resolveClientName($validated),
redirectUris: $validated['redirect_uris'],
confidential: false,
enableDeviceFlow: false,
Expand All @@ -92,6 +92,18 @@ public function __invoke(Request $request): JsonResponse
], 201);
}

/**
* Resolve the client name, falling back to the redirect host or a default.
*
* @param array<string, mixed> $validated
*/
protected function resolveClientName(array $validated): string
{
return $validated['client_name']
?? $validated['name']
?? (parse_url((string) ($validated['redirect_uris'][0] ?? ''), PHP_URL_HOST) ?: 'MCP Client');
}

protected function isValidRedirectUri(string $value): bool
{
$scheme = parse_url($value, PHP_URL_SCHEME);
Expand Down
56 changes: 53 additions & 3 deletions tests/Unit/Server/RegistrarTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ function ensureMockClientRepository(): void
]);
});

it('requires an oauth client name for registration', function (): void {
it('falls back to the redirect host when no client name is provided', function (): void {
$clientRepository = new class
{
public ?string $capturedName = null;
Expand All @@ -244,7 +244,25 @@ public function createAuthorizationCodeGrantClient(string $name, array $redirect
$this->app->instance(ClientRepository::class, $clientRepository);

$response = $this->postJson('/oauth/register', [
'redirect_uris' => ['http://localhost:3000/callback'],
'redirect_uris' => ['https://example.com/callback'],
]);

$response->assertStatus(201);

expect($clientRepository->capturedName)->toBe('example.com');
});

it('returns invalid_client_metadata when client metadata is invalid', function (): void {
ensureMockClientRepository();

$registrar = new Registrar;
$registrar->oauthRoutes();

$this->app->instance(ClientRepository::class, new ClientRepository);

$response = $this->postJson('/oauth/register', [
'client_name' => str_repeat('a', 256),
'redirect_uris' => ['https://example.com/callback'],
]);

$response->assertStatus(400);
Expand All @@ -253,6 +271,38 @@ public function createAuthorizationCodeGrantClient(string $name, array $redirect
]);
});

it('preserves a falsy client name for oauth registration', function (): void {
$clientRepository = new class
{
public ?string $capturedName = null;

public function createAuthorizationCodeGrantClient(string $name, array $redirectUris, bool $confidential = true, $user = null, bool $enableDeviceFlow = false)
{
$this->capturedName = $name;

return (object) [
'id' => 'test-client-id',
'grant_types' => ['authorization_code'],
'redirect_uris' => $redirectUris,
];
}
};

$registrar = new Registrar;
$registrar->oauthRoutes();

$this->app->instance(ClientRepository::class, $clientRepository);

$response = $this->postJson('/oauth/register', [
'client_name' => '0',
'redirect_uris' => ['https://example.com/callback'],
]);

$response->assertStatus(201);

expect($clientRepository->capturedName)->toBe('0');
});

it('falls back to the legacy name field for oauth registration', function (): void {
$clientRepository = new class
{
Expand Down Expand Up @@ -699,7 +749,7 @@ public function createAuthorizationCodeGrantClient(string $name, array $redirect
$this->app->instance(ClientRepository::class, new ClientRepository);

$response = $this->post('/oauth/register', [
'redirect_uris' => ['http://localhost:3000/callback'],
'redirect_uris' => ['not-a-valid-url'],
], ['Accept' => '*/*']);

$response->assertStatus(400);
Expand Down