Skip to content

Pass the x-csrf-token to the call to the admin API #3194

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
tom2drum merged 2 commits into from
Dec 22, 2025
Merged

Pass the x-csrf-token to the call to the admin API #3194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06d27ab
pass the `x-csrf-token` to the call to the admin API
tom2drum Dec 19, 2025
158177d
fix tokens test
tom2drum Dec 22, 2025
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
2 changes: 1 addition & 1 deletion lib/api/useApiFetch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ export default function useApiFetch() {
const headers = pickBy({
'x-endpoint': isNeedProxy() ? api.endpoint : undefined,
Authorization: [ 'admin', 'contractInfo' ].includes(apiName) ? apiToken : undefined,
'x-csrf-token': [ 'general', 'admin' ].includes(apiName) && withBody && csrfToken ? csrfToken : undefined,
...(apiName === 'general' ? {
'api-v2-temp-token': apiTempToken,
'show-scam-tokens': showScamTokens ? 'true' : undefined,
'x-csrf-token': withBody && csrfToken ? csrfToken : undefined,
} : {}),
...resource.headers,
...fetchParams?.headers,
Expand Down
11 changes: 8 additions & 3 deletions ui/pages/Tokens.pw.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ test.skip('base view +@mobile +@dark-mode', async({ render, mockApiResponse }) =
await expect(component).toHaveScreenshot();
});

test('with search +@mobile +@dark-mode', async({ render, mockApiResponse }) => {
test('with search +@mobile +@dark-mode', async({ page, render, mockApiResponse }) => {
const filteredTokens = {
items: [
tokens.tokenInfoERC20a, tokens.tokenInfoERC20b, tokens.tokenInfoERC20c,
Expand All @@ -50,7 +50,7 @@ test('with search +@mobile +@dark-mode', async({ render, mockApiResponse }) => {
};

await mockApiResponse('general:tokens', allTokens);
await mockApiResponse('general:tokens', filteredTokens, { queryParams: { q: 'foo' } });
const filteredTokensApiUrl = await mockApiResponse('general:tokens', filteredTokens, { queryParams: { q: 'foo' } });

const component = await render(
<div>
Expand All @@ -59,10 +59,12 @@ test('with search +@mobile +@dark-mode', async({ render, mockApiResponse }) => {
</div>,
);

const requestPromise = page.waitForRequest(filteredTokensApiUrl);
await component.getByRole('textbox', { name: 'Token name or symbol' }).focus();
await component.getByRole('textbox', { name: 'Token name or symbol' }).fill('foo');
await component.getByRole('textbox', { name: 'Token name or symbol' }).blur();

await requestPromise;
await expect(component).toHaveScreenshot({ maxDiffPixels: 20 });
});

Expand Down Expand Up @@ -95,7 +97,7 @@ test.describe('bridged tokens', () => {
test('base view', async({ render, page, mockApiResponse, mockEnvs }) => {
await mockEnvs(ENVS_MAP.bridgedTokens);
await mockApiResponse('general:tokens_bridged', bridgedTokens);
await mockApiResponse('general:tokens_bridged', bridgedFilteredTokens, { queryParams: { chain_ids: '99' } });
const bridgedFilteredTokensApiUrl = await mockApiResponse('general:tokens_bridged', bridgedFilteredTokens, { queryParams: { chain_ids: '99' } });

const component = await render(
<div>
Expand All @@ -108,9 +110,12 @@ test.describe('bridged tokens', () => {
await expect(component).toHaveScreenshot();

await component.getByRole('button', { name: /filter/i }).click();
const requestPromise = page.waitForRequest(bridgedFilteredTokensApiUrl);
await page.locator('label').filter({ hasText: /poa/i }).click();
await page.click('body');

await requestPromise;

await expect(component).toHaveScreenshot();
});
});
Loading