diff --git a/app/scripts/models/file-model.js b/app/scripts/models/file-model.js index 18e80fc1..76ebe954 100644 --- a/app/scripts/models/file-model.js +++ b/app/scripts/models/file-model.js @@ -522,10 +522,11 @@ class FileModel extends Model { } generateAndSetKeyFile() { - const keyFile = kdbxweb.Credentials.createRandomKeyFile(); - const keyFileName = 'Generated'; - this.setKeyFile(keyFile, keyFileName); - return keyFile; + return kdbxweb.Credentials.createRandomKeyFile().then((keyFile) => { + const keyFileName = 'Generated'; + this.setKeyFile(keyFile, keyFileName); + return keyFile; + }); } resetKeyFile() { diff --git a/app/scripts/views/settings/settings-file-view.js b/app/scripts/views/settings/settings-file-view.js index d0ab0f1f..d34e93af 100644 --- a/app/scripts/views/settings/settings-file-view.js +++ b/app/scripts/views/settings/settings-file-view.js @@ -434,10 +434,11 @@ class SettingsFileView extends View { } generateKeyFile() { - const keyFile = this.model.generateAndSetKeyFile(); - const blob = new Blob([keyFile], { type: 'application/octet-stream' }); - FileSaver.saveAs(blob, this.model.name + '.key'); - this.renderKeyFileSelect(); + this.model.generateAndSetKeyFile().then((keyFile) => { + const blob = new Blob([keyFile], { type: 'application/octet-stream' }); + FileSaver.saveAs(blob, this.model.name + '.key'); + this.renderKeyFileSelect(); + }); } clearKeyFile() { diff --git a/package-lock.json b/package-lock.json index f6ed9d40..1579f1e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9783,9 +9783,9 @@ } }, "kdbxweb": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-1.11.0.tgz", - "integrity": "sha512-8jhyAU+X8Kk9zsQobwMwx6wFI6XJyMrWuPWq+PcWaYwBW3l9ruN91FbRWbLSQvKku3IRLgpMgCIqiWBS/tQjCQ==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-1.13.0.tgz", + "integrity": "sha512-WDTZH63zYP4zdS/kCigyIeX0kEboRgR7wuToaLBHVchTKeNOisi3d2rdpJRQaCzcAAzoqOR8nZon2wpW8DH1+w==", "requires": { "pako": "github:keeweb/pako#653c0b00d8941c89d09ed4546d2179001ec44efc", "text-encoding": "github:keeweb/text-encoding#4dfb7cb0954c222852092f8b06ae4f6b4f60bfbb", diff --git a/package.json b/package.json index f9470597..661ea233 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "jquery": "3.5.1", "json-loader": "^0.5.7", "jsqrcode": "github:antelle/jsqrcode#0.1.3", - "kdbxweb": "^1.11.0", + "kdbxweb": "^1.13.0", "load-grunt-tasks": "5.1.0", "lodash": "^4.17.20", "marked": "^1.2.5", diff --git a/release-notes.md b/release-notes.md index 7bf48efd..5e4ef126 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,6 +1,7 @@ Release notes ------------- ##### v1.16.2 (2020-12-??) +`+` possibility to use V2 keyfiles (.keyx) `-` fixed a missing icon in the local file question box `-` minor license screen fixes