Fix _getPermittedAccounts type safety (#10819)

MetaMask · Apr 5, 2021 · e142bf0 · e142bf0
1 parent 966b2dc
commit e142bf0
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/scripts/controllers/permissions/index.js b/app/scripts/controllers/permissions/index.js
@@ -297,7 +297,7 @@ export class PermissionsController {
     this.validatePermittedAccounts([account]);
 
     const oldPermittedAccounts = this._getPermittedAccounts(origin);
-    if (!oldPermittedAccounts) {
+    if (oldPermittedAccounts.length === 0) {
       throw new Error(`Origin does not have 'eth_accounts' permission`);
     } else if (oldPermittedAccounts.includes(account)) {
       throw new Error('Account is already permitted for origin');
@@ -335,7 +335,7 @@ export class PermissionsController {
     this.validatePermittedAccounts([account]);
 
     const oldPermittedAccounts = this._getPermittedAccounts(origin);
-    if (!oldPermittedAccounts) {
+    if (oldPermittedAccounts.length === 0) {
       throw new Error(`Origin does not have 'eth_accounts' permission`);
     } else if (!oldPermittedAccounts.includes(account)) {
       throw new Error('Account is not permitted for origin');
@@ -612,15 +612,15 @@ export class PermissionsController {
    * Get current set of permitted accounts for the given origin
    *
    * @param {string} origin - The origin to obtain permitted accounts for
-   * @returns {Array<string>|null} The list of permitted accounts
+   * @returns {Array<string>} The list of permitted accounts
    */
   _getPermittedAccounts(origin) {
     const permittedAccounts = this.permissions
       .getPermission(origin, 'eth_accounts')
       ?.caveats?.find((caveat) => caveat.name === CAVEAT_NAMES.exposedAccounts)
       ?.value;
 
-    return permittedAccounts || null;
+    return permittedAccounts || [];
   }
 
   /**