fix: add empty check for batch upserts

MetaMask · Sep 23, 2024 · 9735ac7 · 9735ac7
1 parent cf2e569
commit 9735ac7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 21 deletions.
diff --git a/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.test.ts b/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.test.ts
@@ -569,8 +569,6 @@ describe('user-storage/user-storage-controller - syncInternalAccountsWithUserSto
               'accounts',
               await mockUserStorageAccountsResponse(),
             ),
-          mockEndpointBatchUpsertUserStorage:
-            mockEndpointBatchUpsertUserStorage('accounts'),
         },
       };
     };
@@ -587,10 +585,8 @@ describe('user-storage/user-storage-controller - syncInternalAccountsWithUserSto
     await controller.syncInternalAccountsWithUserStorage();
 
     mockAPI.mockEndpointGetUserStorage.done();
-    mockAPI.mockEndpointBatchUpsertUserStorage.done();
 
     expect(mockAPI.mockEndpointGetUserStorage.isDone()).toBe(true);
-    expect(mockAPI.mockEndpointBatchUpsertUserStorage.isDone()).toBe(true);
 
     expect(messengerMocks.mockKeyringAddNewAccount).toHaveBeenCalledTimes(
       MOCK_USER_STORAGE_ACCOUNTS.SAME_AS_INTERNAL_ALL.length -
@@ -621,8 +617,6 @@ describe('user-storage/user-storage-controller - syncInternalAccountsWithUserSto
               'accounts',
               await mockUserStorageAccountsResponse(),
             ),
-          mockEndpointBatchUpsertUserStorage:
-            mockEndpointBatchUpsertUserStorage('accounts'),
         },
       };
     };
@@ -730,8 +724,6 @@ describe('user-storage/user-storage-controller - syncInternalAccountsWithUserSto
                 'accounts',
                 await mockUserStorageAccountsResponse(),
               ),
-            mockEndpointBatchUpsertUserStorage:
-              mockEndpointBatchUpsertUserStorage('accounts'),
           },
         };
       };
@@ -860,8 +852,6 @@ describe('user-storage/user-storage-controller - syncInternalAccountsWithUserSto
                 'accounts',
                 await mockUserStorageAccountsResponse(),
               ),
-            mockEndpointBatchUpsertUserStorage:
-              mockEndpointBatchUpsertUserStorage('accounts'),
           },
         };
       };
@@ -905,8 +895,6 @@ describe('user-storage/user-storage-controller - syncInternalAccountsWithUserSto
                 'accounts',
                 await mockUserStorageAccountsResponse(),
               ),
-            mockEndpointBatchUpsertUserStorage:
-              mockEndpointBatchUpsertUserStorage('accounts'),
           },
         };
       };
@@ -984,8 +972,6 @@ describe('user-storage/user-storage-controller - syncInternalAccountsWithUserSto
                 'accounts',
                 await mockUserStorageAccountsResponse(),
               ),
-            mockEndpointBatchUpsertUserStorage:
-              mockEndpointBatchUpsertUserStorage('accounts'),
           },
         };
       };
@@ -1039,8 +1025,6 @@ describe('user-storage/user-storage-controller - syncInternalAccountsWithUserSto
                 'accounts',
                 await mockUserStorageAccountsResponse(),
               ),
-            mockEndpointBatchUpsertUserStorage:
-              mockEndpointBatchUpsertUserStorage('accounts'),
           },
         };
       };
@@ -1084,8 +1068,6 @@ describe('user-storage/user-storage-controller - syncInternalAccountsWithUserSto
                 'accounts',
                 await mockUserStorageAccountsResponse(),
               ),
-            mockEndpointBatchUpsertUserStorage:
-              mockEndpointBatchUpsertUserStorage('accounts'),
           },
         };
       };
@@ -1132,8 +1114,6 @@ describe('user-storage/user-storage-controller - syncInternalAccountsWithUserSto
                 'accounts',
                 mockGetEntriesResponse,
               ),
-            mockEndpointBatchUpsertUserStorage:
-              mockEndpointBatchUpsertUserStorage('accounts'),
           },
         };
       };

diff --git a/packages/profile-sync-controller/src/controllers/user-storage/services.ts b/packages/profile-sync-controller/src/controllers/user-storage/services.ts
@@ -202,6 +202,10 @@ export async function batchUpsertUserStorage(
   data: [UserStoragePathWithKeyOnly, string][],
   opts: UserStorageBatchUpsertOptions,
 ): Promise<void> {
+  if (!data.length) {
+    return;
+  }
+
   const { bearerToken, path, storageKey, nativeScryptCrypto } = opts;
 
   const encryptedData = await Promise.all(

diff --git a/packages/profile-sync-controller/src/sdk/user-storage.test.ts b/packages/profile-sync-controller/src/sdk/user-storage.test.ts
@@ -163,7 +163,7 @@ describe('User Storage', () => {
     });
 
     await expect(
-      userStorage.batchSetItems('notifications', []),
+      userStorage.batchSetItems('notifications', [['key', 'value']]),
     ).rejects.toThrow(UserStorageError);
   });
 

diff --git a/packages/profile-sync-controller/src/sdk/user-storage.ts b/packages/profile-sync-controller/src/sdk/user-storage.ts
@@ -136,6 +136,10 @@ export class UserStorage {
     data: [UserStoragePathWithKeyOnly, string][],
   ): Promise<void> {
     try {
+      if (!data.length) {
+        return;
+      }
+
       const headers = await this.#getAuthorizationHeader();
       const storageKey = await this.getStorageKey();