Added a test case and refactored a piece of code

MetaMask · Jan 10, 2023 · 1ba6012 · 1ba6012
1 parent 31fe72d
commit 1ba6012
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 10 deletions.
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
@@ -860,12 +860,12 @@ export default class TransactionController extends EventEmitter {
       : '0x0';
 
     if (txMethodType && this.securityProviderRequest) {
-      const flagAsDangerous = await this.securityProviderRequest(
+      const securityProviderResponse = await this.securityProviderRequest(
         txMeta,
         txMethodType,
       );
 
-      txMeta.flagAsDangerous = flagAsDangerous;
+      txMeta.securityProviderResponse = securityProviderResponse;
     }
 
     this.addTransaction(txMeta);

diff --git a/app/scripts/controllers/transactions/index.test.js b/app/scripts/controllers/transactions/index.test.js
@@ -1354,6 +1354,21 @@ describe('Transaction Controller', function () {
         txController.txStateManager.getTransactions().length;
       assert.equal(transactionCount1 + 1, transactionCount2);
     });
+
+    it('should call securityProviderRequest and have flagAsDangerous inside txMeta', async function () {
+      const txMeta = await txController.addUnapprovedTransaction(
+        'eth_sendTransaction',
+        {
+          from: selectedAddress,
+          to: recipientAddress,
+        },
+      );
+
+      assert.ok(
+        'securityProviderResponse' in txMeta,
+        'should have a securityProviderResponse',
+      );
+    });
   });
 
   describe('#signTransaction', function () {

diff --git a/app/scripts/lib/message-manager.js b/app/scripts/lib/message-manager.js
@@ -138,12 +138,12 @@ export default class MessageManager extends EventEmitter {
     };
     this.addMsg(msgData);
 
-    const flagAsDangerous = await this.securityProviderRequest(
+    const securityProviderResponse = await this.securityProviderRequest(
       msgData,
       msgData.type,
     );
 
-    msgData.flagAsDangerous = flagAsDangerous;
+    msgData.securityProviderResponse = securityProviderResponse;
 
     // signal update
     this.emit('update');

diff --git a/app/scripts/lib/personal-message-manager.js b/app/scripts/lib/personal-message-manager.js
@@ -165,12 +165,12 @@ export default class PersonalMessageManager extends EventEmitter {
     };
     this.addMsg(msgData);
 
-    const flagAsDangerous = await this.securityProviderRequest(
+    const securityProviderResponse = await this.securityProviderRequest(
       msgData,
       msgData.type,
     );
 
-    msgData.flagAsDangerous = flagAsDangerous;
+    msgData.securityProviderResponse = securityProviderResponse;
 
     // signal update
     this.emit('update');

diff --git a/app/scripts/lib/typed-message-manager.js b/app/scripts/lib/typed-message-manager.js
@@ -155,12 +155,12 @@ export default class TypedMessageManager extends EventEmitter {
     };
     this.addMsg(msgData);
 
-    const flagAsDangerous = await this.securityProviderRequest(
+    const securityProviderResponse = await this.securityProviderRequest(
       msgData,
       msgData.type,
     );
 
-    msgData.flagAsDangerous = flagAsDangerous;
+    msgData.securityProviderResponse = securityProviderResponse;
 
     // signal update
     this.emit('update');

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -4545,13 +4545,14 @@ export default class MetamaskController extends EventEmitter {
 
     if (transactionSecurityCheckEnabled) {
       try {
-        const { flagAsDangerous } = await securityProviderCheck(
+        const securityProviderResponse = await securityProviderCheck(
           requestData,
           methodName,
           chainId,
           currentLocale,
         );
-        return flagAsDangerous;
+
+        return securityProviderResponse;
       } catch (err) {
         log.error(err.message);
         throw err;