From c56698492e6d401ff7d4b54109da2d5cf3fbb903 Mon Sep 17 00:00:00 2001 From: antelle Date: Sat, 8 May 2021 22:32:35 +0200 Subject: [PATCH] fix #1802: opening files with saved keyfiles --- app/scripts/models/app-model.js | 2 +- package-lock.json | 16 ++++++++-------- package.json | 2 +- release-notes.md | 3 +++ 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/scripts/models/app-model.js b/app/scripts/models/app-model.js index 28745794..9a6c088a 100644 --- a/app/scripts/models/app-model.js +++ b/app/scripts/models/app-model.js @@ -697,7 +697,7 @@ class AppModel { let needLoadKeyFile = false; if (!params.keyFileData && fileInfo && fileInfo.keyFileName) { params.keyFileName = fileInfo.keyFileName; - if (this.settings.rememberKeyFiles === 'data') { + if (this.settings.rememberKeyFiles === 'data' && fileInfo.keyFileHash) { params.keyFileData = FileModel.createKeyFileWithHash(fileInfo.keyFileHash); } else if (this.settings.rememberKeyFiles === 'path' && fileInfo.keyFilePath) { params.keyFilePath = fileInfo.keyFilePath; diff --git a/package-lock.json b/package-lock.json index 41ffe2c7..0cba66b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,7 @@ "requires": true, "packages": { "": { - "version": "1.17.6", + "version": "1.18.1", "license": "MIT", "dependencies": { "@babel/core": "^7.14.0", @@ -67,7 +67,7 @@ "jquery": "3.6.0", "json-loader": "^0.5.7", "jsqrcode": "github:antelle/jsqrcode#0.1.3", - "kdbxweb": "^2.0.0", + "kdbxweb": "^2.0.1", "load-grunt-tasks": "5.1.0", "lodash": "^4.17.21", "marked": "^2.0.3", @@ -11706,9 +11706,9 @@ } }, "node_modules/kdbxweb": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-2.0.0.tgz", - "integrity": "sha512-oomAWfJRkgWU+1Bi20N2SXJbHLT2wnCibIsdXQm5HNQ8ot2wRa6weAMxvfekYWKbo3/mLKwLV8mq4cNhjXwhTw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-2.0.1.tgz", + "integrity": "sha512-ewghBv4gAGkUgtPv+qELC7U+qA5U6msKYod4UDtCrrAA4taEm13VSdZGxp2iBeIhkh/bciHmRlvtVoSTlLL+1g==", "dependencies": { "pako": "github:keeweb/pako#653c0b00d8941c89d09ed4546d2179001ec44efc", "xmldom": "github:keeweb/xmldom#ec8f61f723e2f403adaf7a1bbf55ced4ff1ea0c6" @@ -29846,9 +29846,9 @@ } }, "kdbxweb": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-2.0.0.tgz", - "integrity": "sha512-oomAWfJRkgWU+1Bi20N2SXJbHLT2wnCibIsdXQm5HNQ8ot2wRa6weAMxvfekYWKbo3/mLKwLV8mq4cNhjXwhTw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-2.0.1.tgz", + "integrity": "sha512-ewghBv4gAGkUgtPv+qELC7U+qA5U6msKYod4UDtCrrAA4taEm13VSdZGxp2iBeIhkh/bciHmRlvtVoSTlLL+1g==", "requires": { "pako": "github:keeweb/pako#653c0b00d8941c89d09ed4546d2179001ec44efc", "xmldom": "github:keeweb/xmldom#ec8f61f723e2f403adaf7a1bbf55ced4ff1ea0c6" diff --git a/package.json b/package.json index 656791bc..0e199aaf 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "jquery": "3.6.0", "json-loader": "^0.5.7", "jsqrcode": "github:antelle/jsqrcode#0.1.3", - "kdbxweb": "^2.0.0", + "kdbxweb": "^2.0.1", "load-grunt-tasks": "5.1.0", "lodash": "^4.17.21", "marked": "^2.0.3", diff --git a/release-notes.md b/release-notes.md index f2ba4c6b..07eae8e1 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,5 +1,8 @@ Release notes ------------- +##### v1.18.2 (2021-05-08) +`-` fix #1802: opening files with saved keyfiles + ##### v1.18.1 (2021-05-08) `-` fixed entry attachments display