From 7f1baf52c1d2ddd5112438b936d22ad99bc403a5 Mon Sep 17 00:00:00 2001
From: moughxyz <mo@standardnotes.com>
Date: Fri, 12 Apr 2024 11:40:33 -0500
Subject: [PATCH] fix: Fixes an issue where importing an encrypted backup file
 may not successfully complete in some cases

---
 .../services/src/Domain/Import/DetermineKeyToUse.ts  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/services/src/Domain/Import/DetermineKeyToUse.ts b/packages/services/src/Domain/Import/DetermineKeyToUse.ts
index 3bc1552fc..34c63d4cd 100644
--- a/packages/services/src/Domain/Import/DetermineKeyToUse.ts
+++ b/packages/services/src/Domain/Import/DetermineKeyToUse.ts
@@ -67,6 +67,14 @@ export class DetermineKeyToUse implements SyncUseCaseInterface<AnyKey | undefine
 
     let itemsKey: ItemsKeyInterface | RootKeyInterface | KeySystemItemsKeyInterface | undefined
 
+    itemsKey = dto.recentlyDecryptedKeys.filter(isItemsKey).find((itemsKeyPayload) => {
+      return dto.payload.items_key_id === itemsKeyPayload.uuid
+    })
+
+    if (itemsKey) {
+      return Result.ok(itemsKey)
+    }
+
     if (dto.payload.items_key_id) {
       itemsKey = this.encryption.itemsKeyForEncryptedPayload(dto.payload)
       if (itemsKey) {
@@ -74,10 +82,6 @@ export class DetermineKeyToUse implements SyncUseCaseInterface<AnyKey | undefine
       }
     }
 
-    itemsKey = dto.recentlyDecryptedKeys.filter(isItemsKey).find((itemsKeyPayload) => {
-      return Result.ok(dto.payload.items_key_id === itemsKeyPayload.uuid)
-    })
-
     if (itemsKey) {
       return Result.ok(itemsKey)
     }