Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

core: fix sync failing when remote note has no expiry date (#10518)

Abdullah Atta210154bd786e
diff --git a/packages/core/src/api/sync/__tests__/merger.test.js b/packages/core/src/api/sync/__tests__/merger.test.js
index 11c5714f8..2d4bd6957 100644
--- a/packages/core/src/api/sync/__tests__/merger.test.js
+++ b/packages/core/src/api/sync/__tests__/merger.test.js
@@ -78,6 +78,28 @@ describe.concurrent("merge item synchronously", (test) => {
}
);
+ expect(merged).toBeUndefined();
+ }));
+
+ test("keep expired local note if remote note has no expiry date", () =>
+ databaseTest().then(async (db) => {
+ await loginFakeUser(db);
+ const merger = new Merger(db);
+
+ const merged = merger.mergeItem(
+ {
+ type: "note",
+ dateModified: Date.now() - 1000
+ },
+ {
+ type: "trash",
+ itemType: "note",
+ deletedBy: "expired",
+ dateModified: Date.now(),
+ expiryDate: { dateModified: Date.now(), value: Date.now() }
+ }
+ );
+
expect(merged).toBeUndefined();
}));
});
diff --git a/packages/core/src/api/sync/merger.ts b/packages/core/src/api/sync/merger.ts
index 533d56104..d53e8b041 100644
--- a/packages/core/src/api/sync/merger.ts
+++ b/packages/core/src/api/sync/merger.ts
@@ -65,6 +65,7 @@ class Merger {
localItem.deletedBy === "expired"
) {
if (
+ remoteItem.expiryDate &&
remoteItem.expiryDate.dateModified > localItem.expiryDate.dateModified
) {
localItem.expiryDate = remoteItem.expiryDate;