Fix permissions

Author: FrederikBolding

packages/snaps-controllers/src/snaps/SnapController.test.tsx

@@ -70,11 +70,12 @@ import {
 import { hmac } from '@noble/hashes/hmac';
 import { sha512 } from '@noble/hashes/sha512';
 import { File } from 'buffer';
+import { createReadStream } from 'fs';
 import fetchMock from 'jest-fetch-mock';
+import path from 'path';
 import { pipeline } from 'readable-stream';
 import type { Duplex } from 'readable-stream';
 import { inc } from 'semver';
-import path from 'path';
 import { Readable } from 'stream';
 
 import {
@@ -123,7 +124,6 @@ import {
   waitForStateChange,
 } from '../test-utils';
 import { delay } from '../utils';
-import { createReadStream } from 'fs';
 
 globalThis.crypto.getRandomValues = <Type extends ArrayBufferView | null>(
   array: Type,
@@ -10212,32 +10212,34 @@ describe('SnapController', () => {
       snapController.destroy();
     });
 
-    it.only('updates preinstalled Snaps', async () => {
+    it('updates preinstalled Snaps', async () => {
       const registry = new MockSnapsRegistry();
       const rootMessenger = getControllerMessenger(registry);
       const messenger = getSnapControllerMessenger(rootMessenger);
 
       const snapId = 'npm:@metamask/jsx-example-snap' as SnapId;
 
-      const mockSnap = getPersistedSnapObject({ id: snapId, preinstalled: true });
+      const mockSnap = getPersistedSnapObject({
+        id: snapId,
+        preinstalled: true,
+      });
 
       const updateVersion = '1.2.1';
-      
+
       registry.resolveVersion.mockResolvedValue(updateVersion);
-          const fetchFunction = jest.fn()
-            .mockResolvedValueOnce({
-              // eslint-disable-next-line no-restricted-globals
-              headers: new Headers({ 'content-length': '5477' }),
-              ok: true,
-              body: Readable.toWeb(
-                createReadStream(
-                  path.resolve(
-                    __dirname,
-                    `../../test/fixtures/metamask-jsx-example-snap-${updateVersion}.tgz`,
-                  ),
-                ),
-              ),
-            } as any);
+      const fetchFunction = jest.fn().mockResolvedValueOnce({
+        // eslint-disable-next-line no-restricted-globals
+        headers: new Headers({ 'content-length': '5477' }),
+        ok: true,
+        body: Readable.toWeb(
+          createReadStream(
+            path.resolve(
+              __dirname,
+              `../../test/fixtures/metamask-jsx-example-snap-${updateVersion}.tgz`,
+            ),
+          ),
+        ),
+      } as any);
 
       const snapController = getSnapController(
         getSnapControllerOptions({

packages/snaps-controllers/src/snaps/SnapController.ts

@@ -2900,7 +2900,8 @@ export class SnapController extends BaseController<
    * @param location - The location implementation of the snap.
    * @param newVersionRange - A semver version range in which the maximum version will be chosen.
    * @param emitEvent - An optional boolean flag to indicate whether this update should emit an event.
-   * @param automaticUpdate
+   * @param automaticUpdate - An optional boolean flag to indicate whether this update should be done
+   * automatically.
    * @returns The snap metadata if updated, `null` otherwise.
    */
   // TODO: Make hash private
@@ -2992,7 +2993,6 @@ export class SnapController extends BaseController<
       let requestData;
 
       if (automaticUpdate) {
-        // TODO: This probably doesn't work as it doesn't account for initialConnections.
         approvedNewPermissions = newPermissions;
       } else {
         assert(pendingApproval);
@@ -3008,9 +3008,12 @@ export class SnapController extends BaseController<
           loading: false,
         });
 
-        const { permissions: approvedNewPermissions, ...requestData } =
+        const { permissions, ...rest } =
           (await pendingApproval.promise) as PermissionsRequest;
 
+        approvedNewPermissions = permissions;
+        requestData = rest;
+
         pendingApproval = this.#createApproval({
           origin,
           snapId,