mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-18 21:16:47 +00:00
fix(settings): the client registration form says what the server refused
Registering an OAuth client by hand and getting only "Failed to register OAuth client" left nothing to act on: the server names the rule it broke (a scope, the ten-client cap, a redirect URI it will not take) and the toast swallowed it in a bare catch. Both shells show the server's message now and keep the generic text for a failure that carries none.
This commit is contained in:
@@ -644,11 +644,11 @@ describe('IntegrationsTab', () => {
|
||||
expect(createBtn).toBeDisabled();
|
||||
});
|
||||
|
||||
it('FE-COMP-INTEGRATIONS-032: error toast shown when create OAuth client fails', async () => {
|
||||
it('FE-COMP-INTEGRATIONS-032: a refused client registration toasts the reason the server gave', async () => {
|
||||
const user = userEvent.setup();
|
||||
server.use(
|
||||
http.post('/api/oauth/clients', () =>
|
||||
HttpResponse.json({ error: 'server error' }, { status: 500 })
|
||||
HttpResponse.json({ error: 'Redirect URI must use HTTPS, loopback HTTP, or a private custom scheme: http://192.168.1.5/cb' }, { status: 400 })
|
||||
)
|
||||
);
|
||||
enableMcp();
|
||||
@@ -657,9 +657,24 @@ describe('IntegrationsTab', () => {
|
||||
await user.click(screen.getByRole('button', { name: /New Client/i }));
|
||||
await screen.findByText('Register OAuth Client');
|
||||
await user.type(screen.getByPlaceholderText(/Claude Web, My MCP App/i), 'Fail Client');
|
||||
await user.type(screen.getByPlaceholderText(/https:\/\/your-app/i), 'http://192.168.1.5/cb');
|
||||
await user.click(screen.getByRole('button', { name: /Register Client/i }));
|
||||
expect(await screen.findByText(/Redirect URI must use HTTPS/)).toBeInTheDocument();
|
||||
expect(screen.queryByText('Failed to register OAuth client')).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('FE-COMP-INTEGRATIONS-032b: a failure the server says nothing about keeps the generic text', async () => {
|
||||
const user = userEvent.setup();
|
||||
server.use(http.post('/api/oauth/clients', () => HttpResponse.error()));
|
||||
enableMcp();
|
||||
render(<><ToastContainer /><IntegrationsTab /></>);
|
||||
await screen.findByText('MCP Configuration');
|
||||
await user.click(screen.getByRole('button', { name: /New Client/i }));
|
||||
await screen.findByText('Register OAuth Client');
|
||||
await user.type(screen.getByPlaceholderText(/Claude Web, My MCP App/i), 'Fail Client');
|
||||
await user.type(screen.getByPlaceholderText(/https:\/\/your-app/i), 'http://localhost');
|
||||
await user.click(screen.getByRole('button', { name: /Register Client/i }));
|
||||
expect(await screen.findByText(/Failed to register/i)).toBeInTheDocument();
|
||||
expect(await screen.findByText('Failed to register OAuth client')).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ import ApiKeysSection from './ApiKeysSection'
|
||||
import { PRESET_SCOPES_DEFAULT, PRESET_SCOPES_READONLY } from '../../api/oauthScopes'
|
||||
import ScopeGroupPicker from '../OAuth/ScopeGroupPicker'
|
||||
import { useAuthStore } from '../../store/authStore'
|
||||
import { getApiErrorMessage } from '../../utils/apiError'
|
||||
|
||||
interface OAuthPreset {
|
||||
id: string
|
||||
@@ -266,8 +267,11 @@ function useIntegrations() {
|
||||
setOauthNewUris('')
|
||||
setOauthNewScopes([])
|
||||
setOauthIsMachine(false)
|
||||
} catch {
|
||||
toast.error(t('settings.oauth.toast.createError'))
|
||||
} catch (err) {
|
||||
// The server names the rule that refused the client (a scope, the
|
||||
// ten-client cap, a redirect URI it will not take); swallowing it left
|
||||
// "Failed to register OAuth client" and nothing to act on.
|
||||
toast.error(getApiErrorMessage(err, t('settings.oauth.toast.createError')))
|
||||
} finally {
|
||||
setOauthCreating(false)
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ import MChip from '../../components/MChip'
|
||||
import { MSetCard, MSetEyebrow, MSetInput, MSetTextarea, MSetButton, MSetHint, MSetRow } from './MSettingsUi'
|
||||
import MConfirmSheet from './MConfirmSheet'
|
||||
import MSegmented from '../../components/MSegmented'
|
||||
import { getApiErrorMessage } from '../../../utils/apiError'
|
||||
|
||||
interface OAuthPreset {
|
||||
id: string
|
||||
@@ -188,8 +189,11 @@ export default function MSettingsMcp() {
|
||||
setNewUris('')
|
||||
setNewScopes([])
|
||||
setIsMachine(false)
|
||||
} catch {
|
||||
toast.error(t('settings.oauth.toast.createError'))
|
||||
} catch (err) {
|
||||
// The server names the rule that refused the client (a scope, the
|
||||
// ten-client cap, a redirect URI it will not take); swallowing it left
|
||||
// "Failed to register OAuth client" and nothing to act on.
|
||||
toast.error(getApiErrorMessage(err, t('settings.oauth.toast.createError')))
|
||||
} finally {
|
||||
setCreating(false)
|
||||
}
|
||||
|
||||
@@ -265,17 +265,19 @@ describe('MSettingsMcp', () => {
|
||||
expect(writeText).toHaveBeenNthCalledWith(2, 'sec-copy');
|
||||
});
|
||||
|
||||
it('FE-MOB-SETMCP-011: a failed registration surfaces an error toast and keeps the form open', async () => {
|
||||
it('FE-MOB-SETMCP-011: a refused registration surfaces the reason the server gave and keeps the form open', async () => {
|
||||
const user = userEvent.setup();
|
||||
server.use(http.post('/api/oauth/clients', () => HttpResponse.json({ error: 'boom' }, { status: 500 })));
|
||||
server.use(http.post('/api/oauth/clients', () =>
|
||||
HttpResponse.json({ error: 'Redirect URI must use HTTPS, loopback HTTP, or a private custom scheme: http://192.168.1.5/cb' }, { status: 400 })));
|
||||
renderScreen();
|
||||
|
||||
await user.click(screen.getByRole('button', { name: 'New Client' }));
|
||||
await user.type(await screen.findByPlaceholderText(/Claude Web, My MCP App/), 'Broken');
|
||||
fireEvent.change(screen.getByPlaceholderText(/your-app/), { target: { value: 'http://localhost' } });
|
||||
fireEvent.change(screen.getByPlaceholderText(/your-app/), { target: { value: 'http://192.168.1.5/cb' } });
|
||||
await user.click(screen.getByRole('button', { name: 'Register Client' }));
|
||||
|
||||
await screen.findByText('Failed to register OAuth client');
|
||||
await screen.findByText(/Redirect URI must use HTTPS/);
|
||||
expect(screen.queryByText('Failed to register OAuth client')).toBeNull();
|
||||
expect(screen.getByText('Register OAuth Client')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user