use ignoreLock in eth_requestAccounts and wallet_getPermissions

MetaMask · Dec 3, 2024 · 71ee61b · 71ee61b
1 parent 473fa17
commit 71ee61b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/app/scripts/lib/rpc-method-middleware/handlers/request-accounts.test.ts b/app/scripts/lib/rpc-method-middleware/handlers/request-accounts.test.ts
@@ -107,7 +107,7 @@ describe('requestEthereumAccountsHandler', () => {
     const { handler, getAccounts } = createMockedHandler();
 
     await handler(baseRequest);
-    expect(getAccounts).toHaveBeenCalled();
+    expect(getAccounts).toHaveBeenCalledWith(true);
   });
 
   describe('eip155 account permissions exist', () => {

diff --git a/app/scripts/lib/rpc-method-middleware/handlers/request-accounts.ts b/app/scripts/lib/rpc-method-middleware/handlers/request-accounts.ts
@@ -80,7 +80,7 @@ async function requestEthereumAccountsHandler(
     metamaskState,
     grantPermissions,
   }: {
-    getAccounts: () => Promise<string[]>;
+    getAccounts: (ignoreLock?: boolean) => Promise<string[]>;
     getUnlockPromise: (shouldShowUnlockRequest: true) => Promise<void>;
     requestPermissionApprovalForOrigin: (
       requestedPermissions: RequestedPermissions,
@@ -107,7 +107,7 @@ async function requestEthereumAccountsHandler(
     return end();
   }
 
-  let ethAccounts = await getAccounts();
+  let ethAccounts = await getAccounts(true);
   if (ethAccounts.length > 0) {
     // We wait for the extension to unlock in this case only, because permission
     // requests are handled when the extension is unlocked, regardless of the
@@ -172,7 +172,7 @@ async function requestEthereumAccountsHandler(
     },
   });
 
-  ethAccounts = await getAccounts();
+  ethAccounts = await getAccounts(true);
   // first time connection to dapp will lead to no log in the permissionHistory
   // and if user has connected to dapp before, the dapp origin will be included in the permissionHistory state
   // we will leverage that to identify `is_first_visit` for metrics

diff --git a/app/scripts/lib/rpc-method-middleware/handlers/wallet-getPermissions.test.ts b/app/scripts/lib/rpc-method-middleware/handlers/wallet-getPermissions.test.ts
@@ -163,7 +163,7 @@ describe('getPermissionsHandler', () => {
     it('gets the lastSelected sorted permissioned eth accounts for the origin', async () => {
       const { handler, getAccounts } = createMockedHandler();
       await handler(baseRequest);
-      expect(getAccounts).toHaveBeenCalled();
+      expect(getAccounts).toHaveBeenCalledWith(true);
     });
 
     it('returns the permissions with an eth_accounts permission if some eth accounts are permissioned', async () => {

diff --git a/app/scripts/lib/rpc-method-middleware/handlers/wallet-getPermissions.ts b/app/scripts/lib/rpc-method-middleware/handlers/wallet-getPermissions.ts
@@ -57,7 +57,7 @@ async function getPermissionsImplementation(
         CaveatSpecificationConstraint
       >['getPermissions']
     >;
-    getAccounts: () => Promise<string[]>;
+    getAccounts: (ignoreLock?: boolean) => Promise<string[]>;
   },
 ) {
   const permissions = { ...getPermissionsForOrigin() };
@@ -70,7 +70,7 @@ async function getPermissionsImplementation(
   if (caip25CaveatValue) {
     // We cannot derive ethAccounts directly from the CAIP-25 permission
     // because the accounts will not be in order of lastSelected
-    const ethAccounts = await getAccounts();
+    const ethAccounts = await getAccounts(true);
 
     if (ethAccounts.length > 0) {
       permissions[RestrictedMethods.eth_accounts] = {