Skip to content
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

Make eth_accounts return all permitted accounts #18516

Merged
merged 8 commits into from
Jun 8, 2023
Merged

Make eth_accounts return all permitted accounts #18516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8b6fc47
Make eth_accounts return all permitted accounts rather than just the …
rekmarks Apr 8, 2023
391255e
fixup! Make eth_accounts return all permitted accounts rather than ju…
rekmarks Apr 8, 2023
4c506b6
Merge branch 'develop' into return-all-permitted-accounts
legobeat Apr 10, 2023
72c8974
Merge branch 'develop' into return-all-permitted-accounts
legobeat Apr 10, 2023
49bceb9
Merge branch 'develop' into return-all-permitted-accounts
jiexi Jun 7, 2023
75c64e5
Trigger
jiexi Jun 7, 2023
4d659bd
Merge branch 'develop' into return-all-permitted-accounts
jiexi Jun 8, 2023
0bf8327
Merge branch 'develop' into return-all-permitted-accounts
jiexi Jun 8, 2023
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
4 changes: 1 addition & 3 deletions app/scripts/controllers/permissions/specifications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ export const getCaveatSpecifications = ({ getIdentities }) => {
decorator: (method, caveat) => {
return async (args) => {
const result = await method(args);
return result
.filter((account) => caveat.value.includes(account))
.slice(0, 1);
return result.filter((account) => caveat.value.includes(account));
};
},

Expand Down
6 changes: 3 additions & 3 deletions app/scripts/controllers/permissions/specifications.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ describe('PermissionController specifications', () => {

describe('restrictReturnedAccounts', () => {
describe('decorator', () => {
it('returns the first array member included in the caveat value', async () => {
it('only returns array members included in the caveat value', async () => {
const getIdentities = jest.fn();
const { decorator } = getCaveatSpecifications({ getIdentities })[
CaveatTypes.restrictReturnedAccounts
Expand All @@ -55,10 +55,10 @@ describe('PermissionController specifications', () => {
const method = async () => ['0x1', '0x2', '0x3'];
const caveat = {
type: CaveatTypes.restrictReturnedAccounts,
value: ['0x1', '0x2'],
value: ['0x1', '0x3'],
};
const decorated = decorator(method, caveat);
expect(await decorated()).toStrictEqual(['0x1']);
expect(await decorated()).toStrictEqual(['0x1', '0x3']);
});

it('returns an empty array if no array members are included in the caveat value', async () => {
Expand Down