A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
core: allow using encryption key to decrypt backup
Abdullah Atta68de3cc92847
diff --git a/packages/core/src/database/backup.js b/packages/core/src/database/backup.jsindex 14234387e..e626ceb2e 100644--- a/packages/core/src/database/backup.js+++ b/packages/core/src/database/backup.js@@ -177,8 +177,10 @@ export default class Backup {/**** @param {any} backup the backup data+ * @param {string} [password]+ * @param {string} [key]*/- async import(backup, password) {+ async import(backup, password, key) {if (!backup) return;if (!this._validate(backup)) throw new Error("Invalid backup.");@@ -188,12 +190,14 @@ export default class Backup {let db = backup.data;const isEncrypted = db.salt && db.iv && db.cipher;if (backup.encrypted || isEncrypted) {- if (!password)+ if (!password && !key)throw new Error(- "Please provide a password to decrypt this backup & restore it."+ "Please provide a password or an encryption key to decrypt this backup & restore it.");- const key = await this._db.storage.generateCryptoKey(password, db.salt);+ key = key+ ? { key, salt: db.salt }+ : await this._db.storage.generateCryptoKey(password, db.salt);if (!key)throw new Error("Could not generate encryption key for backup.");