Making permission and approval controller methods idempotent

app/scripts/metamask-controller.actions.test.js

@@ -1,6 +1,11 @@
 import { strict as assert } from 'assert';
 import sinon from 'sinon';
 import proxyquire from 'proxyquire';
+
+import {
+  ApprovalRequestNotFoundError,
+  PermissionsRequestNotFoundError,
+} from '@metamask/controllers';
 import { ORIGIN_METAMASK } from '../../shared/constants/app';
 
 const Ganache = require('../../test/e2e/ganache');
@@ -238,4 +243,129 @@ describe('MetaMaskController', function () {
       assert.deepEqual(transaction1, transaction2);
     });
   });
+
+  describe('#removePermissionsFor', function () {
+    it('should not propagate PermissionsRequestNotFoundError', function () {
+      const error = new PermissionsRequestNotFoundError('123');
+      metamaskController.permissionController = {
+        revokePermissions: () => {
+          throw error;
+        },
+      };
+      // Line below will not throw error, in case it throws this test case will fail.
+      metamaskController.removePermissionsFor({ subject: 'test_subject' });
+    });
+
+    it('should propagate Error other than PermissionsRequestNotFoundError', function () {
+      const error = new Error();
+      metamaskController.permissionController = {
+        revokePermissions: () => {
+          throw error;
+        },
+      };
+      assert.throws(() => {
+        metamaskController.removePermissionsFor({ subject: 'test_subject' });
+      }, error);
+    });
+  });
+
+  describe('#rejectPermissionsRequest', function () {
+    it('should not propagate PermissionsRequestNotFoundError', function () {
+      const error = new PermissionsRequestNotFoundError('123');
+      metamaskController.permissionController = {
+        rejectPermissionsRequest: () => {
+          throw error;
+        },
+      };
+      // Line below will not throw error, in case it throws this test case will fail.
+      metamaskController.rejectPermissionsRequest('DUMMY_ID');
+    });
+
+    it('should propagate Error other than PermissionsRequestNotFoundError', function () {
+      const error = new Error();
+      metamaskController.permissionController = {
+        rejectPermissionsRequest: () => {
+          throw error;
+        },
+      };
+      assert.throws(() => {
+        metamaskController.rejectPermissionsRequest('DUMMY_ID');
+      }, error);
+    });
+  });
+
+  describe('#acceptPermissionsRequest', function () {
+    it('should not propagate PermissionsRequestNotFoundError', function () {
+      const error = new PermissionsRequestNotFoundError('123');
+      metamaskController.permissionController = {
+        acceptPermissionsRequest: () => {
+          throw error;
+        },
+      };
+      // Line below will not throw error, in case it throws this test case will fail.
+      metamaskController.acceptPermissionsRequest('DUMMY_ID');
+    });
+
+    it('should propagate Error other than PermissionsRequestNotFoundError', function () {
+      const error = new Error();
+      metamaskController.permissionController = {
+        acceptPermissionsRequest: () => {
+          throw error;
+        },
+      };
+      assert.throws(() => {
+        metamaskController.acceptPermissionsRequest('DUMMY_ID');
+      }, error);
+    });
+  });
+
+  describe('#resolvePendingApproval', function () {
+    it('should not propagate ApprovalRequestNotFoundError', function () {
+      const error = new ApprovalRequestNotFoundError('123');
+      metamaskController.approvalController = {
+        accept: () => {
+          throw error;
+        },
+      };
+      // Line below will not throw error, in case it throws this test case will fail.
+      metamaskController.resolvePendingApproval('DUMMY_ID', 'DUMMY_VALUE');
+    });
+
+    it('should propagate Error other than ApprovalRequestNotFoundError', function () {
+      const error = new Error();
+      metamaskController.approvalController = {
+        accept: () => {
+          throw error;
+        },
+      };
+      assert.throws(() => {
+        metamaskController.resolvePendingApproval('DUMMY_ID', 'DUMMY_VALUE');
+      }, error);
+    });
+  });
+
+  describe('#rejectPendingApproval', function () {
+    it('should not propagate ApprovalRequestNotFoundError', function () {
+      const error = new ApprovalRequestNotFoundError('123');
+      metamaskController.approvalController = {
+        reject: () => {
+          throw error;
+        },
+      };
+      // Line below will not throw error, in case it throws this test case will fail.
+      metamaskController.rejectPendingApproval('DUMMY_ID', 'DUMMY_VALUE');
+    });
+
+    it('should propagate Error other than ApprovalRequestNotFoundError', function () {
+      const error = new Error();
+      metamaskController.approvalController = {
+        reject: () => {
+          throw error;
+        },
+      };
+      assert.throws(() => {
+        metamaskController.rejectPendingApproval('DUMMY_ID', 'DUMMY_VALUE');
+      }, error);
+    });
+  });
 });

app/scripts/metamask-controller.js

@@ -9,11 +9,7 @@ import createFilterMiddleware from 'eth-json-rpc-filters';
 import createSubscriptionManager from 'eth-json-rpc-filters/subscriptionManager';
 import { providerAsMiddleware } from 'eth-json-rpc-middleware';
 import KeyringController from 'eth-keyring-controller';
-import {
-  errorCodes as rpcErrorCodes,
-  EthereumRpcError,
-  ethErrors,
-} from 'eth-rpc-errors';
+import { errorCodes as rpcErrorCodes, ethErrors } from 'eth-rpc-errors';
 import { Mutex } from 'await-semaphore';
 import { stripHexPrefix } from 'ethereumjs-util';
 import log from 'loglevel';
@@ -40,6 +36,8 @@ import {
   CollectibleDetectionController,
   PermissionController,
   SubjectMetadataController,
+  PermissionsRequestNotFoundError,
+  ApprovalRequestNotFoundError,
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   RateLimitController,
   NotificationController,
@@ -1511,7 +1509,6 @@ export default class MetamaskController extends EventEmitter {
     const {
       addressBookController,
       alertController,
-      approvalController,
       appStateController,
       collectiblesController,
       collectibleDetectionController,
@@ -1837,16 +1834,9 @@ export default class MetamaskController extends EventEmitter {
       initializeThreeBox: this.initializeThreeBox.bind(this),
 
       // permissions
-      removePermissionsFor:
-        permissionController.revokePermissions.bind(permissionController),
-      approvePermissionsRequest:
-        permissionController.acceptPermissionsRequest.bind(
-          permissionController,
-        ),
-      rejectPermissionsRequest:
-        permissionController.rejectPermissionsRequest.bind(
-          permissionController,
-        ),
+      removePermissionsFor: this.removePermissionsFor,
+      approvePermissionsRequest: this.acceptPermissionsRequest,
+      rejectPermissionsRequest: this.rejectPermissionsRequest,
       ...getPermissionBackgroundApiMethods(permissionController),
 
       ///: BEGIN:ONLY_INCLUDE_IN(flask)
@@ -1960,14 +1950,8 @@ export default class MetamaskController extends EventEmitter {
       ),
 
       // approval controller
-      resolvePendingApproval:
-        approvalController.accept.bind(approvalController),
-      rejectPendingApproval: async (id, error) => {
-        approvalController.reject(
-          id,
-          new EthereumRpcError(error.code, error.message, error.data),
-        );
-      },
+      resolvePendingApproval: this.resolvePendingApproval,
+      rejectPendingApproval: this.rejectPendingApproval,
 
       // Notifications
       updateViewedNotifications: announcementController.updateViewed.bind(
@@ -4361,4 +4345,54 @@ export default class MetamaskController extends EventEmitter {
 
     return this.keyringController.setLocked();
   }
+
+  removePermissionsFor = (subjects) => {
+    try {
+      this.permissionController.revokePermissions(subjects);
+    } catch (exp) {
+      if (!(exp instanceof PermissionsRequestNotFoundError)) {
+        throw exp;
+      }
+    }
+  };
+
+  rejectPermissionsRequest = (requestId) => {
+    try {
+      this.permissionController.rejectPermissionsRequest(requestId);
+    } catch (exp) {
+      if (!(exp instanceof PermissionsRequestNotFoundError)) {
+        throw exp;
+      }
+    }
+  };
+
+  acceptPermissionsRequest = (request) => {
+    try {
+      this.permissionController.acceptPermissionsRequest(request);
+    } catch (exp) {
+      if (!(exp instanceof PermissionsRequestNotFoundError)) {
+        throw exp;
+      }
+    }
+  };
+
+  resolvePendingApproval = (id, value) => {
+    try {
+      this.approvalController.accept(id, value);
+    } catch (exp) {
+      if (!(exp instanceof ApprovalRequestNotFoundError)) {
+        throw exp;
+      }
+    }
+  };
+
+  rejectPendingApproval = (id, value) => {
+    try {
+      this.approvalController.reject(id, value);
+    } catch (exp) {
+      if (!(exp instanceof ApprovalRequestNotFoundError)) {
+        throw exp;
+      }
+    }
+  };
 }