address requested changes

Author: GuillaumeRx

packages/snaps-controllers/coverage.json

@@ -1,5 +1,5 @@
 {
-  "branches": 93.5,
+  "branches": 93.47,
   "functions": 97.12,
   "lines": 98.29,
   "statements": 98.02

packages/snaps-controllers/package.json

@@ -84,7 +84,6 @@
     "@metamask/json-rpc-engine": "^10.0.2",
     "@metamask/json-rpc-middleware-stream": "^8.0.7",
     "@metamask/key-tree": "^10.1.0",
-    "@metamask/keyring-internal-api": "^6.0.0",
     "@metamask/object-multiplex": "^2.1.0",
     "@metamask/permission-controller": "^11.0.6",
     "@metamask/phishing-controller": "^12.4.0",

packages/snaps-controllers/src/interface/SnapInterfaceController.test.tsx

@@ -180,7 +180,7 @@ describe('SnapInterfaceController', () => {
         />
       );
 
-      await rootMessenger.call(
+      const interfaceId = await rootMessenger.call(
         'SnapInterfaceController:createInterface',
         MOCK_SNAP_ID,
         components,
@@ -190,6 +190,20 @@ describe('SnapInterfaceController', () => {
         4,
         'MultichainAssetsController:getState',
       );
+
+      const { state } = rootMessenger.call(
+        'SnapInterfaceController:getInterface',
+        MOCK_SNAP_ID,
+        interfaceId,
+      );
+
+      expect(state).toStrictEqual({
+        foo: {
+          asset: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:105',
+          name: 'Solana',
+          symbol: 'SOL',
+        },
+      });
     });
 
     it('can create a new interface from JSX', async () => {
@@ -445,6 +459,53 @@ describe('SnapInterfaceController', () => {
       );
     });
 
+    it('throws if a link tries to navigate to a snap that is not installed', async () => {
+      const rootMessenger = getRootSnapInterfaceControllerMessenger();
+      const controllerMessenger = getRestrictedSnapInterfaceControllerMessenger(
+        rootMessenger,
+        false,
+      );
+
+      rootMessenger.registerActionHandler(
+        'PhishingController:maybeUpdateState',
+        jest.fn(),
+      );
+
+      rootMessenger.registerActionHandler(
+        'SnapController:get',
+        () => undefined,
+      );
+
+      // eslint-disable-next-line no-new
+      new SnapInterfaceController({
+        messenger: controllerMessenger,
+      });
+
+      const element = (
+        <Box>
+          <Text>
+            Foo <Link href={`metamask://snap/${MOCK_SNAP_ID}/home`}>Bar</Link>
+          </Text>
+        </Box>
+      );
+
+      await expect(
+        rootMessenger.call(
+          'SnapInterfaceController:createInterface',
+          MOCK_SNAP_ID,
+          element,
+        ),
+      ).rejects.toThrow(
+        'Invalid URL: The Snap being navigated to is not installed.',
+      );
+
+      expect(rootMessenger.call).toHaveBeenNthCalledWith(
+        3,
+        'SnapController:get',
+        MOCK_SNAP_ID,
+      );
+    });
+
     it('throws if an address passed to an asset selector is not available in the client', async () => {
       const rootMessenger = getRootSnapInterfaceControllerMessenger();
       const controllerMessenger = getRestrictedSnapInterfaceControllerMessenger(

packages/snaps-controllers/src/interface/SnapInterfaceController.ts

@@ -8,7 +8,6 @@ import type {
   ControllerStateChangeEvent,
 } from '@metamask/base-controller';
 import { BaseController } from '@metamask/base-controller';
-import type { InternalAccount } from '@metamask/keyring-internal-api';
 import type {
   MaybeUpdateState,
   TestOrigin,
@@ -22,7 +21,8 @@ import type {
 } from '@metamask/snaps-sdk';
 import { ContentType } from '@metamask/snaps-sdk';
 import type { JSXElement } from '@metamask/snaps-sdk/jsx';
-import { getJsonSizeUnsafe, validateJsxLinks } from '@metamask/snaps-utils';
+import type { InternalAccount } from '@metamask/snaps-utils';
+import { getJsonSizeUnsafe, validateJsxElements } from '@metamask/snaps-utils';
 import type { CaipAccountId, CaipAssetType, Json } from '@metamask/utils';
 import { assert, hasProperty, parseCaipAccountId } from '@metamask/utils';
 import { castDraft } from 'immer';
@@ -31,7 +31,6 @@ import { nanoid } from 'nanoid';
 import {
   constructState,
   getJsxInterface,
-  validateAssetSelector,
   validateInterfaceContext,
 } from './utils';
 import type { GetSnap } from '../snaps';
@@ -270,7 +269,6 @@ export class SnapInterfaceController extends BaseController<
 
     const id = nanoid();
     const componentState = constructState({}, element, {
-      getAssetMetadata: this.#getAssetMetadata.bind(this),
       getAssetsState: this.#getAssetsState.bind(this),
       getAccountByAddress: this.#getAccountByAddress.bind(this),
     });
@@ -324,7 +322,6 @@ export class SnapInterfaceController extends BaseController<
 
     const oldState = this.state.interfaces[id].state;
     const newState = constructState(oldState, element, {
-      getAssetMetadata: this.#getAssetMetadata.bind(this),
       getAssetsState: this.#getAssetsState.bind(this),
       getAccountByAddress: this.#getAccountByAddress.bind(this),
     });
@@ -479,15 +476,13 @@ export class SnapInterfaceController extends BaseController<
   }
 
   /**
-   * Get the asset metadata for a given asset ID.
+   * Get a snap by its id.
    *
-   * @param assetId - The asset ID.
-   * @returns The asset metadata or undefined if not found.
+   * @param id - The snap id.
+   * @returns The snap.
    */
-  #getAssetMetadata(assetId: CaipAssetType) {
-    const { assetsMetadata } = this.#getAssetsState();
-
-    return assetsMetadata[assetId];
+  #getSnap(id: string) {
+    return this.messagingSystem.call('SnapController:get', id);
   }
 
   /**
@@ -506,13 +501,12 @@ export class SnapInterfaceController extends BaseController<
     );
 
     await this.#triggerPhishingListUpdate();
-    validateJsxLinks(
-      element,
-      this.#checkPhishingList.bind(this),
-      (id: string) => this.messagingSystem.call('SnapController:get', id),
-    );
 
-    validateAssetSelector(element, this.#getAccountByAddress.bind(this));
+    validateJsxElements(element, {
+      isOnPhishingList: this.#checkPhishingList.bind(this),
+      getSnap: this.#getSnap.bind(this),
+      getAccountByAddress: this.#getAccountByAddress.bind(this),
+    });
   }
 
   #onNotificationsListUpdated(notificationsList: Notification[]) {