Skip to content

Commit

Permalink
Do not assert unsupported required scopes (#27520)
Browse files Browse the repository at this point in the history
<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Providing unsupportable scopes in the requiredScopes param no longer
causes the CAIP-25 request to fail immediately

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27520?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
  • Loading branch information
jiexi authored Oct 2, 2024
1 parent b6ca49a commit 68db523
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,6 @@ export async function walletCreateSessionHandler(req, res, _next, end, hooks) {
isChainIdSupported: existsNetworkClientForChainId,
isChainIdSupportable: existsEip3085ForChainId,
});
// We assert if the unsupportable scopes are supported in order
// to have an appropriate error thrown for the response
assertScopesSupported(unsupportableRequiredScopes, {
isChainIdSupported: existsNetworkClientForChainId,
});

const {
supportedScopes: supportedOptionalScopes,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -274,36 +274,6 @@ describe('wallet_createSession', () => {
expect(isChainIdSupportableBody).toContain('validScopedProperties');
});

it('asserts any unsupported required scopes', async () => {
const { handler } = createMockedHandler();
bucketScopes.mockReturnValueOnce({
unsupportableScopes: {
'foo:bar': {
methods: [],
notifications: [],
},
},
});
await handler(baseRequest);

expect(assertScopesSupported).toHaveBeenNthCalledWith(
1,
{
'foo:bar': {
methods: [],
notifications: [],
},
},
expect.objectContaining({
isChainIdSupported: expect.any(Function),
}),
);

const isChainIdSupportedBody =
assertScopesSupported.mock.calls[0][1].isChainIdSupported.toString();
expect(isChainIdSupportedBody).toContain('findNetworkClientIdByChainId');
});

it('buckets the optional scopes', async () => {
const { handler } = createMockedHandler();
validateAndFlattenScopes.mockReturnValue({
Expand Down

0 comments on commit 68db523

Please sign in to comment.