m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 01:47:00 +01:00
Code

Make eth_accounts return all permitted accounts (#18516)

Browse Source 
* Make eth_accounts return all permitted accounts rather than just the most recently selected one

* fixup! Make eth_accounts return all permitted accounts rather than just the most recently selected one

* Trigger

---------

Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
Co-authored-by: Jiexi Luan <jiexiluan@gmail.com>
This commit is contained in:
Erik Marks 2023-06-08 13:01:43 -07:00 committed by GitHub
parent 35ae06d824
commit 9830b14786
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scripts/controllers/permissions/specifications.js
View File

@ -61,9 +61,7 @@ export const getCaveatSpecifications = ({ getIdentities }) => {
decorator: (method, caveat) => { decorator: (method, caveat) => {
return async (args) => { return async (args) => {
const result = await method(args); const result = await method(args);
return result return result.filter((account) => caveat.value.includes(account));
.filter((account) => caveat.value.includes(account))
.slice(0, 1);
}; };
}, },

6
app/scripts/controllers/permissions/specifications.test.js
View File

@ -46,7 +46,7 @@ describe('PermissionController specifications', () => {
describe('restrictReturnedAccounts', () => { describe('restrictReturnedAccounts', () => {
describe('decorator', () => { 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 getIdentities = jest.fn();
const { decorator } = getCaveatSpecifications({ getIdentities })[ const { decorator } = getCaveatSpecifications({ getIdentities })[
CaveatTypes.restrictReturnedAccounts CaveatTypes.restrictReturnedAccounts
@ -55,10 +55,10 @@ describe('PermissionController specifications', () => {
const method = async () => ['0x1', '0x2', '0x3']; const method = async () => ['0x1', '0x2', '0x3'];
const caveat = { const caveat = {
type: CaveatTypes.restrictReturnedAccounts, type: CaveatTypes.restrictReturnedAccounts,
value: ['0x1', '0x2'], value: ['0x1', '0x3'],
}; };
const decorated = decorator(method, caveat); 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 () => { it('returns an empty array if no array members are included in the caveat value', async () => {